Commit Graph

411 Commits

Author SHA1 Message Date
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
fgsfds 58dbb04f97 update gfx_sdl2.c with the latest stuff from Emill/n64-fast3d-engine 2020-05-17 19:49:36 +03:00
uncletrunks 6b468f44f6 fix for issue #149 2020-05-17 11:03:02 -05:00
Colton G. Rushton 71d7750d45
Makefile updated to thanos TARGET_N64 2020-05-17 08:19:04 -03:00
Colton G. Rushton b52560869c
The last of TARGET_N64 finally gets thanos'd 2020-05-17 08:17:37 -03:00
yksoft1 072025d243 Fix cliopts on MinGW.org. 2020-05-17 19:01:13 +08:00
yksoft1 753be9e1b7 Merge remote-tracking branch 'upstream/master' into mingw.org-compatible 2020-05-17 18:33:17 +08:00
Colton G. Rushton c8a5d2ec68
Fix unused code 2020-05-17 05:49:34 -03:00
V. R. Miguel bc5942d189
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 d543bd0b3d Revert "Fixes billboarding-related problems"
This reverts commit 5558ecbd4e.
2020-05-17 03:29:19 -03:00
Vinícius R. Miguel 5558ecbd4e Fixes billboarding-related problems 2020-05-17 02:15:11 -03:00
Vinícius R. Miguel 983ae2a49b
Merge pull request #144 from sm64pc/master
Add MXE related fixes... again
2020-05-16 23:12:13 -03:00
IvanDSM ac97d96a37
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 a40892a1bf
Update readme for MXE compilation support 2020-05-16 23:05:24 -03:00
IvanDSM 60bca0e5db
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 5d800819df
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 bdc06d1709
Merge pull request #139 from sm64pc/master
Add MXE/OSX stuff to nightly
2020-05-16 22:08:24 -03:00
IvanDSM 5145f2a897 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 2c8382e60e Add --help and --windowed CLI options. 2020-05-16 21:39:48 -03:00
IvanDSM 43754e7ec0
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 410090a84c
Fix a few minor bugs with MXE compilation 2020-05-16 21:24:29 -03:00
Colton G. Rushton bd4187c92b
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 ed58f0b0c7
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 54f986a528
Merge branch 'master' into osx_build_clean 2020-05-17 01:27:51 +03:00
fgsfds 009aef1da5
Merge pull request #132 from coltongit/patch-12
Further fixes to MXE compilation
2020-05-17 01:24:14 +03:00
Colton G. Rushton 5c9e3c60a7
strip out now-needless NOBZERO flag 2020-05-16 19:20:45 -03:00
Colton G. Rushton 0402ad463b
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 60f6743306
Merge pull request #135 from sm64pc/master
Added nightly notice.
2020-05-16 18:39:37 -03:00
Vinícius R. Miguel 9fd43118cb
Added nightly notice. 2020-05-16 18:37:08 -03:00
Vinícius R. Miguel e67a5443b7 Fixed some stuff 2020-05-16 18:14:43 -03:00
Vinícius R. Miguel 7bf7b34c57 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 69ff11e459 Add support for saves of both endiannesses.
Porting from testing. Originally by @fgsfdsfgs.
2020-05-16 17:57:40 -03:00
Colton G. Rushton 385e396feb
fix the MXE fix for os_libc.h 2020-05-16 17:21:59 -03:00
Colton G. Rushton 8736776545
Another fix to MXE 2020-05-16 17:20:33 -03:00
Colton G. Rushton e42e1587b2
MXE fix for os_libc.h 2020-05-16 17:14:10 -03:00
Colton G. Rushton 3d7bdc300c
Add NO_BZERO for MXE 2020-05-16 17:12:56 -03:00
fgsfds 330f44285f
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 ff844643d2
Merge branch 'master' into master 2020-05-16 22:47:39 +03:00
fgsfds f6642e9a9d tabs begone 2020-05-16 22:39:37 +03:00
fgsfds f5e73a099b
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 5dd43ad674 OSX_BUILD cleaned commit 2020-05-16 15:30:27 -04:00
Vinícius R. Miguel 9e8290773b Shutdown subsystems on exit
Porting from testing, originally by @fgsfdsfgs
2020-05-16 16:23:23 -03:00
Colton G. Rushton f4a3757145
Further fixes to MXE compilation
Adds on the work of PR #130.
2020-05-16 16:16:44 -03:00
Vinícius R. Miguel 8722b09bb4
Typo in "extract_assets.py" 2020-05-16 15:45:40 -03:00
Vinícius R. Miguel 249a2d4763
Typo in extract_assets.py 2020-05-16 15:44:55 -03:00