Commit Graph

298 Commits

Author SHA1 Message Date
Jordy b78997814a
Remove description for the FPS counter
The removed description is about applying a patch that does not exist anymore. It is removed from all branches on the 9th of may (commit 7a81769 , 094e570 & 5024cde).
2020-06-06 21:34:16 +02: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
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
fgsfds eaba9656d6
Merge pull request #169 from kurethedead/nightly
Implemented LoadTile f3d command, I4/I8/RGBA32 texture formats.
2020-05-18 02:45:11 +03:00
V. R. Miguel 2287fcce9f
Merge pull request #170 from Leon422/nightly
Added a "responsive controls" cheat
2020-05-17 20:08:13 -03:00
Daniel 17c6e56907 Added a "super responsive controls" cheat
Added a "super responsive controls" cheat. When enabled, Mario will look straight into the direction the user inputs when changing directions, with no interpolation at all. (you can still slide / side jump / etc )

The change is especially noticeable when playing with keyboard.
2020-05-18 00:05:26 +01:00
kurethedead 181e18dfea Implemented LoadTile f3d command, I4/I8/RGBA32 texture formats. 2020-05-17 15:48:06 -07:00
V. R. Miguel 15dabb7c22
Merge pull request #166 from Leon422/nightly
Enabled a Cheat menu

Thanks for the contribution, @Leon422!
2020-05-17 19:32:44 -03:00
Leon422 1a9c8dbe47
Fixed tabs/spaces 2020-05-17 23:27:40 +01:00
V. R. Miguel 24bb7b5e90
Merge pull request #167 from sm64pc/master
Fix TARGET_WEB builds
2020-05-17 19:02:33 -03:00
Daniel 28fc53c207 Enabled a Cheat menu
Enabled a cheat menu. It includes 4 cheats, and all of them rely on the global "Enable cheats" option so the user can quickly turn all the selected cheats off and back on.
2020-05-17 22:56:06 +01:00
fgsfds 0504f884d7
Merge pull request #163 from RulerOf/master
Fix TARGET_WEB builds
2020-05-18 00:07:59 +03:00
Andrew Bobulsky fcc4cbb51d
Fix TARGET_WEB builds 2020-05-17 15:22:50 -04:00
fgsfds 166d1b3a73
Merge pull request #160 from sm64pc/master
Update gfx_sdl2.c and add fix to TARGET_WEB
2020-05-17 20:20:20 +03:00
fgsfds 094f3ebb33
Merge branch 'nightly' into master 2020-05-17 20:19:42 +03:00
fgsfds ece7649b4b use a wrapper for exiting instead of just calling exit()
this might also fix the webgl build issue
2020-05-17 19:56:56 +03:00
fgsfds 62cc4620ec no need for that, window resize events happen when fullscreen state changes 2020-05-17 19:56:33 +03:00