Commit Graph

315 Commits

Author SHA1 Message Date
zerocloude d604711468
Merge pull request #153 from coltongit/patch-23
TARGET_N64 removal
2020-05-19 23:37:51 +09:00
zerocloude 2b2572db4b
Merge pull request #150 from coltongit/patch-21
Fix unused code
2020-05-19 23:26:40 +09:00
zerocloude fb537f409e
Merge pull request #211 from coltongit/msys2-build-simplification
Add MSYS2 build fix/simplification
2020-05-19 23:26:03 +09:00
zerocloude 1d4d92fe6d
Merge pull request #210 from coltongit/controller-axis-fix
Fix to controller axis invert issue
2020-05-19 23:25:33 +09:00
zerocloude da295dd349
Merge pull request #209 from coltongit/mxe-build-fix
Yet another MXE build fix
2020-05-19 23:25:15 +09:00
zerocloude 5889f837be
Merge pull request #207 from coltongit/webgl-build-fix 2020-05-19 23:24:53 +09:00
Colton G. Rushton 2904658341
Add MSYS2 build fix/simplification
Adds the CFLAG normally added during building in MSYS2 to make MSYS2 builds easier to perform.
2020-05-19 11:04:46 -03:00
Colton Rushton 08ad740b1c Refactor PR #176 2020-05-19 10:51:49 -03:00
Colton Rushton 41828987f2 Made the game even easier to compile in MXE. 2020-05-19 10:38:08 -03:00
Colton Rushton 9230cb832d Refactor PR #156 2020-05-19 10:32:01 -03:00
Colton Rushton b0081e8d60 Refactor PR #151 2020-05-19 10:14:44 -03:00
V. R. Miguel 3a204f25c2
Merge pull request #180 from Leon422/master
Added "Exit course at any time", "Huge Mario" and "Tiny Mario" cheats
2020-05-18 23:02:59 -03:00
V. R. Miguel 29bfb1b9b8
Merge branch 'nightly' into master 2020-05-18 23:00:42 -03:00
fgsfds 1046cc1301 Merge pull request #179 from dernett/fix-fullscreen-text
Fix fullscreen text
2020-05-19 03:19:37 +03:00
fgsfds c18e70f44e Revert "Merge branch 'nightly' into master"
This reverts commit 2e8a821fa3, reversing
changes made to d499f55402.
2020-05-19 02:38:59 +03:00
fgsfds 2e8a821fa3
Merge branch 'nightly' into master 2020-05-19 02:33:30 +03:00
fgsfds d499f55402
Merge pull request #194 from Leon422/patch-4
Update README_es_ES.md to reflect the fact that cheats now use a CLI
2020-05-19 02:05:57 +03:00
Leon422 18c197dbff
Update README_es_ES.md 2020-05-19 00:04:07 +01:00
fgsfds 1d845c4f81
Merge pull request #193 from Leon422/patch-3
Update README.md to reflect the fact that cheats now use a CLI
2020-05-19 02:03:40 +03:00
Leon422 8e60f9960e
Update README.md 2020-05-19 00:02:03 +01:00
fgsfds 26705aed7a disable cheats by default; use --cheats CLI option to enable for now 2020-05-19 01:59:29 +03:00
fgsfds 6a79a9af99 bring back the old frame timing method (if vsync != 2) 2020-05-19 01:32:49 +03:00
fgsfds 59913a9beb Revert "Revert "(hopefully) fix the timing crap; add vsync option""
This reverts commit c6961b8606.
2020-05-19 01:25:59 +03:00
fgsfds c6961b8606 Revert "(hopefully) fix the timing crap; add vsync option"
This reverts commit 2bd840a299.
2020-05-18 18:48:11 -03:00
fgsfds c3c2451c6a Revert "(hopefully) fix the timing crap; add vsync option"
This reverts commit 2bd840a299.
2020-05-18 18:44:35 -03:00
V. R. Miguel ba26931aa1
Merge pull request #189 from sm64pc/master
Update nightly
2020-05-18 18:26:00 -03:00
V. R. Miguel 4f783c6822
Merge pull request #188 from Leon422/patch-2
Updated the Spanish readme
2020-05-18 18:24:39 -03:00
V. R. Miguel b9e54b9792
Merge pull request #186 from Leon422/patch-1
Added the cheats menu to the list of features
2020-05-18 18:24:31 -03:00
Leon422 1d9398abb3
*commits in Spanish again*
Added the cheats menu to the feature list, and updated the feature list in general to match the English version.
2020-05-18 22:15:06 +01:00
Leon422 7ad1b1f12b
*commits in Spanish* 2020-05-18 22:13:00 +01:00
Leon422 36cef2ef5d
Added the cheats menu to the list of features 2020-05-18 22:10:37 +01:00
fgsfds 952495ae08 clean up cliopts 2020-05-18 23:31:19 +03:00
fgsfds 2bd840a299 (hopefully) fix the timing crap; add vsync option 2020-05-18 23:03:04 +03:00
fgsfds d10f7ce45e
Merge pull request #179 from dernett/fix-fullscreen-text
Fix fullscreen text
2020-05-18 22:38:19 +03:00
Daniel 8586c7657a Added "Exit course at any time", "Huge Mario" and "Tiny Mario" cheats
The exit course at any time cheat clears up one of the TODO items while keeping purists happy since it's optional :)
2020-05-18 17:51:53 +01:00
Alex Burnett 1ede50c1a5 Fix text being wrapped in fullscreen 2020-05-18 03:34:27 -07:00
V. R. Miguel 34e5ff3fc7
Merge pull request #175 from sm64pc/nightly
Update master with new  stuff from nightly
2020-05-18 00:39:09 -03:00
Vinícius R. Miguel bd186569de Fixes --fullscreen and --windowed problems 2020-05-18 00:28:05 -03:00
V. R. Miguel cd2e6c0774
Merge pull request #165 from HeavenVolkoff/save_win_dimensions
Implement save/restore of window dimensions/position

Thanks for the contribution, @HeavenVolkoff!
2020-05-18 00:10:42 -03:00
Vinícius R. Miguel 4246242138 Still about #172 2020-05-17 23:58:22 -03:00
Vinícius R. Miguel ba04643b61 Potential fix for #172
Adds a null-terminator to gCLIOpts.ConfigFile
2020-05-17 23:55:17 -03:00
Heaven Volkoff 98efed7c51 Reset Window now exit fullscreen
Change configFullscreen to configWindow.fullscreen
2020-05-17 23:31:31 -03:00
Heaven Volkoff 9927b3555d Fix fullscreen exit resulting in a slightly lower Y position 2020-05-17 23:31:31 -03:00
Heaven Volkoff 0fa331d961 Implement save/restore window dimensions/position
- Add an entry in options menu to reset window
2020-05-17 23:31:31 -03:00
IvanDSM d6495550f5 Release mouse when paused 2020-05-17 22:37:52 -03:00
IvanDSM f29ce2d8f0 Merge branch 'nightly' of github.com:sm64pc/sm64pc into nightly 2020-05-17 21:24:01 -03:00
IvanDSM 5e637bd121 Fix crashing when OOB in BETTERCAMERA builds
Previously, an attempt to read gMarioState->floor->type was being made even when gMarioState->floor was a null pointer.
This commit makes bettercamera check if gMarioState->floor is not null before accessing it.
2020-05-17 21:23:30 -03:00
V. R. Miguel 6811d9e01c
Fixed a dumb thing 2020-05-17 21:17:27 -03:00
Vinícius R. Miguel 15c7670ce8 Merge remote-tracking branch 'origin/nightly' into nightly 2020-05-17 21:06:59 -03:00
Vinícius R. Miguel 262963bf88 Restructuring some of the cheat code 2020-05-17 21:06:38 -03:00