vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity
513 Commits 4 Branches 0 Tags 32 MiB
Commit Graph

277 Commits

Author SHA1 Message Date
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
Mario Reder f99298943c fix non mingw builds 
resolves #230
 2020-05-20 16:50:05 +02:00
Zerocker 89bab59fbf Added appropriate flags for sound mode and cap level. Documentation has been updated. 2020-05-20 23:28:04 +09:00
fgsfds c540712154 add GL1.3 (or 1.2 with some extensions) rendering backend 
there are still some graphical glitches and no fog
 2020-05-20 07:00:04 +03:00
Colton Rushton 560800e97a Formatting fixes. 2020-05-19 22:10:47 -03:00
Colton Rushton f9d798c321 Another minor fix 2020-05-19 22:08:45 -03:00
Colton Rushton 68374ca330 Minor fix 2020-05-19 22:05:35 -03:00
Colton Rushton 26095da73c Updating Bettercamera 2020-05-19 21:58:15 -03:00
IvanDSM fb706c42f6 CLI improvements 2020-05-19 21:22:05 -03:00
fgsfds c57bacdfd7 clean up some toolchain compatibility fixes 
also rename the abs() macro to not cause any fucking conflicts ever again
 2020-05-19 22:22:52 +03:00
fgsfds 06f02dc210 separate text saves; fix build without TEXTSAVE 2020-05-19 21:56:23 +03:00
Leon422 c0a79af79c
Fixed spacing, added brackets. Ready to merge 2020-05-19 19:15:20 +01:00
Leon422 1590976046
Cheats can be enabled by pressing the L trigger 3 times while in the options menu. 
Also plays a sound to confirm the user that it worked.
 2020-05-19 18:31:01 +01:00
Zerocker 6a628322ba Merge remote-tracking branch 'upstream/nightly' into nightly 2020-05-20 00:02:29 +09:00
zerocloude f1698b9081
Merge pull request #205 from porcino/nightly 
Option to hide the hud
 2020-05-19 23:46:19 +09:00
zerocloude 0c03280516
Merge pull request #93 from yksoft1/mingw.org-compatible 
Making code MinGW.org and MSYS1 compatible
 2020-05-19 23:45:44 +09:00
zerocloude d604711468
Merge pull request #153 from coltongit/patch-23 
TARGET_N64 removal
 2020-05-19 23:37:51 +09:00
zerocloude 2b2572db4b
Merge pull request #150 from coltongit/patch-21 
Fix unused code
 2020-05-19 23:26:40 +09:00
zerocloude 1d4d92fe6d
Merge pull request #210 from coltongit/controller-axis-fix 
Fix to controller axis invert issue
 2020-05-19 23:25:33 +09:00
Colton Rushton 08ad740b1c Refactor PR #176 2020-05-19 10:51:49 -03:00
Colton Rushton b0081e8d60 Refactor PR #151 2020-05-19 10:14:44 -03:00
yksoft1 ee795fa7af My hacks to cliopts.h is not necessary anymore. 2020-05-19 20:15:25 +08:00
U-ALTTP-PC\ALTTP e97d25c2c6 option to hide the hud 2020-05-19 03:24:51 -03:00
V. R. Miguel 29bfb1b9b8
Merge branch 'nightly' into master 2020-05-18 23:00:42 -03:00
fgsfds c18e70f44e Revert "Merge branch 'nightly' into master" 
This reverts commit 2e8a821fa3, reversing
changes made to d499f55402.
 2020-05-19 02:38:59 +03:00
fgsfds 2e8a821fa3
Merge branch 'nightly' into master 2020-05-19 02:33:30 +03:00
fgsfds 26705aed7a disable cheats by default; use --cheats CLI option to enable for now 2020-05-19 01:59:29 +03:00
fgsfds 6a79a9af99 bring back the old frame timing method (if vsync != 2) 2020-05-19 01:32:49 +03:00
fgsfds 59913a9beb Revert "Revert "(hopefully) fix the timing crap; add vsync option"" 
This reverts commit c6961b8606.
 2020-05-19 01:25:59 +03:00
fgsfds c6961b8606 Revert "(hopefully) fix the timing crap; add vsync option" 
This reverts commit 2bd840a299.
 2020-05-18 18:48:11 -03:00
fgsfds c3c2451c6a Revert "(hopefully) fix the timing crap; add vsync option" 
This reverts commit 2bd840a299.
 2020-05-18 18:44:35 -03:00
fgsfds 952495ae08 clean up cliopts 2020-05-18 23:31:19 +03:00
fgsfds 2bd840a299 (hopefully) fix the timing crap; add vsync option 2020-05-18 23:03:04 +03:00
Daniel 8586c7657a Added "Exit course at any time", "Huge Mario" and "Tiny Mario" cheats 
The exit course at any time cheat clears up one of the TODO items while keeping purists happy since it's optional :)
 2020-05-18 17:51:53 +01:00
Zerocker e24473ee17 Support for text-based savefiles 2020-05-18 17:44:21 +09:00
Vinícius R. Miguel bd186569de Fixes --fullscreen and --windowed problems 2020-05-18 00:28:05 -03:00
V. R. Miguel cd2e6c0774
Merge pull request #165 from HeavenVolkoff/save_win_dimensions 
Implement save/restore of window dimensions/position

Thanks for the contribution, @HeavenVolkoff!
 2020-05-18 00:10:42 -03:00
Vinícius R. Miguel 4246242138 Still about #172 2020-05-17 23:58:22 -03:00
Vinícius R. Miguel ba04643b61 Potential fix for #172 
Adds a null-terminator to gCLIOpts.ConfigFile
 2020-05-17 23:55:17 -03:00
Heaven Volkoff 98efed7c51 Reset Window now exit fullscreen 
Change configFullscreen to configWindow.fullscreen
 2020-05-17 23:31:31 -03:00
Heaven Volkoff 9927b3555d Fix fullscreen exit resulting in a slightly lower Y position 2020-05-17 23:31:31 -03:00
Heaven Volkoff 0fa331d961 Implement save/restore window dimensions/position 
- Add an entry in options menu to reset window
 2020-05-17 23:31:31 -03:00
IvanDSM d6495550f5 Release mouse when paused 2020-05-17 22:37:52 -03:00
IvanDSM f29ce2d8f0 Merge branch 'nightly' of github.com:sm64pc/sm64pc into nightly 2020-05-17 21:24:01 -03:00
IvanDSM 5e637bd121 Fix crashing when OOB in BETTERCAMERA builds 
Previously, an attempt to read gMarioState->floor->type was being made even when gMarioState->floor was a null pointer.
This commit makes bettercamera check if gMarioState->floor is not null before accessing it.
 2020-05-17 21:23:30 -03:00
V. R. Miguel 6811d9e01c
Fixed a dumb thing 2020-05-17 21:17:27 -03:00
Vinícius R. Miguel 15c7670ce8 Merge remote-tracking branch 'origin/nightly' into nightly 2020-05-17 21:06:59 -03:00
Vinícius R. Miguel 262963bf88 Restructuring some of the cheat code 2020-05-17 21:06:38 -03:00
fgsfds eaba9656d6
Merge pull request #169 from kurethedead/nightly 
Implemented LoadTile f3d command, I4/I8/RGBA32 texture formats.
 2020-05-18 02:45:11 +03:00
V. R. Miguel 2287fcce9f
Merge pull request #170 from Leon422/nightly 
Added a "responsive controls" cheat
 2020-05-17 20:08:13 -03:00
Daniel 17c6e56907 Added a "super responsive controls" cheat 
Added a "super responsive controls" cheat. When enabled, Mario will look straight into the direction the user inputs when changing directions, with no interpolation at all. (you can still slide / side jump / etc )

The change is especially noticeable when playing with keyboard.
 2020-05-18 00:05:26 +01:00
kurethedead 181e18dfea Implemented LoadTile f3d command, I4/I8/RGBA32 texture formats. 2020-05-17 15:48:06 -07:00
V. R. Miguel 15dabb7c22
Merge pull request #166 from Leon422/nightly 
Enabled a Cheat menu

Thanks for the contribution, @Leon422!
 2020-05-17 19:32:44 -03:00
Leon422 1a9c8dbe47
Fixed tabs/spaces 2020-05-17 23:27:40 +01:00
Daniel 28fc53c207 Enabled a Cheat menu 
Enabled a cheat menu. It includes 4 cheats, and all of them rely on the global "Enable cheats" option so the user can quickly turn all the selected cheats off and back on.
 2020-05-17 22:56:06 +01:00
Andrew Bobulsky fcc4cbb51d
Fix TARGET_WEB builds 2020-05-17 15:22:50 -04: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 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 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
fgsfds 54f986a528
Merge branch 'master' into osx_build_clean 2020-05-17 01:27:51 +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
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
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 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
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
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
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
Vinícius R. Miguel 4a13fd3380 Add in-game control binding menu 
Originally on the testing branch
 2020-05-15 15:38:35 -03:00
Vinícius R. Miguel fd74e20373 Add a `--fullscreen` CLI option 2020-05-15 12:51:06 -03:00
Vinícius R. Miguel f39d9ad096
Merge pull request #102 from sm64pc/skipintro 
Add command line parsing and --skip-intro option
 2020-05-15 12:36:15 -03:00
Heaven Volkoff 339735392f Fix incorrect cursor position calculation on Mario head screen (related to #28) 2020-05-15 01:09:28 -03:00
uncletrunks ab23b8907b putting out fires 2020-05-14 21:50:10 -05:00
IvanDSM 86a3f84010
Merge branch 'master' into skipintro 2020-05-14 23:05:21 -03:00
IvanDSM 59d0cc16c1 Add <strings.h> include 
Oops!
 2020-05-14 23:02:04 -03:00
uncletrunks 8e1412a2ac more cylindrical billboarding stuff 2020-05-14 20:47:55 -05:00
uncletrunks 70ca0af987 adds cylindrical billboarding, enables it for trees. 2020-05-14 20:31:52 -05:00
fgsfds 8017d1dfa4 fix cursor on Mario head screen (fixes #28) 
gDPSetScissor fix originally by Emil
 2020-05-15 01:28:21 +03:00
uwabami a26c36b6b4 fix Fire Spitter 2020-05-14 19:08:30 +02:00
uwabami 2bdb1ab551 several fixes and improvements 2020-05-14 18:47:12 +02:00
yksoft1 1b03e251bb Better way to detect mingw-w64; fix bettercamera for mingw.org; close 
.assets-local.txt before deleting it.
 2020-05-15 00:26:56 +08:00
yksoft1 fa9af3227e Make the code buildable on MinGW.org (not mingw-w64) and MSYS1. 2020-05-14 23:47:00 +08:00
uwabami 8d2e0f5ffd fix Fwoosh in Tall, Tall Mountain 2020-05-14 17:07:14 +02:00
uwabami a773e68c15 fix Lakitu's cloud not appearing from a distance 2020-05-14 16:24:00 +02:00
uwabami 87dac5d916 fix bugged Heave-Ho in Wet-Dry World 2020-05-14 16:11:59 +02:00
Hyenadae 829c1f29a8 Fixed more border-related code and fixes to N64 build removal 2020-05-14 05:18:12 -04:00
Vinícius R. Miguel d5d151f322 Fix some overflow issues 
As found out by @fgsfdsfgs, increase the GFX pool size as to eliminate current overflow-related crashes.
 2020-05-13 11:25:22 -03:00
Hyenadae 31f0d68ca2 Removed majority of TARGET_N64 logic from code 2020-05-13 07:57:25 -04:00
uwabami bea82c00bc Increase GFX_POOL_SIZE to fix overflow in 32bit version - thanks fgsfds 2020-05-13 09:25:45 +02:00
uwabami c98a263cf4 adding option to disable draw distance 2020-05-12 09:26:16 +02:00
Vinícius R. Miguel 0ec63e46ac
Merge pull request #59 from Hyenadae/master 
Add Pi Script + WIP Addition of in-game menu quit -- Good job! Superb contribution :- )
 2020-05-12 01:42:15 -03:00
vanfanel d59c081905 Hide mouse cursor when in fullscreen mode. 2020-05-11 13:37:48 +02:00
Hyenadae 691d6f382b WIP In-Game Exit via pause+save menus w/ Localizations 2020-05-11 06:58:33 -04:00
IvanDSM bd93878c56 Add option in the configfile for skipping the intro 
Now it's possible to either provide the --skip-intro command line argument or have skip_intro set to 1 on the config file.
 2020-05-11 05:13:51 -03:00
BlankPixel 5957be7bf6 Fix incorrect arguments for newcam_clamp(), min and max were swapped; Simplified newcam_change_setting() with clamp function. 
Also added a nice sound effect when closing the camera menu.
 2020-05-10 23:42:29 -07:00
IvanDSM 4cbe3af070 Added CLI functionality with --skip-intro option. 2020-05-11 02:42:22 -03:00
IvanDSM ef3b0ba52d Fix hardcoded sensitivity (again?) 2020-05-11 01:53:52 -03:00
IvanDSM 595be623a0 Fix analogue camera axis inversion, mouse now obeys inversion. 2020-05-11 01:51:17 -03:00
Vinícius R. Miguel ff2ec85f8c Adds credit to Emil. 
For implementing n64-fast32-engine
 2020-05-10 17:47:10 -03:00
fgsfds a0ba46eaf6 move bettercamera settings to config file; cleanup 2020-05-10 21:39:23 +03:00
Vinícius R. Miguel aa046c76d9
Merge pull request #42 from vanfanel/master 
Thanks!
 2020-05-10 14:02:27 -03:00
vanfanel f24d44c9c7 Remove redundant code. Make GLES and GL modes respect DESIRED_WIDTH and DESIRED_HEIGHT in windowed mode, but in fullscreen mode just use the system video mode. 2020-05-10 18:23:34 +02:00
fgsfds d0b85785fe might as well check for L while we're at it 2020-05-10 19:15:13 +03:00
fgsfds 2234e28625 rebind Z trigger back to L 2020-05-10 19:14:59 +03:00
fgsfds d6820f6073 whoops, this is supposed to be the Z button 2020-05-10 19:09:43 +03:00
vanfanel 16a4495bf2 Do not call gfx_sdl_set_fullscreen() just after creating the game window: create window fullscreen or not directly. 2020-05-10 18:07:26 +02:00
fgsfds 690283da13 allow rebinding of joystick and mouse buttons 2020-05-10 19:05:54 +03:00
vanfanel fd02d88b59 Fix for GLES on windowed rendering contexts (X11) 2020-05-10 17:52:01 +02:00
fgsfds e427aaa894 make use of mouse buttons 2020-05-10 18:41:46 +03:00
vanfanel f70ebeb2b3 Use the system video mode in GLES platforms instead of setting a new one. 2020-05-10 15:41:46 +02:00
IvanDSM e3a2613328 Fix build without new camera, add example to README 
This fixes an oversight of mine that broke building with BETTERCAMERA=0 and adds an example to the README of how to build with the new camera disabled.
 2020-05-10 05:47:38 -03:00
IvanDSM 6ed071e49e
Merge branch 'master' into camera-rebase 2020-05-10 05:13:38 -03:00
IvanDSM 88b063d7a1 New Makefile and fgsfdsfgs fixes 
New Makefile based on master branch Makefile.
Ported fdsfgsfds' OOB memory access and save buffer corruption fixes.
 2020-05-10 05:11:27 -03:00
Colton G. Rushton ad89f663f3
More fixes ported from fdsfgsfds' fork 2020-05-10 00:05:33 -03:00
Colton G. Rushton 1c86dca581
Fix save corruption in some 64-bit builds 2020-05-09 21:13:57 -03:00