Commit Graph

1082 Commits (f49c3ece891441189e59055c2fff325899947a81)

Author SHA1 Message Date
MysterD 33c79c40a0 Remote reading sign no longer causes sound spam
fixes #20
2020-09-04 21:14:14 -07:00
MysterD cc920c9fdf Fix animation desync when pressing Z+B
Fixes #18
Found by el pinguino max
2020-09-04 21:08:04 -07:00
MysterD c93096c2a6 Force no draw distance on and text saves off 2020-09-04 17:52:48 -07:00
MysterD 3d51e21be9 Add docker-build workarounds and container script 2020-09-04 17:03:35 -07:00
MysterD 96c19d3c4c 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 9e7d7b03ea Removed 'int' from most of networking code
moved -Werror over to 'STRICT'
2020-09-04 11:43:12 -07:00
MysterD fc4d4d3d99 Added custom packets for mods-of-this-mod
Now a patch can choose to register callbacks for sending and receiving
packets. It's a bit tricky to use but at least it won't collide with
normal packets or other mod packets.
2020-09-04 02:04:37 -07:00
MysterD 7c6298acbc 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 e949767243 Add coop-specific define
Added -DCOOP to identify that this is a coop build so that one patch can
be applied to EX and/or COOP. They can choose to ifdef entity synchronization
out.
2020-09-03 21:49:58 -07:00
MysterD c56060ebd5 Prevent infinite loop for remote sliding players 2020-09-03 18:32:07 -07:00
MysterD 0a463ae362 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 ff6177a56a 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 6f21a0ca91 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 a54d60b135 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 54e83b06e2 Shell music only starts and stops for local player 2020-09-01 23:41:56 -07:00
MysterD cc48d55f95 Null checked heldObj in all mario actions
Bobomb clip no longer segfaults the game
2020-09-01 23:40:53 -07:00
MysterD 4705f66517 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 30ca28469c 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 ff1946a7f6 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 ac72beed04 Various tuxie synchronization fixes 2020-09-01 20:13:46 -07:00
MysterD efca858a95 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 a8db9caede Merge branch 'nightly' into coop 2020-09-01 18:08:46 -07:00
MysterD 6558a8f43d Update Makefile's default compile flags 2020-08-31 23:52:36 -07:00
djoslin0 11b1c534c9 Update README.md 2020-08-31 23:50:43 -07:00
MysterD 4ccc03ee37 Synchronize cannons as soon as they are unlocked 2020-08-31 23:49:51 -07:00
MysterD cc9300f969 Force players who are held by an entity to own that entity 2020-08-31 22:36:07 -07:00
MysterD 2b70dcc255 Synchronized squished values 2020-08-31 22:22:33 -07:00
MysterD 1876e59d77 Re-added King Bobomb dialog 2020-08-31 21:38:08 -07:00
MysterD e6074281c1 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 2ff595e630 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 b1d8f0e4cd 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
MysterD 53e5b5f89c Added text-input system for typing in-game 2020-08-30 23:25:32 -07:00
fgsfds e539a14374 add rudimentary SDL1 controller backend
it's more to deal with the mouse not working I suppose
2020-08-30 16:06:22 +03:00
fgsfds 42443dd45a Merge remote-tracking branch 'origin/master' into nightly 2020-08-30 15:41:45 +03:00
fgsfds 8685add4c3 fix spaces 2020-08-30 15:39:41 +03:00
fgsfds 19e0e58b7e Merge pull request #411 from theofficialgman/master
Check for zero rumble setting before allowing rumble
2020-08-30 15:35:03 +03:00
fgsfds 6102ac8400 Merge pull request #350 from pouar/fix-snufit
Bugfix for NODRAWDISTANCE
2020-08-30 15:34:24 +03:00
fgsfds 73b942c8fa GL_LEGACY: this should've been GL_REPLACE all along 2020-08-30 01:29:26 +03:00
Garrett 3891999365 Check for zero rumble setting before allowing rumble
Fixes controllers which don't check for rumble_strength and have constant rumble from rumbling even when set to 0 in the config.
2020-08-29 17:08:17 -04:00
MysterD 05739c963f Removed debug enemies from castle grounds 2020-08-28 23:06:56 -07:00
MysterD dca1863392 Synchronized Bowser 1 2020-08-29 12:59:07 -07:00
MysterD 114bbfd703 Synchronized bowser bombs 2020-08-29 12:58:54 -07:00
MysterD 650dbf3c95 Made castle floor trap multiple-player-aware 2020-08-29 12:58:04 -07:00
MysterD f372e44b04 Fixed stomache slide hang, made grabs only happen on local 2020-08-29 12:57:20 -07:00
MysterD f19044cf55 Synchronized sliding platform 2 2020-08-28 20:26:17 -07:00
MysterD 5cb9dbaa61 Synchronized ferris wheel 2020-08-28 20:26:04 -07:00
MysterD fd27aaf0cb Synchronized amps 2020-08-28 20:25:46 -07:00
MysterD 0c33337d35 Synchronized square platforms as groups of two 2020-08-28 20:25:34 -07:00
fgsfds fb28720383 change GL_LEGACY to only use GL1.1 (1.2?) features 2020-08-29 02:13:30 +03:00
fgsfds cdf8e5a437 add --poolsize arg for modifying main pool size 2020-08-29 02:13:30 +03:00