Commit Graph

151 Commits

Author SHA1 Message Date
IvanDSM 1245f3c75e Windows build clarifications. 2020-05-10 16:50:48 -03:00
IvanDSM a73accc906
Merge pull request #51 from fgsfdsfgs/patch-2
Move bettercamera settings out of EEPROM and into the config file (again)
2020-05-10 16:41:04 -03:00
fgsfds a0ba46eaf6 move bettercamera settings to config file; cleanup 2020-05-10 21:39:23 +03:00
Vinícius R. Miguel acc0fd59c2
Add BETTERCAMERA notice 2020-05-10 15:09:40 -03:00
IvanDSM 5e2e510500 Disable bettercamera by default. 2020-05-10 15:08:59 -03:00
Vinícius R. Miguel aa046c76d9
Merge pull request #42 from vanfanel/master
Thanks!
2020-05-10 14:02:27 -03:00
IvanDSM a7922928ae
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 f24d44c9c7 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 d0b85785fe might as well check for L while we're at it 2020-05-10 19:15:13 +03:00
fgsfds 2234e28625 rebind Z trigger back to L 2020-05-10 19:14:59 +03:00
IvanDSM 6c7df61480 Add warning about WINDOWS_BUILD 2020-05-10 13:13:15 -03:00
fgsfds d6820f6073 whoops, this is supposed to be the Z button 2020-05-10 19:09:43 +03:00
vanfanel 16a4495bf2 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 690283da13 allow rebinding of joystick and mouse buttons 2020-05-10 19:05:54 +03:00
vanfanel fd02d88b59 Fix for GLES on windowed rendering contexts (X11) 2020-05-10 17:52:01 +02:00
IvanDSM a0068c747b 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 e427aaa894 make use of mouse buttons 2020-05-10 18:41:46 +03:00
Vinícius R. Miguel 32ec185188
Merge pull request #36 from sm64pc/camera-rebase
Merge camera-rebase into master. Good work :)
2020-05-10 11:45:13 -03:00
IvanDSM 67c60d00ee
Merge branch 'master' into camera-rebase 2020-05-10 11:31:57 -03:00
rai 65bb12f7a4
Update README.md 2020-05-10 16:03:43 +02:00
rai d54d625a4f
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 f70ebeb2b3 Use the system video mode in GLES platforms instead of setting a new one. 2020-05-10 15:41:46 +02:00
IvanDSM e3a2613328 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 6ed071e49e
Merge branch 'master' into camera-rebase 2020-05-10 05:13:38 -03:00
IvanDSM 88b063d7a1 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 b4626bf3b4
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 19252e4275
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 ad89f663f3
More fixes ported from fdsfgsfds' fork 2020-05-10 00:05:33 -03:00
Colton G. Rushton 8e2e2f49f0
Port fixes from fdsfgsfds' fork
see 63bed21d26 for details
2020-05-10 00:03:14 -03:00
Zero-Shift 3f9236a233 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 b43313974c
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 1c86dca581
Fix save corruption in some 64-bit builds 2020-05-09 21:13:57 -03:00
Vinícius R. Miguel 5024cdece3
Delete fps.patch 2020-05-09 18:21:44 -03:00
Vinícius R. Miguel 7a81769abc
Delete fps.patch 2020-05-09 18:20:20 -03:00
Vinícius R. Miguel 76783f2ab0
Add optional support for L-trigger on controllers. 2020-05-09 12:18:30 -03:00
y0shin 879958617f
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 0413703a60 L (Trigger) is real. Keyboard only for now. 2020-05-09 09:31:15 +01:00
Hyenadae f43c06303f L (Trigger) is real. Keyboard only for now. 2020-05-09 09:28:19 +01:00
IvanDSM 75aeb9d686 Fix goddard/sfx.h header 2020-05-09 02:32:57 -03:00
IvanDSM 89cd99608e Fix goddard/sfx.h header 2020-05-09 02:30:14 -03:00
IvanDSM 3ebfc225ca 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 18f3e6ad9f
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 ef2cd47343 True analog camera control has been added. 2020-05-09 01:19:13 -03:00
IvanDSM 2b188036cb Slight Makefile update
Change TARGET_N64 ?= to TARGET_N64 =
2020-05-09 01:17:42 -03:00
IvanDSM e5f21323a2
Merge pull request #18 from Hyenadae/master
Strip out N64 ROM building from Makefile (WIP)
2020-05-09 01:08:47 -03:00
IvanDSM 6281e00891
Merge branch 'master' into master 2020-05-09 01:08:05 -03:00
Hyenadae 3ff6d4d38e Strip out N64 ROM building from Makefile 2020-05-09 03:29:10 +01:00
albertw aaa26021f6 Add libSDL and emsdk to support building linux and web in container 2020-05-08 19:11:59 -07:00
Vinícius R. Miguel 0859a0cfef
Nothing to see here 2020-05-08 16:16:53 -03:00
Vinícius R. Miguel 0690451684
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