Commit Graph

369 Commits

Author SHA1 Message Date
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
fgsfds a259cd15a1 add dumb master volume control 2020-05-16 16:15:40 +03:00
fgsfds 92c75fb21b simplify options menu definitions 2020-05-16 16:15:35 +03:00
fgsfds dbca0c413d add fullscreen and filtering settings to options
filtering only applies to newly loaded textures
2020-05-16 16:15:27 +03:00
Colton G. Rushton a83fa35c4d
Add compile-time texture fixes to Makefile
Add compile-time texture fixes as a Makefile build flag, set when `TEXTURE_FIX=1`.
2020-05-16 09:41:57 -03:00
Colton G. Rushton 03b129c5bf
Added compile-time optional Koopa shorts fix 2020-05-16 09:40:33 -03:00
Colton G. Rushton 6ebd074c5d
Set compile-time flag for texture fixes
This should allow for quashing the debate surrounding some minor texture fix PRs.
2020-05-16 09:36:06 -03:00
Heaven Volkoff 1a3034898c Consider second color column of Light_t when calculating vertex colors 2020-05-16 04:48:11 -03:00
Heaven Volkoff aba9a57e14 Fix Whomp and PiranhaPlant not appearing from a distance in WF 2020-05-16 03:03:54 -03:00
fgsfds de49bf1ac2 fix build on all toolchains except mine 2020-05-16 08:11:48 +03:00
fgsfds ed59481560 add OPT_BUTTON option type; move Exit Game button from pause to options menu 2020-05-16 08:03:50 +03:00
fgsfds 8b71a1a734 correct line endings 2020-05-16 07:36:28 +03:00
uncletrunks ee69a027ef
Merge pull request #120 from arredondos/master
add two scripts to extract and embed 3d models
2020-05-15 20:31:30 -05:00
Armando Arredondo Soto 45dc30e741
add two scripts to extract and embed 3d models
c2obj.py extracts the 3d models from the hard-coded C code found in the `model.in.c` files and generates a standard .obj file
obj2c.py converts back the geometry in an .obj file to compatible C code
2020-05-16 03:00:33 +02:00
uncletrunks 59a33aa604
Rebind camera centering to left trigger. 2020-05-15 19:26:44 -05:00
IvanDSM 2b098781b8 skip_intro now skips Lakitu and Bowser intros 2020-05-15 17:09:02 -03:00
IvanDSM e96bbef650 Fix configfile skip_intro option 2020-05-15 16:47:04 -03:00
IvanDSM 68e3865a16
Merge pull request #112 from diezgvi/patch-2
Correct texture format for burn smoke

Thanks for the contribution, @diezgvi!
2020-05-15 16:12:01 -03:00
Vinícius R. Miguel eb084461a8 Merge remote-tracking branch 'origin/master' 2020-05-15 15:38:57 -03:00
Vinícius R. Miguel 4a13fd3380 Add in-game control binding menu
Originally on the testing branch
2020-05-15 15:38:35 -03:00
Víctor Díez García e25b06b60e
Correct texture format for burn smoke
All credits to zoinknoise, I found this at Romhacking: http://www.romhacking.net/hacks/5008/

"Thanks to the recent decompilation efforts, it’s now known that this texture is displayed in the wrong format by the game, resulting in 

black garbage pixels. Since video game smoke of this era was often depicted with black garbage pixels, the mistake went unnoticed for over two decades. This patch corrects the error by displaying the texture correctly as proper transparent smoke. It does not add any new art; the texture has been inside the ROM all along.

At build time, this will compile the texture into IA16 format (correct) instead of RGBA16 (incorrect)."
2020-05-15 20:33:00 +02:00
Vinícius R. Miguel 5ed80ef723
Merge pull request #111 from Leon422/patch-2
Update README_es_ES.md
2020-05-15 14:13:42 -03:00