Commit graph

2130 commits

Author SHA1 Message Date
MysterD
e753c8fc33 Add bash shebang to developer scripts 2020-10-18 16:33:03 -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
eea5ebb94b Fixed command-line launch segfault
custom_menu_destroy() was causing a segfault when launching the game via
command-line parameters
2020-10-17 23:04:59 -07:00
MysterD
2519c59958 Merge branch 'unstable' of https://github.com/djoslin0/sm64ex-coop into unstable 2020-10-16 23:37:01 -07:00
Victor Diego Alejandro Diaz Urbaneja
26928ac6f5
overlay error (#88)
* overlay error

fixed compilation error

* Update custom_menu_system.c

Co-authored-by: djoslin0 <djoslin0@users.noreply.github.com>
2020-10-16 23:36:31 -07:00
MysterD
615c19be6f branch 'unstable' of https://github.com/djoslin0/sm64ex-coop into unstable 2020-10-16 23:33:47 -07:00
MysterD
1564ac7c0f Translated Luigi sounds through new Character system 2020-10-16 23:33:41 -07:00
MysterD
b522f89377 Add further luigi sound changes to git ignore 2020-10-16 22:23:49 -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
MegaMech
33dda3322c
Added connection transition (#86)
* Added content to custom_menu_destroy()

* Added connection transition

* Update custom_menu_system.c

Co-authored-by: djoslin0 <djoslin0@users.noreply.github.com>
2020-10-16 21:43:26 -07:00
anzz1
130cfefa82
Fix DISCORD_SDK=0 building (#85)
Co-authored-by: anzz1 <>
2020-10-16 20:20:14 -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
MysterD
05fd683c64 Fix UNSTABLE_BRANCH checking 2020-10-16 03:56:37 -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
anzz1
7971dbfa3f
Makefile update (#80)
* build with TEXTURE_FIX=1 as default
* disallow building with jp,eu,sh rom versions
2020-10-16 03:00:48 -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
1a0b3ff79d Change MAX_PLAYERS check to unstable branch 2020-10-16 02:53:09 -07:00
MysterD
c49ba7cdd8 Change version to beta 2, prepare unstable branch 2020-10-16 01:04:07 -07:00
MysterD
fa5023dcd5 Moved developer scripts to developer folder 2020-10-15 18:10:49 -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
040aa92fd1 Prevent people from hosting a discord game when discord fails 2020-10-14 21:17:28 -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
d882e8a039 Added a way to debug sync object tables through chat 2020-10-14 20:33:23 -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
28ad7f91ed Smooth over transition from sending raw enums 2020-10-13 23:04:08 -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
f230d4fe63 Removed two-player hack for held objects 2020-10-13 18:12:33 -07:00
MysterD
9f1d03d5b4 Remove two-player hack for packet_object 2020-10-13 18:11:40 -07:00
MysterD
66af03c41d Slight improvement to small breakable box sync 2020-10-12 18:10:40 -07:00
MysterD
c214800faf Standardized de-duplication of reliable packets 2020-10-12 18:40:38 -07:00
MysterD
5d9d5ed9d7 Added ability for client to send a packet to server, and for the server to broadcast to all clients 2020-10-12 18:23:48 -07:00
MysterD
3f798609be remove unused version call 2020-10-11 20:45:44 -07:00
MysterD
8b6bfc2369 Possible fix for big bully spawn 2020-10-11 19:16:21 -07:00
MysterD
d4f92ed209 Reset override_ownership to null (fixes crash in THI) 2020-10-11 18:54:05 -07:00