Commit Graph

2661 Commits (f78f9dcbd5297a95750597c4d4e2495ad9a01a4e)

Author SHA1 Message Date
fgsfds bbdcdb1f36 Merge pull request #163 from RulerOf/master
Fix TARGET_WEB builds
2020-05-18 00:07:59 +03:00
Andrew Bobulsky c16a460e94 Fix TARGET_WEB builds 2020-05-17 15:22:50 -04:00
fgsfds 053a016676 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 ba0ae4f787 Merge branch 'nightly' into master 2020-05-17 20:19:42 +03:00
fgsfds 5b25a92d95 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 7bb879f2c4 no need for that, window resize events happen when fullscreen state changes 2020-05-17 19:56:33 +03:00
fgsfds 0a246ab8f1 update gfx_sdl2.c with the latest stuff from Emill/n64-fast3d-engine 2020-05-17 19:49:36 +03:00
uncletrunks b222decc38 fix for issue #149 2020-05-17 11:03:02 -05:00
Colton G. Rushton ff6caad6b0 Makefile updated to thanos TARGET_N64 2020-05-17 08:19:04 -03:00
Colton G. Rushton a5e6a388de The last of TARGET_N64 finally gets thanos'd 2020-05-17 08:17:37 -03:00
yksoft1 36c266b50b Fix cliopts on MinGW.org. 2020-05-17 19:01:13 +08:00
yksoft1 8d9f9f6ef5 Merge remote-tracking branch 'upstream/master' into mingw.org-compatible 2020-05-17 18:33:17 +08:00
Colton G. Rushton cd8ecb2383 Fix unused code 2020-05-17 05:49:34 -03:00
V. R. Miguel d15111c9c8 A better fix to the cylboard problem
So we've reverted the previous 'fix' and add this one, by @HeavenVolkoff.
2020-05-17 03:34:05 -03:00
Vinícius R. Miguel bb41042767 Revert "Fixes billboarding-related problems"
This reverts commit 94fce064f4.
2020-05-17 03:29:19 -03:00
Vinícius R. Miguel 94fce064f4 Fixes billboarding-related problems 2020-05-17 02:15:11 -03:00
Vinícius R. Miguel 2e850cd076 Merge pull request #144 from sm64pc/master
Add MXE related fixes... again
2020-05-16 23:12:13 -03:00
IvanDSM 75ed41ab1a Merge pull request #142 from coltongit/patch-19
Update readme for MXE compilation support
2020-05-16 23:07:25 -03:00
Colton G. Rushton 3bec2df4ef Update readme for MXE compilation support 2020-05-16 23:05:24 -03:00
IvanDSM 327bd5336f Merge pull request #140 from coltongit/patch-17
Fix small bug with MXE compilation
2020-05-16 22:58:53 -03:00
Colton G. Rushton 66e448ac67 fix small bug with MXE compilation
the no-pie command line option was being sent to MXE when it shouldn't have been, breaking MXE compilation. Urgent fix.
2020-05-16 22:54:03 -03:00
Vinícius R. Miguel 99e7299ff1 Merge pull request #139 from sm64pc/master
Add MXE/OSX stuff to nightly
2020-05-16 22:08:24 -03:00
IvanDSM 1031f9f7ea Fix --fullscreen/--windowed CLI option altering config file.
Previously, when the --fullscreen or --windowed CLI options were set, configFullscreen was overwritten.
This caused the config file to be changed according to the CLI options given when running the executable.
A helper variable that copies configFullscreen stops the game from overwritting the config file.
2020-05-16 21:53:00 -03:00
IvanDSM d936b980df Add --help and --windowed CLI options. 2020-05-16 21:39:48 -03:00
IvanDSM a5f0e0314c Merge pull request #137 from coltongit/patch-15
Make MXE easier to compile in

Thanks for the contribution, @coltongit!
2020-05-16 21:38:01 -03:00
Colton G. Rushton 4e9584e178 Fix a few minor bugs with MXE compilation 2020-05-16 21:24:29 -03:00
Colton G. Rushton 9921c12d5b Make MXE easier to compile in
Specifying the target arch MXE expects in the makefile makes it easier for MXE users to compile the game.
2020-05-16 21:04:55 -03:00
fgsfds 316a72d207 Merge pull request #133 from Hyenadae/osx_build_clean
OSX_BUILD cleaned commit (new rebase from Master)
2020-05-17 01:29:52 +03:00
fgsfds e519d970fa Merge branch 'master' into osx_build_clean 2020-05-17 01:27:51 +03:00
fgsfds e949d0595c Merge pull request #132 from coltongit/patch-12
Further fixes to MXE compilation
2020-05-17 01:24:14 +03:00
Colton G. Rushton 4da08e8449 strip out now-needless NOBZERO flag 2020-05-16 19:20:45 -03:00
Colton G. Rushton 36c2e7e946 fixed MXE once and for all
thanks to @fgsfdsfgs, this is the final thing needed for MXE support
2020-05-16 19:18:50 -03:00
Vinícius R. Miguel f10f3deb74 Merge pull request #135 from sm64pc/master
Added nightly notice.
2020-05-16 18:39:37 -03:00
Vinícius R. Miguel 5da90314fd Added nightly notice. 2020-05-16 18:37:08 -03:00
Vinícius R. Miguel 63b015f737 Fixed some stuff 2020-05-16 18:14:43 -03:00
Vinícius R. Miguel ca0a8311a4 Add a `--configfile` CLI option
Usage: `--configfile yahoo.ini` will load up a file named yahoo.ini as the configuration file.
2020-05-16 18:07:14 -03:00
Vinícius R. Miguel 3007a5e2a4 Add support for saves of both endiannesses.
Porting from testing. Originally by @fgsfdsfgs.
2020-05-16 17:57:40 -03:00
Colton G. Rushton 61fc6410df fix the MXE fix for os_libc.h 2020-05-16 17:21:59 -03:00
Colton G. Rushton 06d1ca4a6a Another fix to MXE 2020-05-16 17:20:33 -03:00
Colton G. Rushton f05f04271b MXE fix for os_libc.h 2020-05-16 17:14:10 -03:00
Colton G. Rushton e84fa5fab2 Add NO_BZERO for MXE 2020-05-16 17:12:56 -03:00
fgsfds e0533abb54 Merge pull request #86 from Hyenadae/master
Remove the majority of TARGET_N64 logic from code
2020-05-16 22:51:58 +03:00
fgsfds 23055c2a44 Merge branch 'master' into master 2020-05-16 22:47:39 +03:00
fgsfds ea24922e4b tabs begone 2020-05-16 22:39:37 +03:00
fgsfds e266530f6c Merge pull request #126 from HeavenVolkoff/gfx_use_second_light_color
Consider second color column of Light_t when calculating vertex colors
2020-05-16 22:38:36 +03:00
Hyenadae 227c3cdb90 OSX_BUILD cleaned commit 2020-05-16 15:30:27 -04:00
Vinícius R. Miguel c0665cf4f1 Shutdown subsystems on exit
Porting from testing, originally by @fgsfdsfgs
2020-05-16 16:23:23 -03:00
Colton G. Rushton dfc0439a65 Further fixes to MXE compilation
Adds on the work of PR #130.
2020-05-16 16:16:44 -03:00
Vinícius R. Miguel 1197fe98d9 Typo in "extract_assets.py" 2020-05-16 15:45:40 -03:00
Vinícius R. Miguel d25cf9f856 Typo in extract_assets.py 2020-05-16 15:44:55 -03:00