Commit graph

725 commits

Author SHA1 Message Date
MysterD
4a3b39061f Force players in the credits sequence into the 'credits' instance 2021-08-04 13:01:59 -07:00
MysterD
8984ec3ba8 Adjust main menu cutscene and camera 2021-08-04 19:15:42 -07:00
MysterD
354146e3ac Make final Bowser star interactable for all players 2021-08-04 18:55:32 -07:00
MysterD
00da6b48f5 Fade out players when they leave/disconnect 2021-08-04 18:47:59 -07:00
MysterD
ab9056bb68 Make players invisible until their level/area can be verified 2021-08-04 18:15:46 -07:00
MysterD
7c8bddde28 Prevent capless flags from ever being set 2021-08-04 00:05:51 -07:00
MysterD
b1acd644f7 Invalidate area/level sync when unloading the area/level 2021-08-03 23:58:17 -07:00
MysterD
c5700825a8 Resynchronized WF tower platforms using Network Area Timer 2021-08-03 23:39:28 -07:00
MysterD
f8c5fb0725 Resynchronize WF platforms using Network Area Timer 2021-08-03 23:26:32 -07:00
MysterD
6a957757d4 Refactored network area timer system 2021-08-03 19:21:50 -07:00
MysterD
a84e7a73fe Resync bomp using Network Area Timer 2021-08-03 18:52:48 -07:00
MysterD
a520b25c26 Fixed Network Area Timer system 2021-08-03 18:02:21 -07:00
MysterD
d7b0945410 Added configurable player name, model, and palette 2021-08-02 22:33:38 -07:00
MysterD
4d997ba05e Fix long-standing chair crash in BBH 2021-08-02 19:45:13 -07:00
MysterD
a2bb578dbf Made the 'R Button - Options' text only appear on pause 2021-08-01 13:26:57 -07:00
MysterD
033a9aa1a8 Hide other players in main menu 2021-07-30 18:47:09 -07:00
MysterD
4e0a3e3e57 Merge branch 'dev/djui' into dev/unstable 2021-07-22 20:38:21 -07:00
MysterD
6ad96d5e69 Removed luigi sound config 2021-07-16 18:12:56 -07:00
MysterD
7e1a05a40b DJUI: Replaced old ingame menu with new DJUI menu 2021-07-15 19:37:09 -07:00
MysterD
28d63b2c87 Added save file selection to host menu 2021-07-14 18:58:52 -07:00
MysterD
13d504a953 Replaced old host/join menu with new DJUI menu system 2021-07-04 22:40:04 -07:00
MysterD
58eec0e19f Removed old chat system 2021-07-01 21:14:11 -07:00
MysterD
b4418bbd4f DJUI: Made inputbox usable
Added keyboard support to inputbox
Fixed how inputbox text is clipped
Added on_enter_press callback for inputbox
Added ability to set clipboard text
Adjusted how components can be focused, and when they lose focus
Erased most of the text input stuff in controller_keyboard
Disabled major parts of old chat system
Disabled major parts of old menu system
2021-07-01 20:03:54 -07:00
MysterD
a6c204e1cf Fixed how players compare their area numbers 2021-06-27 00:40:30 -07:00
MysterD
ad3ee677c6 Fixed cannons, possible fix to star unlocks 2021-06-27 00:33:31 -07:00
MysterD
59eef70183 Prevent player-to-player interactions from messing up other ones 2021-06-26 21:51:00 -07:00
MysterD
974d9b52cf Prevented initial level dialog from appearing twice 2021-06-26 20:36:18 -07:00
MysterD
6c687a5a73 Prevent walking through warp doors 2021-06-26 20:20:19 -07:00
MysterD
28ce5e9cdf DJUI: Added sliders, made Sound menu work 2021-06-25 15:50:31 -07:00
MysterD
6e23c952f9 DJUI: Rendering, interactable, and mouse adjustments
Made DJUI render at 60 fps
Added mouse cursor and hooks in SDL for capturing the window-relative mouse position
Started creating an interable system where elements can respond to events such as on_mouse_hover
2021-06-19 18:22:44 -07:00
MysterD
038c1135b3 Initial DJUI commit
The birth of a custom user interface system.

Has the ability to draw things to the screen at native resolution
regardless of window size.

Components can be nested within one another to an arbitrary depth.

Text rendering is completely rewritten.

Text and images can be clipped by their parent container.
2021-06-18 15:23:59 -07:00
MysterD
939318041e Bowser, cannon door, and eyerok no longer require server to be in level
All have been switched from being owned by the server to being owned by
the player with the lowest global ID in the level.
2021-06-15 21:04:51 -07:00
MysterD
f60b861d73 BBH bookshelf manager no longer requires the server to be in BBH
Instead of only allowing the server to update the bookshelf manager, allow the
lowest global ID player to update it.
2021-06-15 21:01:28 -07:00
MysterD
4c401f9ba8 Resynchronized DDD poles to use area timer system 2021-06-15 18:01:03 -07:00
MysterD
0c459294bb Fixed the merry go round in BBH
Fixed releasing of sync objects that otherwise don't sync their death events
Fixed using/releasing reserved objects in an area that the server isn't in
2021-06-14 21:06:07 -07:00
MysterD
ef2287a5d5 Resynchronized checkerboard elevators to use area timer 2021-06-14 20:29:08 -07:00
MysterD
e7d0f8ec8b Resynchronized LLL puzzle pieces
Created a timer based on area that is shared. The puzzle pieces will
execute rapidly to catch up to the timer on level join. This keeps them
in sync without constantly needing to acknowledge that a puzzle piece
had moved before continuing.
2021-06-14 20:14:47 -07:00
MysterD
6aded174e9 Synchronized moat draining and cap switch unlocks 2021-06-14 19:59:11 -07:00
MysterD
361a57edb6 Instance levels based on which star was selected
Previously the levels were instanced based on "act" which is a concept
that is invisible and unintuitive to the user.
2021-06-14 18:25:24 -07:00
MysterD
cd48d177b0 Additional synchronization + misc fixes
Prevented crash that happened when an upstairs painting was entered
Synchronized TTC speed setting
Synchronized WDW water level on late join
Player packets no longer broadcasted to clients in a different location
2021-06-14 18:13:58 -07:00
MysterD
59d08a90b9 Fixed how "levelAreaMustMatch" packets are sent/processed
Instead of the server dropping them immediately, the server only drops the processing. This allows it to broadcast/send the packet to the correct client without the server processing it.

Fixed how "static" level objects were detected. The old way was error prone and would consider spawned objects to be static anyway.

Made ERROR_LOGs always show up, "disabling" logging only turns off INFO_LOGs now.
2021-06-13 17:47:58 -07:00
MysterD
b6959dc7ea Informed players of ent deletions in a different area (but same level)
Added packet_level_respawn_info to inform the players of entity
deletions in a different area of the same level. Currently it's
massively noisy due to sending out a new packet for each entity
destroyed. This can cause chaos when collecting a series of coins.

Ideally this information would be batched and sent in one big blob every
so often.
2021-06-11 16:19:24 -07:00
MysterD
6bfdcbcb7b Complete rewrite of level-change/area-change system
Now level changes and area changes are separated. Entity deletions are
properly tracked on level change or area change. Late entity
synchronization is now triggered on any area change.
2021-06-11 14:39:25 -07:00
MysterD
0b3a97d405 Improvements to late-join synchronization
Removed (slightly) old coin and static ent removal system
Resynchronized respawners
Added packet for macro deletions
    better than previous system since the entities don't need a sync id and we can synchronize deletion station across areas
    allows the synchronization of odd entities like lines of coins
Added packet for spawn info deletions
Split packet_location_request into multiple files
2021-06-09 22:35:34 -07:00
MysterD
6e7c542068 Synchronized race timers 2021-06-08 22:05:12 -07:00
MysterD
33fbed94e4 Synchronized respawners and entities created after level load 2021-06-08 21:21:52 -07:00
MysterD
5db1a9e827 Synchronize late-join coin collection 2021-06-08 02:26:35 -07:00
MysterD
4be00a2eb1 Late-join synchronized chain chomp and exclamation box 2021-06-08 01:29:21 -07:00
MysterD
bbdc942501 Ripped out level synchronization/warp code
Began writing new system that synchronizes course/act/level/area per
player and 'ownership' of that location.
2021-06-07 12:19:59 -07:00
fgsfds
abd3a0a130 add more player colors 2021-04-06 18:08:41 +03:00
fgsfds
511b1352b8 colorize chat messages with player color 2021-04-06 02:30:37 +03:00
fgsfds
109e713689 implement changeable model colors
in a very dumb way:

the custom colors are set for lights 3, 4, 5, 6 in a GEO_ASM callback, then copied to lights 1, 2 using gsSPCopyLightEXT
2021-04-06 00:22:42 +03:00
fgsfds
d4cdd89683 everyone except host is luigi 2021-04-05 04:21:23 +03:00
fgsfds
8f4965e05d partially fix jitter with two of the same model 2021-04-05 04:21:14 +03:00
fgsfds
843a8cd18f djoslin0's new warp code 2021-04-05 03:21:37 +03:00
MysterD
c0652f8a48 Allocate the correct number of controllers on stable branch 2020-10-18 22:15:52 -07:00
MysterD
281e45051b Prevent racing penguin crash when one player cheats
Fixes #87
2020-10-18 18:21:19 -07:00
MysterD
f88aee251e Keep BETTERCAM/bubbled players within the minimum Y bounds of levels
Players/cameras were able to clip inside of island-like levels
previously. I have hardcoded sane minimum Y values for the following
courses: WF, CCM, PSS, BITDW, TTM, RR, BITS
2020-10-18 11:57:45 -07:00
MysterD
4cb49d3946 Misc sync fixes to various enemies
Considered nearest player for various things within the following
entities that I missed the first time around: cloud, koopa, monty mole,
moving coin, piranha bubbles, scuttlebug, shock wave, spindrift.
2020-10-17 23:58:24 -07:00
MysterD
cbf8505516 Misc fixes to bub 2020-10-17 23:43:29 -07:00
MysterD
f4263deea9 Fix wiggler softlock and intangibility 2020-10-17 23:38:32 -07:00
MysterD
98cc31d6cb Do not consider inactive players when bubbled 2020-10-17 23:27:34 -07:00
MysterD
1564ac7c0f Translated Luigi sounds through new Character system 2020-10-16 23:33:41 -07:00
MysterD
a5a4c3c324 Make gControllers respect MAX_PLAYERS
fixes Linux crash when MAX_PLAYERS is increased
2020-10-16 22:22:28 -07:00
anzz1
d1739648e1
Added Luigi sounds (#77)
* added a new audio bank 10 for luigi sounds
* made some audio memory buffers larger to fix sound cuts
* added option to enable/disable luigi sounds in the sound options menu
* added Andrat's "90's Classic Luigi Voice Pack" as default luigi sounds

Co-authored-by: anzz1 <>
2020-10-16 11:54:59 -07:00
MysterD
2b0f892251 Misc adjustments to recent PRs
Switched from manual checking of Luigi to using new Character structs
Synchronized cap spawning for mario_blow_off_cap()
Added declarations for network_send_death() and network_receive_death()
2020-10-16 03:59:24 -07:00
anzz1
bc7ec31c02
Enemy hat fixes (#83)
* Ukiki now steals Mario/Luigi hat correctly
* Klepto now steals Mario/Luigi hat correctly
* Mr. Blizzard now knocks off Mario/Luigi hat correctly
* Fwoosh now knocks off Mario/Luigi hat correctly

Co-authored-by: anzz1 <>
2020-10-16 03:03:25 -07:00
MegaMech
e447332cec
Added server settings: shared lives and skip intro
Adds button to the host menu to allow shared lives.
Resolves #37

Buttons are now resizeable. Use gButtonScale.<size> (large, medium, or small).
It could be argued that we don't need the small size. However, it may be beneficial for the future if the menu becomes more complex.

large is the normal default size. Or at least it was the size already being used by sm64ex-coop (0.11111111f)

Note: Buttons for changing menu's should be gButtonScale.large as the menu animation is made for large buttons. To keep consistency it's probably a good idea for buttons that transfer you to a new menu to always be set to large. As such, I didn't feel it necessary to extend this feature to these methods: bhv_menu_button_growing_from_custom and bhv_menu_button_shrinking_to_custom.

Resolves #60
2020-10-16 02:58:57 -07:00
MysterD
9f158de95d Remove two-player hack for controlled warp 2020-10-15 18:04:53 -07:00
MysterD
48aee0c7be Enemies drop player when picked up 2020-10-14 23:52:07 -07:00
MysterD
66eb163339 Prevent playing star cutscene when in cutscene 2020-10-14 23:36:19 -07:00
MysterD
71bc444fa2 Desync fixes for hoot, piranha, spiny 2020-10-14 23:25:59 -07:00
MysterD
c50794773c Allow bubbled players to go through elevators 2020-10-14 23:20:43 -07:00
MysterD
196ac547ef Bubbled visual improvements (pitch to player) 2020-10-14 23:18:05 -07:00
MysterD
8750198750 Prevented vanish cap players from interacting with other players 2020-10-14 20:58:03 -07:00
MysterD
cfd559bc74 Sync riddenObj, prevent remote interaction with shell 2020-10-14 20:50:55 -07:00
MysterD
8fc8ca6ca7 Prevent players from interacting with a shell that someone else is riding 2020-10-14 20:42:04 -07:00
MysterD
cb902c519d Properly synchronize koopa shells spawned from boxes 2020-10-14 20:34:38 -07:00
MysterD
16b95fdbca Prevent cursor from going past array in course completion screen 2020-10-14 20:03:05 -07:00
MysterD
85c05e7d56 Removed two-player hacks for packet_spawn_objects 2020-10-14 00:15:56 -07:00
MysterD
55bbe8d4d9 Removed two-player hacks for heldObj and spawning offsets 2020-10-13 22:26:13 -07:00
MysterD
c8a45235ca Removed two-player hacks from cannon and object packets
Increased error checking of get_behavior_from_id
Made failure logging for packet_object a lot better
Changed debug logging to show global index instead of "Server/Client"
Changed debug keyboard binds to support more keyboard types
Made SyncObject's rxEventId de-duplication per-player instead of one-player
Removed sizeof(enum) from packet_read/packet_write
2020-10-13 21:44:27 -07:00
MysterD
aaa7e65b65 Created character struct for mario/luigi asset differences
Removed multiple two-player hacks in the process
2020-10-13 18:33:51 -07:00
MysterD
66af03c41d Slight improvement to small breakable box sync 2020-10-12 18:10:40 -07:00
MysterD
8b6bfc2369 Possible fix for big bully spawn 2020-10-11 19:16:21 -07:00
MysterD
7791e03d6a Added all levels to support levels! 2020-10-11 14:55:08 -07:00
MysterD
1345b8d9d0 Synchronized Bowser 3 fight platforms 2020-10-11 14:54:16 -07:00
MysterD
b536fcfdb0 Added RR to supported levels 2020-10-11 14:42:04 -07:00
MysterD
13fdf6ceaf Added TTC to supported levels 2020-10-11 14:40:13 -07:00
MysterD
dbe1e21b87 Synchronized TTC treadmill 2020-10-11 14:39:41 -07:00
MysterD
f64e315c74 Synchronized TTC spinner 2020-10-11 14:39:32 -07:00
MysterD
7167c8537b Synchronized TTC rotating solid 2020-10-11 14:39:21 -07:00
MysterD
52510de84e Synchronized TTC pit block 2020-10-11 14:39:07 -07:00
MysterD
4cb089c428 Synchronized TTC pendulum 2020-10-11 14:38:56 -07:00
MysterD
788dc5310c Synchronized TTC moving bar 2020-10-11 14:38:44 -07:00
MysterD
63af39cd53 Synchronized TTC elevator 2020-10-11 14:38:30 -07:00
MysterD
83baf2eac6 Synchronized TTC cog 2020-10-11 14:38:19 -07:00
MysterD
cbeea0472c Synchronized TTC 2d rotator 2020-10-11 14:38:07 -07:00
MysterD
e1ca3b963d Misc gMarioState/gMarioObject cleanup 2020-10-10 16:12:29 -07:00
MysterD
229880cfda Synchronize burning player smoke + misc version improvements 2020-10-10 15:49:17 -07:00
MysterD
b7cf6cdf5c Synchronized 'donut platforms'... the slow falling ones in RR 2020-10-10 15:33:17 -07:00
MysterD
736fba54a2 Synchronized swing platform 2020-10-10 15:32:39 -07:00
MysterD
edc275b5e8 Enhancements to networked player infrastructure 2020-10-10 01:18:45 -07:00
MysterD
5282c461fa Fix typo, whoops. 2020-10-08 23:53:16 -07:00
MysterD
392471eb1f Bugfix for spiny override ownership 2020-10-08 23:40:01 -07:00
MysterD
2fb2fc81e1 Add THI to supported levels 2020-10-08 23:38:43 -07:00
MysterD
2adea6aad6 Synchronized Wiggler 2020-10-08 23:37:01 -07:00
MysterD
fadea702ff Synchronized THI top 2020-10-08 23:07:32 -07:00
MysterD
c958837333 Somewhat synchronized fire piranha plants 2020-10-08 23:05:06 -07:00
MysterD
55939e6eda Synchronized enemy lakitu and spiny 2020-10-08 22:14:17 -07:00
MysterD
3bb96fa609 Synchronized Bubba 2020-10-08 22:05:21 -07:00
MysterD
028990302d Prevent star dance spam 2020-10-08 21:31:53 -07:00
MysterD
ff1b19e2ee Prevent King Bobomb from grabbing while thrown 2020-10-08 21:13:56 -07:00
MysterD
597cc14ccf Add TTM to supported levels 2020-10-08 20:57:56 -07:00
MysterD
5924ed9485 Disable force-synchronizing of TTM slide 2020-10-08 20:57:11 -07:00
MysterD
41295fb814 Synchronized Ukiki 2020-10-08 20:56:49 -07:00
MysterD
aa345ede4d Synchronize Fwoosh 2020-10-08 20:56:34 -07:00
MysterD
ea1553c18d Koopa shell can only be ridden by one person, and doesn't get accidentally removed 2020-10-06 23:38:56 -07:00
MysterD
d2e1b6e5a0 Possibly fixed rare invisible cannon bug 2020-10-06 21:03:08 -07:00
MysterD
93b2c4213d Added WDW to supported levels 2020-10-06 20:29:40 -07:00
MysterD
d13127117a Misc additional player checks 2020-10-06 20:29:23 -07:00
MysterD
349517e9fb Synchronized WDW water level changers 2020-10-06 20:28:44 -07:00
MysterD
b93e681377 Synchronized Skeeter 2020-10-06 20:28:28 -07:00
MysterD
6d5e1d498e Synchronized metal boxes 2020-10-06 20:28:17 -07:00
MysterD
8464d6c830 Synchronized Heave Ho 2020-10-06 20:28:06 -07:00
MysterD
2b75690a31 Synchronized WDW express elevator 2020-10-06 20:27:54 -07:00
MysterD
5ad1b60a9f Synchronized Chuckya 2020-10-06 20:27:24 -07:00
MysterD
938e0a817e Synchronized WDW arrow lift 2020-10-06 20:27:12 -07:00
MysterD
0b4ed5bf27 Added Snowman's Land to supported levels 2020-10-05 23:13:12 -07:00
MysterD
d56f46a79c Synchronized SL snow mounds 2020-10-05 23:08:36 -07:00
MysterD
347bd0ed63 Synchronized SL penguin 2020-10-05 23:08:24 -07:00
MysterD
94fe53f4bf Synchronized Snowman Wind 2020-10-05 23:08:12 -07:00
MysterD
d6a7af8f54 Synchronized Moneybag 2020-10-05 23:07:57 -07:00
MysterD
dd8de27014 Snap players on top of synchronized platforms 2020-10-05 22:05:05 -07:00
MysterD
b6d96adbf0 Prevented Yoshi softlock 2020-10-05 21:04:00 -07:00
MysterD
74852faeaf Stopped time and show cutscene for all for more stars 2020-10-05 20:36:44 -07:00
MysterD
b831acd59c Rewrote how RNG is synchronized
The old implementation was hacky and often returned desynchronized
results. This implementation gives a seed to each sync object, and
synchronizes that seed. Also allows for a seed to be saved temporarily
based on position and recycled for multiple calls.
2020-10-05 19:15:13 -07:00
MysterD
87074ef098 Fix Bowser cutscene yet again... 2020-10-05 18:16:28 -07:00
MysterD
404d201955 Local unlocking door star spawns again 2020-10-04 23:27:02 -07:00
MysterD
53f7a36819 Prevent multiple star/key unlock animations on the same door 2020-10-04 23:23:17 -07:00
MysterD
e9761cd3e6 Prevent rare bug where a remote player will grab a non-grabbable object momentarily 2020-10-04 23:06:52 -07:00
MysterD
5eb5e678c5 Prevent OOB warp by teleporting one player to the other when OOB is detected 2020-10-04 22:38:54 -07:00
MysterD
104e824a13 Make sure 70 star door is always openable 2020-10-04 22:16:20 -07:00
MysterD
6f23b63e61 Prevent hang due to mirror mario nodes 2020-10-04 22:10:41 -07:00
MysterD
70fdad4e7c Stop time and show star cutscene for everyone
Fixes #72
2020-10-04 21:26:36 -07:00
MysterD
2c7b42b331 Adjusted how de-duplication of star spawns is done for red/hidden stars 2020-10-04 20:52:53 -07:00
MysterD
c98edbcb4b Add remote players to mirror 2020-10-04 20:18:09 -07:00
MysterD
bb30d28be9 Synchronize intro/bridge lakitu 2020-10-04 19:38:01 -07:00
MysterD
2f1e0473c2 Offset and separate player intro pipes 2020-10-04 19:16:35 -07:00
MysterD
d8bf1c8ef1 Re-enable intro 2020-10-04 19:16:16 -07:00