etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 21:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
761 commits 3 branches 5 tags 268 MiB
Commit graph

321 commits

Author SHA1 Message Date
fgsfds
b3ddd3a9fc remove garbage from game_loop_one_iteration 2020-07-07 20:43:46 +03:00
fgsfds
442ef7665f remove garbage from game_loop_one_iteration 2020-07-07 20:43:46 +03:00
fgsfds
bc3e94b11e bump gfx pool size 2020-07-07 15:21:14 +03:00
fgsfds
b1d7124110 bump gfx pool size 2020-07-07 15:21:14 +03:00
fgsfds
1486bee60a replace 'double' vsync option with 'auto' from sm64-port 2020-07-07 15:21:14 +03:00
fgsfds
2993a7bed6 replace 'double' vsync option with 'auto' from sm64-port 2020-07-07 15:21:14 +03:00
fgsfds
bf174e36a6 nuke TARGET_N64 remnants 2020-07-05 14:42:26 +03:00
n64
c33936e862 Enhance Z-fighting issues for shadows 2020-07-05 14:39:34 +03:00
n64
744b6bf5d6 Don't render low-polygon variants on pc-port 2020-07-05 14:37:11 +03:00
fgsfds
df1340c37c 'Better skybox position precision' from sm64-port 2020-07-05 14:33:57 +03:00
n64
6330644371 Refresh 11 2020-07-05 14:15:43 +03:00
fgsfds
9e4c0f26c9 bettercam: camera centering is bound to L again 2020-06-25 01:18:50 +03:00
fgsfds
026361ad61 force disable free camera during demo playback 2020-06-24 16:25:44 +03:00
fgsfds
89974e786d eu: check if language value is correct 2020-06-23 04:10:38 +03:00
fgsfds
cb9bd73866 reenable puppycam after level change 2020-06-21 20:42:02 +03:00
fgsfds
59cbe0ab70 update puppycam; add runtime option to disable it 2020-06-20 17:22:33 +03:00
fgsfds
fe44da4794 fix GRUCODE defines 2020-06-20 04:32:12 +03:00
n64
4a448cf10d merge refresh 10 2020-06-20 02:49:59 +03:00
Pouar
44f9b92124 Bugfix 
The bullets snufit shoots immediately got deleted shortly after
shooting when NODRAWDISTANCE was enabled. This fixes it
 2020-06-18 19:34:57 -05:00
fgsfds
29e915e4df fix JP build 2020-06-17 05:18:05 +03:00
fgsfds
b1b3fef112
Merge pull request #329 from KiritoDv/nightly 
Music Volume Config
 2020-06-14 23:27:06 +03:00
NoHomoBoi
b15bd727c2 Added sfx and env volume settings 2020-06-13 02:16:00 -05:00
fgsfds
208bfdcbf3 move all the discordrpc stuff to pc_main.c 
that means it will now work in D3D11 and D3D12

also 'normalized' the sdl2 main loop
 2020-06-13 04:21:47 +03:00
NoHomoBoi
7c341334f0 Code cleanup & changed max volume to 127 2020-06-12 03:22:08 -05:00
NoHomoBoi
2fa7e4f4ba Merge branch 'nightly' of https://github.com/KiritoDv/sm64pc into nightly 2020-06-11 22:40:55 -05:00
NoHomoBoi
49dc1e3495 Added music volume config 2020-06-11 22:39:13 -05:00
fgsfds
3557e895fe add apply button to display settings 2020-06-11 22:24:46 +03:00
fgsfds
a81a8e6ef1 added D3D11 and D3D12 renderers from Emil/n64-fast3d-engine 
along with options to select backends for windowing, rendering, audio and controls in the Makefile

use RENDER_API=D3D11 or D3D12 for the D3D renderers, that will also automatically enable using DXGI for windowing; SDL2 will still be used for input and audio for the time being

also adds three-point filtering to the OpenGL backend and an option for it in the menu
 2020-06-11 22:24:46 +03:00
fgsfds
01e6061276 clean up discord rpc a bit 2020-06-09 20:46:26 +03:00
Jan
233c2d8f72
Merge branch 'nightly' into feature/discordrpc 2020-06-09 17:16:42 +02:00
Jan200101
5933742f82
replace static linking with dynamically loaded libraries 2020-06-09 17:15:49 +02:00
Jan200101
f1ba90d25b
add discord rpc support 2020-06-09 12:01:31 +02:00
fgsfds
b9c94ad57d fix text saves 2020-06-07 22:00:23 +03:00
Zerocker
f6ab82d144 Fix a couple of warnings 2020-06-07 22:19:47 +09:00
Zerocker
6733bdb3ae Fix parsing for bonus and cap data 2020-06-07 21:44:00 +09:00
Zerocker
808bd99592 Remove some braindead comments 2020-06-07 21:38:14 +09:00
fgsfds
5d2f4e1ba5 32 chars is too small for this shit 2020-06-05 20:26:43 +03:00
fgsfds
e9f0519bc4 text saves now utilize the save path 2020-06-05 20:23:18 +03:00
Zerocker
ad92b93b39
Fix missed collected stars after gameover 2020-06-05 15:15:40 +09:00
fgsfds
aff081080b unfuck keyboard API; actually use seconds for rumble time 2020-06-04 23:58:18 +03:00
Zerocker
77217baf13 Merge remote-tracking branch 'upstream/nightly' into rumble_back 2020-06-04 19:13:41 +09:00
fgsfds
f00c553f75
Merge pull request #287 from GateGuy/NoDrawFishFix 
Fixed fish constantly respawning with NODRAWINGDISTANCE=1
 2020-06-02 02:41:14 +03:00
GateGuy
269cd8f60f Fixed constant fish respawning 2020-06-01 17:33:22 -04:00
fgsfds
6cee636382 change EXTERNAL_TEXTURES to EXTERNAL_DATA; load sound data from external files 
no separation tho, just binary blobs o shit
 2020-06-01 12:13:05 +03:00
Zerocker
b7b255317f Added backup for slot 0 to slot 1 2020-06-01 00:02:47 +09:00
Zerocker
4a24cb9d16 Removed "Disable BLJ" from branch 2020-05-31 14:23:28 +09:00
Zerocker
9917188ec8 Revert "Secret Cheat was added" 
This reverts commit 19990cde38.
 2020-05-31 14:18:17 +09:00
Zerocker
82163b706a Merge remote-tracking branch 'upstream/nightly' into textsaves_fix 2020-05-30 21:00:11 +09:00
Zerocker
709a049ab6 Added rumble strength option 2020-05-30 20:50:12 +09:00
Zerocker
cf122ee6e8 Merge remote-tracking branch 'upstream/nightly' into rumble_back 2020-05-30 17:34:56 +09:00
fgsfds
93030b02a3 don't die after encountering a NULL texture 2020-05-29 19:35:35 +03:00
Zerocker
b5cdf7e7f6 Returned back OS functions in the commented state 2020-05-29 23:23:45 +09:00
Zerocker
3f1fd3aba8 Merge remote-tracking branch 'upstream/nightly' into rumble_back 2020-05-29 23:19:09 +09:00
fgsfds
aaa2c71d43
Merge pull request #278 from GateGuy/DeadzoneOption 
Added joystick deadzone setting to Controls
 2020-05-29 08:22:00 +03:00
GateGuy
2e332c9316 Fixed typo in comment 2020-05-28 18:42:45 -04:00
GateGuy
875d7a9b3c Added deadzone option 2020-05-28 18:40:36 -04:00
fgsfds
a0a256499b
Merge pull request #269 from coltongit/patch-31 
Fix a minor error with bettercamera
 2020-05-27 03:18:02 +03:00
fgsfds
62e78a74c0 fix crashes with EXTERNAL_TEXTURES on JP/EU and Bowser 
related to two huge textures and fonts
 2020-05-27 02:51:21 +03:00
Colton G. Rushton
b5b5aab076
Fix a minor error with bettercamera 
The bettercamera code set when the player goes to THI is actually supposed to be set when the player goes to TTM. This small PR fixes this minor bug.
 2020-05-26 15:28:36 -03:00
Zerocker
6166402626 Removed ifndefs from main 2020-05-25 17:06:50 +09:00
fgsfds
1873f7aba5 game now uses non-working directory paths by default 
saves by default go into XDG_DATA_HOME/sm64pc

external data is read from the executable directory, if it's not found there on Unix systems the game will attempt to read it from some paths like /usr/local/share/sm64pc

both save data and readonly data fall back to other options in case of a problem

behavior can be overridden by specifying --datapath and --savepath on the CLI

both of those will expand the exclamation point ('!') to the executable path, e. g. --savepath '!/save'
 2020-05-25 07:19:35 +03:00
Zerocker
ce864043c1 Enabled rumble for all versions. 2020-05-24 23:52:03 +09:00
Zerocker
19990cde38 Secret Cheat was added 2020-05-24 23:50:55 +09:00
fgsfds
686ea5be7b separate options menu strings and add JP strings 2020-05-22 01:36:49 +03:00
fgsfds
a9d16ea76a unfuck BSWAP16 macro, replace it with BE_TO_HOST16() in audio 2020-05-22 01:36:49 +03:00
fgsfds
aaf6eab582 fix text rendering on JP and (maybe) EU 
also cache converted IA1 characters so it wouldn't reconvert them every goddamn time they're rendered
 2020-05-22 01:36:49 +03:00
Colton G. Rushton
d139e23177
Unrevert the bettercamera update but this time actually fix it 2020-05-21 13:40:02 -03:00
Colton G. Rushton
4cc5ffff32
Undo the bettercamera update 
This screwed up the bettercamera for whatever reason. Urgent hotfix. Please test
 2020-05-21 12:52:40 -03:00
Zerocker
84b970cfe1 Merge remote-tracking branch 'upstream/nightly' into textsaves_fix 2020-05-21 16:54:06 +09:00
V. R. Miguel
4e7ce3ffba
Merge pull request #226 from coltongit/puppycam-fixes 
Updating Bettercamera (also fixes cannons)
Thanks for the contribution, @coltongit, @porcino  :)
 2020-05-20 23:18:43 -03:00
IvanDSM
a6f7cefe96 Quick fix for NODRAWINGDISTANCE=1 hanging fix 2020-05-20 22:39:07 -03:00
Colton Rushton
9805dcab32 Minor fix to updated bettercamera 2020-05-20 21:10:00 -03:00
Colton Rushton
6e936174b0 Resolve a few errors with the new additions. 2020-05-20 16:52:52 -03:00
Zerocker
89bab59fbf Added appropriate flags for sound mode and cap level. Documentation has been updated. 2020-05-20 23:28:04 +09: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
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
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
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
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
Heaven Volkoff
98efed7c51 Reset Window now exit fullscreen 
Change configFullscreen to configWindow.fullscreen
 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
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
Vinícius R. Miguel
262963bf88 Restructuring some of the cheat code 2020-05-17 21:06:38 -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
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
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
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
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
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
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
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
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
f39d9ad096
Merge pull request #102 from sm64pc/skipintro 
Add command line parsing and --skip-intro option
 2020-05-15 12:36:15 -03:00
IvanDSM
86a3f84010
Merge branch 'master' into skipintro 2020-05-14 23:05:21 -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
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
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
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
fgsfds
a0ba46eaf6 move bettercamera settings to config file; cleanup 2020-05-10 21:39:23 +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
IvanDSM
3ebfc225ca Mouse Look ported to camera_rebase 
With check for settings SDL_SetRelativeMouseMode only if Mouse Look is enabled.

We always send regards to Fastblitters.
 2020-05-09 02:10:56 -03:00
Vinícius R. Miguel
ef2cd47343 True analog camera control has been added. 2020-05-09 01:19:13 -03:00
Jan200101
be340547c4
port analog camera code to the master codebase 2020-05-08 13:41:35 +02:00
Jan200101
e87c070517
merge PC port onto the decompile 2020-05-07 20:21:22 +02:00
n64
c45aa301bb Refresh 8 2020-04-03 14:57:26 -04:00
n64
06ec56df7f Refresh 7 2020-03-01 22:42:52 -05:00
n64
9a801cb96d refresh 6 2020-02-03 00:51:26 -05:00
n64
9273f38df1 refresh 5 2020-01-03 10:38:57 -05:00
n64
04732af90b refresh 4 2019-12-01 21:52:53 -05:00
n64
a7c423cb43 Refresh 3 2019-11-03 14:36:27 -05:00
n64
52e605f075 Refresh 2 2019-10-05 15:08:05 -04:00
n64
1ef98ec785 Refresh 1 2019-09-01 15:50:50 -04:00
n64
89e8690857 init2 2019-08-25 00:46:40 -04:00