MysterD
670a554b37
Remove any lingering dialog boxes on level transition
...
Fixes #22
2020-09-04 21:27:06 -07:00
MysterD
00b0b7cd8f
Remote reading sign no longer causes sound spam
...
fixes #20
2020-09-04 21:14:14 -07:00
MysterD
4cb13edf84
Fix animation desync when pressing Z+B
...
Fixes #18
Found by el pinguino max
2020-09-04 21:08:04 -07:00
MysterD
1bb0c90741
Add docker-build workarounds and container script
2020-09-04 17:03:35 -07:00
MysterD
4a2c218f11
Synchronized save files
...
Now when a client joins, it will request the entire 512 byte EEPROM from
the server and refuse to continue until the server replies with the
contents. Then the client will override all reads and writes to the
EEPROM/save file. Thus, a client will never overwrite their local save.
Fixes #21
2020-09-04 15:07:32 -07:00
MysterD
d5005c9f37
Served time for crimes against C
...
Due to my compile & launch scripts, I was silently ignoring warnings
this whole time. I've fixed my process, and gone back to fixed all of
the warnings I could (even outside of my code).
2020-09-04 01:58:54 -07:00
MysterD
3c48e1df1a
Prevent infinite loop for remote sliding players
2020-09-03 18:32:07 -07:00
MysterD
68ad6bc15c
Added host/join in-game GUI
...
Now people aren't forced to launch with command-line parameters,
instead they can host or join a server by selecting buttons in
the main menu.
2020-09-03 18:30:15 -07:00
MysterD
f367ed2167
Prevented softlock and entity duplication when both grab at the same time
...
As reported by somario360:
After grabbing the small box at the same time, one of two results can happen.
There will be a fake cloned box that will only be visually in the other
player's hands, or one player will be stuck in the punching animation until
the other player lets go of the box, in which the box goes into the stuck
player's hands.
Now escapes from action if the grab fails, preventing a softlock.
And now if both players report having the same object, the client
will drop their copy.
Fixes #14
2020-09-03 18:11:42 -07:00
MysterD
920c0674d9
More tuxie fixes
...
Tuxie will regain its hitbox if dropped through crouching or any other means
Fixed detection of if any mario is far away
Immediately sends an object packet whenever any object is dropped or thrown
Fixes #9
2020-09-03 08:58:21 -07:00
MysterD
ab9e7c7bca
Added player-to-player interactions
...
Players are now solid to each other and can push each other
Players can now attack each other (but they do not deal damage)
Players can bounce on top of each other, and they get squished
temporarily
Players are given slightly offset positions when they transition between
areas and levels, so they're no longer on top of one another.
2020-09-02 23:50:27 -07:00
MysterD
b9e84ad3b9
Shell music only starts and stops for local player
2020-09-01 23:41:56 -07:00
MysterD
933ee68477
Null checked heldObj in all mario actions
...
Bobomb clip no longer segfaults the game
2020-09-01 23:40:53 -07:00
MysterD
72c4379d8a
Fix first sound and size of first punch
...
The code was skipping playing the sound of the first punch, and changing
the size of the first for the first punch. Added hacky stuff to the
player packet code to ensure those events are hit.
Fixes #10 reported by somario360
2020-09-01 23:35:57 -07:00
MysterD
f62f80a228
Synchronize sleeping animations
...
Sleeping animations were desynchronized previously. Now remote goes to
sitting, and to laying down, at the right times. A snoring remote player
will no longer lower your music, and will no longer get stuck snoring
when they wake up.
Fixes #11 reported by somario360
2020-09-01 23:00:12 -07:00
MysterD
c88ff19190
Prevent infinite looping of Mario action transitions
...
There have been several times where the unpredictable behavior of
a remote player where execute_mario_action() would get caught in
an infinite loop. Now we attempt to detect an infinite hang and
escape from it. The sequence of actions will be recorded into an
errorlog.txt file. In debug mode this infinite hang will cause an
assertion to fail, crashing the game. In normal mode the game will
break out of it and hopefully carry on normally after new packets
come in.
I believe this addresses github issue #12 but I can't be sure.
2020-09-01 22:06:36 -07:00
MysterD
af117f4647
Various tuxie synchronization fixes
2020-09-01 20:13:46 -07:00
MysterD
c54063fadd
Fixed messed up animation when remote is talking to an NPC
...
fixes #8 found by somario360
2020-09-01 18:10:00 -07:00
MysterD
8711829664
Merge branch 'nightly' into coop
2020-09-01 18:08:46 -07:00
MysterD
443fc1a73f
Synchronize cannons as soon as they are unlocked
2020-08-31 23:49:51 -07:00
MysterD
3495a9e4a4
Re-added King Bobomb dialog
2020-08-31 21:38:08 -07:00
MysterD
efa1600ad0
Truly deal with the NPC dialog softlock problem
...
Reported by somario360:
After I (Luigi) gave the baby penguin to the mother, the start spawned,
but I was stuck in the looking up animation.
My friend (Mario) talked to Bowser after defeating him, Bowser turned into
a key, but he was stuck in the looking up animation after (I was able to
grab the key though, but Bowser was slightly visible) (Also don't mind 0
stars, he loves doing the lobby BLJ)
The issue is the state machine moved on without removing the reading
dialog action. There was no straight forward way to deal with this.
Custom functions were written for each call to dialog to ensure that we
should stay reading the dialog.
2020-08-31 21:10:34 -07:00
MysterD
5d7499bd2a
Fixed crash when changing areas within a level
...
Bug reported by somario360:
After I (Luigi) exited the slide in CCM, an error message appeared and ignoring would make it pop up again.
This was due to the sync ID reservation system not being flushed and
reset on area change.
2020-08-30 23:13:05 -07:00
MysterD
7b073aedb8
Fix NPC softlock (cannon and hoot)
...
Bug reported by somario360:
When trying to open the cannon in a level (so far tested in BOB & WF) the cannon dialogue will repeat infinitely. Sometimes the cannon will open, but the game will crash after.
The code I had written previously to prevent softlocks ended up causing
them due to a incorrect check of activeFlags.
2020-08-30 23:12:28 -07:00
fgsfds
6d1f2afd8b
Merge pull request #350 from pouar/fix-snufit
...
Bugfix for NODRAWDISTANCE
2020-08-30 15:34:24 +03:00
MysterD
483694d6b3
Synchronized Bowser 1
2020-08-29 12:59:07 -07:00
MysterD
10bdd1e1fe
Synchronized bowser bombs
2020-08-29 12:58:54 -07:00
MysterD
81d23b3cc9
Made castle floor trap multiple-player-aware
2020-08-29 12:58:04 -07:00
MysterD
13d4a0bfe8
Fixed stomache slide hang, made grabs only happen on local
2020-08-29 12:57:20 -07:00
MysterD
cb5dcaa4f4
Synchronized sliding platform 2
2020-08-28 20:26:17 -07:00
MysterD
398f5e8345
Synchronized ferris wheel
2020-08-28 20:26:04 -07:00
MysterD
ec89f3fccc
Synchronized amps
2020-08-28 20:25:46 -07:00
MysterD
ab9d7db29f
Synchronized square platforms as groups of two
2020-08-28 20:25:34 -07:00
fgsfds
655427f10f
add --poolsize arg for modifying main pool size
2020-08-29 02:13:30 +03:00
MysterD
a778bf497d
Resynchronized checkerboard platforms
2020-08-27 21:39:13 -07:00
MysterD
d2a2a80d56
Synchronized Big Boo's Haunt + major changes
...
Synchronized currentRoom per-player
Synchronized haunted bookshelf, and the bookshelf manager
Synchronized haunted chairs
Synchronized mad piano
Synchronized BBH's tilting trap, and made the physics multiple-player-aware
Synchronized scuttlebugs
Synchronized every variety of Boo
Synchronized elevators
Synchronized flamethrowers
Synchronized the various types of enemy books
Synchronized the book switches
Synchronized jumping box
Made coffins multiple-player-aware
Fixed everything that used gMarioState as an array instead of gMarioStates
Prevented some NPC-dialog softlocks
Prevented the remote player from messing up the local's camera settings
Possibly fixed the relatively rare chain chomp softlock
Possibly fixed the relatively rare chain hoot softlock
Fixed the first-person-camera softlock
Forced camera code to use the correct mario struct
2020-08-26 23:29:40 -07:00
MysterD
13b216ea5d
Synchronized Boo
2020-08-24 21:38:49 -07:00
MysterD
8c650a5b7d
Created system to reserve sections of SyncIDs per client
...
This allows clients to spawn a new sync object after the level loads and synchronize it.
Changed how un-initialized sync objects are detected
Koopa shells are the first thing to use this new system
Removed network_object_settings() command, instead explicitly setting the sync object parameters
2020-08-24 18:33:53 -07:00
MysterD
4b12d0e513
Fixed exclamation box synchronization bug
2020-08-18 18:47:21 -07:00
MysterD
53576aa51e
Synchronized unagi
2020-08-18 18:47:06 -07:00
MysterD
57a4e746cf
Synchronized underwater koopa shell
2020-08-18 18:46:54 -07:00
MysterD
f08e6f0806
Made floating platform multiple-player aware
2020-08-18 18:46:13 -07:00
MysterD
b8bdac2666
Made falling pillar multiple-player aware
2020-08-18 18:45:50 -07:00
MysterD
5b7e1c28d8
Synchronized clam
2020-08-18 18:45:34 -07:00
MysterD
79a2d95f00
Synchronized jrb ship and box
2020-08-18 18:45:19 -07:00
MysterD
c589f2a620
Synchronized treasure chests
2020-08-18 18:43:42 -07:00
fgsfds
8b23c544d1
Merge pull request #399 from ineedhelpbad/nightly
...
BUGFIX: Camera bugs when using flying cap with BETTERCAMERA=1 #370
2020-08-15 15:59:59 +03:00
MysterD
88bcd2a143
Sound fixes for remote player
2020-08-13 18:53:01 -07:00
MysterD
92398f3ca1
Made rumble only happen for local events
2020-08-13 18:49:24 -07:00
MysterD
90d9e255e4
Fixed exclamation box double item spawning when traffic is bad
2020-08-13 18:34:27 -07:00
ineedhelpbad
38b3ead13e
BUGFIX: Camera invert #373
...
Fix: Free Camera is forever inverted on the Y-Axis, changing the setting does nothing. #373
2020-08-13 13:49:02 -05:00
ineedhelpbad
9ed98273d7
Update mario_actions_airborne.c
2020-08-13 00:26:23 -05:00
MysterD
6629b5493d
Freeze mario in place when star spawning or dialog box pops up
2020-08-12 21:47:07 -07:00
MysterD
6e4c39eabe
Kept more randomness, fixing tree leaves, fix pole segfault
2020-08-12 19:39:31 -07:00
MysterD
48f42d1873
Fixed visual bug when both players are sliding
2020-08-12 19:14:35 -07:00
MysterD
bdf269c262
Fixed tower platform spawning bug
2020-08-11 23:27:37 -07:00
MysterD
55df4e6bd7
Synchronized whomp
2020-08-11 23:03:40 -07:00
MysterD
4cc3d08769
Synchronized thwomp
2020-08-11 23:03:30 -07:00
MysterD
7165d5ca64
Synchronized all of the various platforms in WF
2020-08-11 23:03:13 -07:00
MysterD
84ef9e97c1
Synchronized piranha plant
2020-08-11 23:02:16 -07:00
MysterD
aec993b5b6
Synchronized kickable board
2020-08-11 23:02:03 -07:00
MysterD
0e72fc2b1f
Synchronized bullet bill
2020-08-11 23:01:51 -07:00
MysterD
47948b2a4e
Synchronized bomp
2020-08-11 23:01:36 -07:00
MysterD
d5b087acd8
Synchronized hoot
2020-08-11 23:01:13 -07:00
MysterD
697670b519
Synchronized breakable wall
2020-08-11 23:00:55 -07:00
MysterD
3b00aa9e42
Various synchronization enhancements
2020-08-11 23:00:13 -07:00
MysterD
2177094730
Synchronized wing cap and hidden trigger pickups
2020-08-10 23:38:58 -07:00
MysterD
f1789d4e78
Synchronized cap switch, and exclamation box contents
2020-08-10 22:59:11 -07:00
MysterD
5ca3f2ebd7
Synchronized platform-on-tracks
2020-08-10 19:08:47 -07:00
MysterD
0ceba4b372
Synchronized blue coin switch
2020-08-10 18:19:27 -07:00
MysterD
aaf521659e
Disabled many timestops
2020-08-10 18:10:04 -07:00
MysterD
8fcf1728bd
Synchronized snowman
2020-08-10 18:09:31 -07:00
MysterD
40a3d55f9a
Synchronized racing penguin
2020-08-10 15:09:09 -07:00
MysterD
8c7348f10d
Synchronized baby and mother Tuxie
...
Added missing star parameter
2020-08-10 14:27:56 -07:00
MysterD
c26bf586e1
Synchronized Mr Blizzard
2020-08-10 13:29:07 -07:00
MysterD
b2b7c6b9ba
Synchronized spindrift
2020-08-10 12:08:53 -07:00
MysterD
1bef126df8
Synchronize area changes
2020-08-10 12:08:40 -07:00
MysterD
6701b6096d
Rewrote level synchronization
...
Synchronized exit course from pause menu
2020-08-10 09:33:40 -07:00
MysterD
2e768869e3
Misc fixing to entering paintings
2020-08-09 18:58:58 -07:00
MysterD
a896713510
Made sockets platform-independent, supporting Linux
2020-08-09 13:23:27 -07:00
MysterD
66c1c4f206
Synchronized 1up spawning
2020-08-09 09:04:30 -07:00
MysterD
6c189cebe7
Synchronize course complete screen
2020-08-09 08:23:53 -07:00
MysterD
05ba304050
Synchronized exclamation boxes
2020-08-09 08:07:32 -07:00
MysterD
41647d95c4
Synchronize Bobomb buddies and cannons
2020-08-09 07:42:44 -07:00
MysterD
a49b8f3b1e
Synchronized Koopa The Quick
2020-08-09 00:37:36 -07:00
MysterD
eeec6aae49
L is real 2020
...
Added Luigi model.
Renamed all previous references to 'Luigi' to 'Mario2' since player 1
isn't always mario, and player 2 isn't always luigi.
Now server is always mario and client is always Luigi.
Luigi model credits:
Original model by Cjes, converted by AloXado320, textures added/fixed by
SunlitSpace542.
2020-08-08 21:36:49 -07:00
MysterD
b07aa565d4
Synchronized 3 types of star spawning, adjusted star interactions
2020-08-08 18:57:04 -07:00
MysterD
7f5dec337e
Synchronized King Bobomb
...
Tried to synchronize dialog stuff, it's way too much of a mess to do
2020-08-08 17:13:11 -07:00
MysterD
4b61f7212b
Fixed receiving of health, made recovery heart 2-player aware
2020-08-07 22:27:15 -07:00
MysterD
2a0a3df34f
Synchronized bowling balls
...
Added flag to keep randomization for sync objects
2020-08-07 21:13:07 -07:00
MysterD
199bd07bb3
Synchronized water bombs
...
Added packet system to spawn objects on remote
2020-08-07 20:34:12 -07:00
MysterD
8b24d364bb
Synchronized purple switch
...
Started working toward synchronizing star spawning, not quite there yet
2020-08-07 19:37:19 -07:00
MysterD
444c1fdd3b
Synchronized coin collection
...
Reimplemented how randomness is synchronized
2020-08-07 18:01:58 -07:00
MysterD
5ec9ab9ec0
Synchronized seesaw, started moving toward a MAX_PLAYERS define
2020-08-06 22:52:32 -07:00
MysterD
e86efb9e85
Synchronized checkerboard platforms
...
Created a max update rate
Created 'full object syncing'
Switched to using clock() instead of ticks for packet_object
2020-08-06 21:47:03 -07:00
MysterD
e0b86b7d59
Synchronized teleports (e.g. flowerbed) and star collection
...
Fixed infinite packet_level_warp sending
2020-08-06 20:28:21 -07:00
MysterD
6bc4bfea62
Improve chain chomp syncing
2020-08-06 19:04:59 -07:00
MysterD
fac4c20a36
Synchronized player health/death
...
Now we will never kill remote players locally, they will have to let us
know that they died.
Synchronized more of the small breakable box
Fixed desync where an object wouldn't be dropped sometimes
Fixed infinite loop when remote player was squished
2020-08-06 18:45:39 -07:00
MysterD
0a3b0623a5
Synchronized chain chomp, adjustments to Koopa
...
Added entity event syncing system. Made sure old events don't override
new events.
2020-08-05 23:44:43 -07:00
MysterD
0a2c76c76e
Fixed max sync distance issue, synced Koopas
2020-08-05 20:25:52 -07:00
MysterD
e61b137160
Refactored entity death sync + reliable packets
...
Embedded an immediate packet send whenever a synced entity is unloaded
from the game.
Added reliable packet sending.
2020-08-05 01:01:50 -07:00
MysterD
6d3a90031c
Synchronized breakable boxes
...
Added maximum sync distance, special cases for infinite distance and
only synchronizing entity deaths.
Started mocking out reliable packets for entity deaths.
2020-08-04 22:42:28 -07:00
MysterD
4452b38848
Synchronized inside-painting state
2020-08-04 20:49:53 -07:00
MysterD
f32d3a2ba7
Added Luigi to courtyard and BoB, fixed some crashing issues
2020-08-03 17:59:44 -07:00
MysterD
6d0d7ffbaa
Dialog to toad/signs/doors no longer soft-locks or stops time
2020-08-03 23:23:09 -07:00
MysterD
ec2199892f
Force synchronizing of level changes
2020-08-02 23:02:29 -07:00
MysterD
9b5b5acf19
Synchronized goombas, synced randomness, added extra fields to object packets
2020-08-02 18:29:46 -07:00
MysterD
716a924803
Synchronized held objects, made respawners keep their sync ID
2020-08-02 14:18:34 -07:00
MysterD
579415dca9
Started synchronizing objects, refactored networking
2020-08-02 01:43:12 -07:00
MysterD
42a52ad936
Fixed synced crawling/climbing animation speed
2020-08-01 21:35:38 -07:00
MysterD
34b1ec76f6
Started adding networking
2020-08-01 20:22:24 -07:00
MysterD
0ad65c87da
Made collision particles Luigi-aware
2020-08-01 20:21:44 -07:00
MysterD
b525b9d43a
Made one-ups Luigi-aware
2020-08-01 19:08:08 -07:00
MysterD
01e02affad
Saved player index in held objects
2020-08-01 19:03:26 -07:00
MysterD
fa2470327f
Prevent situation where both players hold same object
2020-08-01 18:56:42 -07:00
MysterD
7accb94398
Made fish Luigi-aware
2020-07-31 22:35:14 -07:00
MysterD
4351a6345a
Made Goomba Luigi-aware, fixed Mario's hurtboxes
2020-07-31 22:13:05 -07:00
MysterD
c437e075ff
Separated held objects, made Bobombs Luigi-aware
2020-07-31 18:03:57 -07:00
MysterD
e99ca8cfce
Made bird Luigi-aware
2020-07-30 23:17:18 -07:00
MysterD
6597d30095
Butterflies are now Luigi-aware
2020-07-30 21:58:33 -07:00
MysterD
79fdb73e63
Fixed Mario going invisible when both are sliding
2020-07-30 21:43:50 -07:00
MysterD
4486e8000c
Began fixing up Luigi collisions
2020-07-30 18:44:09 -07:00
MysterD
0737d2e03f
Separated animations between players
2020-07-30 18:09:47 -07:00
MysterD
6b3ab5f115
Started adding player 2 / Luigi
2020-07-29 21:08:38 -07:00
MysterD
131fc7ea11
60 fps patch
2020-07-28 18:28:12 -07:00
fgsfds
572a4b698b
do vsync exactly like sm64-port does it
...
maybe this will finally work better
2020-07-09 17:02:43 +03:00
fgsfds
a4b4d6d5e5
do vsync exactly like sm64-port does it
...
maybe this will finally work better
2020-07-09 17:02:43 +03:00
fgsfds
fde15809b7
add sanity checks in save_file.c
...
though it would be a better idea to solve the problem that leads to -1 being passed to these instead
2020-07-07 20:57:18 +03:00
fgsfds
7b8a7e4047
add sanity checks in save_file.c
...
though it would be a better idea to solve the problem that leads to -1 being passed to these instead
2020-07-07 20:57:18 +03:00
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