Commit graph

86 commits

Author SHA1 Message Date
fgsfds
d6820f6073 whoops, this is supposed to be the Z button 2020-05-10 19:09:43 +03:00
fgsfds
690283da13 allow rebinding of joystick and mouse buttons 2020-05-10 19:05:54 +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
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
Vinícius R. Miguel
65c297dcf0
Mention Raspberry Pi building and formatting fix. 2020-05-08 13:32:31 -03:00
Vinícius R. Miguel
bdfdb17684
Added a new Windows guide. 2020-05-08 13:29:35 -03:00
Vinícius R. Miguel
083f1aca10
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
ab52a3cbf5 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
b0404194d2 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
HengiFettlich
c4707eb36f refactor fullscreen into own static function 2020-05-08 14:35:38 +02:00
Jan200101
be340547c4
port analog camera code to the master codebase 2020-05-08 13:41:35 +02:00
Jan200101
c540898c71
revert -O2 when non matching,fix EU compile,disable cursor in fullscreen
- O2 caused problems with audio on US builds when targeting generic systems
- compiling an EU version previously caused problems due to race condition in the Makefile
- not being able to see the cursor on a small window is annoying, only hide on fullscreen
2020-05-08 13:41:12 +02:00
HengiFettlich
848f7c352b Update gfx_sdl2.c
if fullscreened, escape to exit fullscreen
2020-05-08 12:24:40 +02:00
HengiFettlich
14b0282267 Update .gitignore 2020-05-08 12:11:59 +02:00
Vinícius R. Miguel
d78585de83
Merge pull request #9 from Hyenadae/master
Makefile additions and part of SDL2.C Pi-GLES define
2020-05-08 04:55:51 -03:00
Vinícius R. Miguel
1e246386bc
Merge branch 'master' into master 2020-05-08 04:53:41 -03:00
Hyenadae
dba8760aad Makefile additions and part of SDL2.C Pi-GLES define 2020-05-08 08:38:50 +01:00
Vinícius R. Miguel
0c10f9eacc
Removes the cursor from view when on the game's window. 2020-05-08 04:36:17 -03:00
Vinícius R. Miguel
7e97699076
Add RPi-related optimizations. 2020-05-08 04:14:56 -03:00