Commit Graph

340 Commits

Author SHA1 Message Date
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
Vinícius R. Miguel 4bbbc5b7e0
Typo in extract_assets.py
Closes #131
2020-05-16 15:42:59 -03:00
wabberz 6c4bf44d93
Merge pull request #123 from HeavenVolkoff/wf_no_drawing_distance
Fix Whomp, PiranhaPlant and Walking Penguin not appearing from a distance
2020-05-16 20:34:50 +02:00
wabberz a5d4b22606
Update whomp.inc.c 2020-05-16 20:33:41 +02:00
fgsfds efadc481ec
Merge pull request #130 from coltongit/patch-11
Fix compilation for MXE on Linux and WSL
2020-05-16 21:05:55 +03:00
Colton G. Rushton 3c6bf53dea
even further cleanup of the makefile 2020-05-16 14:59:27 -03:00
Colton G. Rushton 50af1393c3
Further clean up the makefile fixes 2020-05-16 14:38:47 -03:00
Colton G. Rushton 0a6ea9e9d4
Clean up the makefile fixes a bit 2020-05-16 14:35:56 -03:00
fgsfds 93cfab086a bettercam: add adjustable camera deceleration 2020-05-16 20:30:06 +03:00
fgsfds 1d557e4c4d only include camera options if BETTERCAM==1 2020-05-16 20:00:51 +03:00
fgsfds 0446b244eb separate EXT_OPTIONS_MENU into its own option 2020-05-16 19:53:36 +03:00
Colton G. Rushton 31c91c6968
Nah dude, that's possible under WINDOWS_BUILD=1 2020-05-16 13:46:18 -03:00
Colton G. Rushton 74058cf32f
Simplify MXE fixes 2020-05-16 13:01:23 -03:00
Colton G. Rushton 17695a7b4f
fix objcopy on MXE builds 2020-05-16 12:56:58 -03:00
Colton G. Rushton b4cb8a7f65
remove needless ifeq 2020-05-16 12:30:25 -03:00
Colton G. Rushton 0f688c80d0
removing a pesky endif 2020-05-16 12:26:06 -03:00
Colton G. Rushton 07aa2cd234
Fix compilation for MXE on Linux and WSL
Even though this isn't usually an option on the wiki, this will allow for cross-compilation of sm64pc through MXE on both Linux and WSL, making Wine testing much easier.
2020-05-16 12:21:16 -03:00
Vítor Augusto da Silva Vasconcellos f5c476987c
Merge pull request #1 from coltongit/patch-10
Extra NODRAWDISTANCE fixes
2020-05-16 12:08:27 -03:00
IvanDSM b8897eb5b4
Merge pull request #128 from coltongit/patch-9
Set compile-time build flag for texture fixes

Thanks for the contribution, @coltongit!
2020-05-16 11:37:31 -03:00
Colton G. Rushton 6736bd7e9c
Fix SL walking penguin for nodrawdistance 2020-05-16 10:23:32 -03:00
Colton G. Rushton fd9909269d
Remove newline in nodrawdistance define 2020-05-16 10:19:58 -03:00
fgsfds 9ae444d2b5 move filtering check to gfx_pc.c for those sweet realtime updates 2020-05-16 16:15:45 +03:00