Commit Graph

96 Commits (0edbb78e1f3f8786c58a7347bc2f7d4b91e93f8e)

Author SHA1 Message Date
Vinícius R. Miguel 0edbb78e1f Merge pull request #42 from vanfanel/master
Thanks!
2020-05-10 14:02:27 -03:00
IvanDSM 9d90b75fb6 Merge pull request #48 from fgsfdsfgs/patch-1
Allow changing controller button bindings in config file; add mouse buttons
2020-05-10 13:37:32 -03:00
vanfanel c5efdc2018 Remove redundant code. Make GLES and GL modes respect DESIRED_WIDTH and DESIRED_HEIGHT in windowed mode, but in fullscreen mode just use the system video mode. 2020-05-10 18:23:34 +02:00
fgsfds 86101aa4bf might as well check for L while we're at it 2020-05-10 19:15:13 +03:00
fgsfds 67e348cb2a rebind Z trigger back to L 2020-05-10 19:14:59 +03:00
IvanDSM 941bc197eb Add warning about WINDOWS_BUILD 2020-05-10 13:13:15 -03:00
fgsfds dffd75949f whoops, this is supposed to be the Z button 2020-05-10 19:09:43 +03:00
vanfanel 2056beeaff Do not call gfx_sdl_set_fullscreen() just after creating the game window: create window fullscreen or not directly. 2020-05-10 18:07:26 +02:00
fgsfds 775786310b allow rebinding of joystick and mouse buttons 2020-05-10 19:05:54 +03:00
vanfanel 4fb20a14b6 Fix for GLES on windowed rendering contexts (X11) 2020-05-10 17:52:01 +02:00
IvanDSM 33c426171c Fix Web build.
The ifeq($(TARGET_WEB),0) check on line 49 wasn't being endif'ed properly, which caused the rest of the code up until 244 (where an incorrect endif was placed) to be ignored.
This commit fixes that issue and allows web builds to work normally.
2020-05-10 12:45:46 -03:00
fgsfds bfbe62daed make use of mouse buttons 2020-05-10 18:41:46 +03:00
Vinícius R. Miguel 39edce5738 Merge pull request #36 from sm64pc/camera-rebase
Merge camera-rebase into master. Good work :)
2020-05-10 11:45:13 -03:00
IvanDSM a70cb74cf1 Merge branch 'master' into camera-rebase 2020-05-10 11:31:57 -03:00
rai e22463a609 Update README.md 2020-05-10 16:03:43 +02:00
rai 9d92dcf189 Update README.md
Remove most of the infromation from the readme that has been moved to the wiki.
2020-05-10 16:02:02 +02:00
vanfanel 12434a79b1 Use the system video mode in GLES platforms instead of setting a new one. 2020-05-10 15:41:46 +02:00
IvanDSM 953ac95582 Fix build without new camera, add example to README
This fixes an oversight of mine that broke building with BETTERCAMERA=0 and adds an example to the README of how to build with the new camera disabled.
2020-05-10 05:47:38 -03:00
IvanDSM dc78761056 Merge branch 'master' into camera-rebase 2020-05-10 05:13:38 -03:00
IvanDSM e21210f238 New Makefile and fgsfdsfgs fixes
New Makefile based on master branch Makefile.
Ported fdsfgsfds' OOB memory access and save buffer corruption fixes.
2020-05-10 05:11:27 -03:00
Vinícius R. Miguel 7cb4f9b0a7 Merge pull request #32 from coltongit/patch-4
Port fixes from fdsfgsfds' fork
2020-05-10 00:28:33 -03:00
Vinícius R. Miguel 658afac6ed Merge pull request #31 from Zero-Shift/master
Merged. Thanks for your contribution!

"Changed amount of sleep frames when transitioning from main menu and exiting a stage to fix TAS sync issues."
2020-05-10 00:18:05 -03:00
Colton G. Rushton 6dc027226c More fixes ported from fdsfgsfds' fork 2020-05-10 00:05:33 -03:00
Colton G. Rushton fdd9df2fa7 Port fixes from fdsfgsfds' fork
see 63bed21d26 for details
2020-05-10 00:03:14 -03:00
Zero-Shift 0b1a9d09af Update script.c
Changed amount of sleep frames when transitioning from main menu and exiting a stage to fix TAS sync issues
2020-05-09 20:32:50 -05:00
Vinícius R. Miguel 44a5e79f82 Merge pull request #29 from coltongit/patch-1
Fix save corruption in some 64-bit builds
2020-05-09 21:17:15 -03:00
Colton G. Rushton c3e450122c Fix save corruption in some 64-bit builds 2020-05-09 21:13:57 -03:00
Vinícius R. Miguel 23e7ff551f Delete fps.patch 2020-05-09 18:21:44 -03:00
Vinícius R. Miguel 8f928a4c3b Delete fps.patch 2020-05-09 18:20:20 -03:00
Vinícius R. Miguel 197cb5e00c Add optional support for L-trigger on controllers. 2020-05-09 12:18:30 -03:00
y0shin 3a4f4b4bc1 Merge pull request #22 from Hyenadae/master
L (Trigger) is real (now). Added key_l to config. L_TRIG and CONT_L inputs are now accepted by Mario 64
2020-05-09 06:21:20 -04:00
Hyenadae b2d424799c L (Trigger) is real. Keyboard only for now. 2020-05-09 09:31:15 +01:00
Hyenadae e0b22eccab L (Trigger) is real. Keyboard only for now. 2020-05-09 09:28:19 +01:00
IvanDSM a2017555de Fix goddard/sfx.h header 2020-05-09 02:32:57 -03:00
IvanDSM b2831a2478 Fix goddard/sfx.h header 2020-05-09 02:30:14 -03:00
IvanDSM 85dbb70e38 Mouse Look ported to camera_rebase
With check for settings SDL_SetRelativeMouseMode only if Mouse Look is enabled.

We always send regards to Fastblitters.
2020-05-09 02:10:56 -03:00
IvanDSM 730db3400d Merge pull request #17 from aswgit/master
Add libSDL and emsdk to support building linux and web in container
2020-05-09 01:23:01 -03:00
Vinícius R. Miguel 4448d4d9b5 True analog camera control has been added. 2020-05-09 01:19:13 -03:00
IvanDSM 9e12c65766 Slight Makefile update
Change TARGET_N64 ?= to TARGET_N64 =
2020-05-09 01:17:42 -03:00
IvanDSM bd6f66b542 Merge pull request #18 from Hyenadae/master
Strip out N64 ROM building from Makefile (WIP)
2020-05-09 01:08:47 -03:00
IvanDSM efc788f047 Merge branch 'master' into master 2020-05-09 01:08:05 -03:00
Hyenadae d74e85682d Strip out N64 ROM building from Makefile 2020-05-09 03:29:10 +01:00
albertw 8a9ca21133 Add libSDL and emsdk to support building linux and web in container 2020-05-08 19:11:59 -07:00
Vinícius R. Miguel 1547ef0900 Nothing to see here 2020-05-08 16:16:53 -03:00
Vinícius R. Miguel d6d1ef54fc Update .gitignore to remove patch/wiggle residue
`git patch` makes a .rej file for every rejection, and wiggle makes a .porig for every rejection fixed. This can add up to a lot of junk.
2020-05-08 14:55:25 -03:00
Vinícius R. Miguel ba13db28b1 Mention Raspberry Pi building and formatting fix. 2020-05-08 13:32:31 -03:00
Vinícius R. Miguel ee87b63a12 Added a new Windows guide. 2020-05-08 13:29:35 -03:00
Vinícius R. Miguel 6fd0b2cc92 Merge pull request #11 from vanfanel/master
Pass the correct CFLAGs for Rpi3 and Rpi4 when both models run a syst…
2020-05-08 12:54:25 -03:00
vanfanel 19cc217dbb Pass -DUSE_GLES to sdl2 GL init context instead of -DTARGET_RPI, since there are more GLES platforms out there that this engine will run on. 2020-05-08 17:06:23 +02:00
vanfanel ace1d0e0e0 Pass the correct CFLAGs for Rpi3 and Rpi4 when both models run a system with aarch64 kernel and libs. 2020-05-08 16:47:17 +02:00