Commit Graph

795 Commits

Author SHA1 Message Date
Zerocker 9917188ec8 Revert "Secret Cheat was added"
This reverts commit 19990cde38.
2020-05-31 14:18:17 +09:00
Zerocker 82163b706a Merge remote-tracking branch 'upstream/nightly' into textsaves_fix 2020-05-30 21:00:11 +09:00
Zerocker 709a049ab6 Added rumble strength option 2020-05-30 20:50:12 +09:00
Zerocker 2bc577bc3c Added haptic implementation 2020-05-30 20:37:37 +09:00
Zerocker cf122ee6e8 Merge remote-tracking branch 'upstream/nightly' into rumble_back 2020-05-30 17:34:56 +09:00
fgsfds f6c54e95b2 read in all config line tokens (fixes the binds not saving) 2020-05-29 20:10:38 +03:00
fgsfds 93030b02a3 don't die after encountering a NULL texture 2020-05-29 19:35:35 +03:00
fgsfds 540a0387c9 fix build 2020-05-29 18:08:00 +03:00
Zerocker b5cdf7e7f6 Returned back OS functions in the commented state 2020-05-29 23:23:45 +09:00
Zerocker 3f1fd3aba8 Merge remote-tracking branch 'upstream/nightly' into rumble_back 2020-05-29 23:19:09 +09:00
fgsfds aaa2c71d43
Merge pull request #278 from GateGuy/DeadzoneOption
Added joystick deadzone setting to Controls
2020-05-29 08:22:00 +03:00
GateGuy 2e332c9316 Fixed typo in comment 2020-05-28 18:42:45 -04:00
GateGuy 875d7a9b3c Added deadzone option 2020-05-28 18:40:36 -04:00
fgsfds 85a1d88422 texrename: handle multiple files with the same CRC too 2020-05-28 23:08:47 +03:00
fgsfds a0a256499b
Merge pull request #269 from coltongit/patch-31
Fix a minor error with bettercamera
2020-05-27 03:18:02 +03:00
fgsfds 8013b9a325 add scripts to rename CRC-named HD textures
as used by @originalgrego's fork
2020-05-27 02:56:12 +03:00
fgsfds 62e78a74c0 fix crashes with EXTERNAL_TEXTURES on JP/EU and Bowser
related to two huge textures and fonts
2020-05-27 02:51:21 +03:00
Colton G. Rushton b5b5aab076
Fix a minor error with bettercamera
The bettercamera code set when the player goes to THI is actually supposed to be set when the player goes to TTM. This small PR fixes this minor bug.
2020-05-26 15:28:36 -03:00
fgsfds e3401f1547 use a script to output zero-terminated strings instead of bash printf 2020-05-26 02:59:38 +03:00
fgsfds 9f9e79ed9d build the res target by default when EXTERNAL_TEXTURES is enabled 2020-05-26 02:18:09 +03:00
fgsfds 655c381d6f add texture preloading
when EXTERNAL_TEXTURES is defined, the texture hashmap in gfx_pc.c uses texture names as keys

all textures are precached on startup if EXTERNAL_TEXTURES is defined and 'precache' is true in the config
2020-05-26 00:54:51 +03:00
fgsfds f8139cce6d fix tools Makefile 2020-05-26 00:47:08 +03:00
Zerocker 6166402626 Removed ifndefs from main 2020-05-25 17:06:50 +09:00
fgsfds 1873f7aba5 game now uses non-working directory paths by default
saves by default go into XDG_DATA_HOME/sm64pc

external data is read from the executable directory, if it's not found there on Unix systems the game will attempt to read it from some paths like /usr/local/share/sm64pc

both save data and readonly data fall back to other options in case of a problem

behavior can be overridden by specifying --datapath and --savepath on the CLI

both of those will expand the exclamation point ('!') to the executable path, e. g. --savepath '!/save'
2020-05-25 07:19:35 +03:00
fgsfds 9825b02f50 add option to load textures from external files
this stores the null terminated texture name instead of the texture data

activated with EXTERNAL_TEXTURES=1
2020-05-25 04:22:03 +03:00
fgsfds 87d6f30a08 fix skyconv --write-tiles --type sky 2020-05-25 02:25:13 +03:00
fgsfds eeca3b0ec0 remove debug print in Makefile 2020-05-25 00:58:43 +03:00
Zerocker ce864043c1 Enabled rumble for all versions. 2020-05-24 23:52:03 +09:00
Zerocker 19990cde38 Secret Cheat was added 2020-05-24 23:50:55 +09:00
Zerocker 37ff33b0a2 Added blank SDL functions for rumble support. 2020-05-24 23:49:49 +09:00
fgsfds 4bbde37464 this ain't const anymore 2020-05-22 01:42:07 +03:00
fgsfds 686ea5be7b separate options menu strings and add JP strings 2020-05-22 01:36:49 +03:00
fgsfds a9d16ea76a unfuck BSWAP16 macro, replace it with BE_TO_HOST16() in audio 2020-05-22 01:36:49 +03:00
fgsfds aaf6eab582 fix text rendering on JP and (maybe) EU
also cache converted IA1 characters so it wouldn't reconvert them every goddamn time they're rendered
2020-05-22 01:36:49 +03:00
IvanDSM 1298cd6017 Add commit hash to window title for nightly builds.
This also adds a flag for detecting nightly builds in the code.
2020-05-21 14:19:20 -03:00
fgsfds a23aa77b57
Merge pull request #245 from coltongit/patch-30
Hotfix to bettercamera
2020-05-21 19:51:20 +03:00
Colton G. Rushton d139e23177
Unrevert the bettercamera update but this time actually fix it 2020-05-21 13:40:02 -03:00
Colton G. Rushton 4cc5ffff32
Undo the bettercamera update
This screwed up the bettercamera for whatever reason. Urgent hotfix. Please test
2020-05-21 12:52:40 -03:00
Zerocker 84b970cfe1 Merge remote-tracking branch 'upstream/nightly' into textsaves_fix 2020-05-21 16:54:06 +09:00
V. R. Miguel 4e7ce3ffba
Merge pull request #226 from coltongit/puppycam-fixes
Updating Bettercamera (also fixes cannons)
Thanks for the contribution, @coltongit, @porcino  :)
2020-05-20 23:18:43 -03:00
IvanDSM 5071b82150 Merge branch 'nightly' of github.com:sm64pc/sm64pc into nightly 2020-05-20 22:39:27 -03:00
IvanDSM a6f7cefe96 Quick fix for NODRAWINGDISTANCE=1 hanging fix 2020-05-20 22:39:07 -03:00
IvanDSM 66c9755258
Merge pull request #236 from coltongit/sparkle-texture-fix
Add minor sparkle texture fixes
2020-05-20 21:34:06 -03:00
fgsfds 0724f0ed09 add fog to GL1.3 renderer
uses two different methods, with the first one taking priority if it's available:

a) use the fog factor supplied in the fog colors as a GL_FOG_COORD; GL_FOG_COORD is only available in GL1.4+ or when GL_EXT_fog_coord is present

just blend the same triangles a second time, but replace the color with fog color and multiply the alpha by fog alpha
2020-05-21 03:12:51 +03:00
Colton Rushton 9805dcab32 Minor fix to updated bettercamera 2020-05-20 21:10:00 -03:00
Colton G. Rushton ba8345377e
Added info that sparkle texture 5 was fixed 2020-05-20 20:59:16 -03:00
Colton G. Rushton f7355b91ab
Add minor sparkle texture fixes
Controlled by TEXTURE_FIX as mandated by the Koopa shorts issues/PRs
2020-05-20 20:54:25 -03:00
Colton Rushton 6e936174b0 Resolve a few errors with the new additions. 2020-05-20 16:52:52 -03:00
fgsfds 2714708ca9 avoid redefining CLOCK_MONOTONIC and shit 2020-05-20 17:56:35 +03:00
fgsfds 5e17e23393
Merge pull request #232 from Tarnadas/nightly
fix non mingw builds
2020-05-20 17:53:21 +03:00