Commit Graph

1073 Commits (ea77a483d3cba3f4b7cf72c7bc07b769e26675a1)

Author SHA1 Message Date
MysterD ea77a483d3 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 aa6952db0f 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 bb9d46a45c branch 'unstable' of https://github.com/djoslin0/sm64ex-coop into unstable 2020-10-16 23:33:47 -07:00
MysterD 4f631ab151 Translated Luigi sounds through new Character system 2020-10-16 23:33:41 -07:00
MysterD 2aafd67173 Add further luigi sound changes to git ignore 2020-10-16 22:23:49 -07:00
MysterD 61a802253e Make gControllers respect MAX_PLAYERS
fixes Linux crash when MAX_PLAYERS is increased
2020-10-16 22:22:28 -07:00
MegaMech 5e740253b6 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 aacf81a6cd Fix DISCORD_SDK=0 building (#85)
Co-authored-by: anzz1 <>
2020-10-16 20:20:14 -07:00
anzz1 b7f4ae735d 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 bb94a15a59 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 7cd4480fbc Fix UNSTABLE_BRANCH checking 2020-10-16 03:56:37 -07:00
anzz1 8d26400e84 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 42736d9d38 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 70fb3a0166 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 46abf2c13d Change MAX_PLAYERS check to unstable branch 2020-10-16 02:53:09 -07:00
MysterD 73900c978b Change version to beta 2, prepare unstable branch 2020-10-16 01:04:07 -07:00
MysterD 17a140a5e2 Moved developer scripts to developer folder 2020-10-15 18:10:49 -07:00
MysterD ee7750b5ba Remove two-player hack for controlled warp 2020-10-15 18:04:53 -07:00
MysterD b05fee2fd9 Enemies drop player when picked up 2020-10-14 23:52:07 -07:00
MysterD cb09e24eeb Prevent playing star cutscene when in cutscene 2020-10-14 23:36:19 -07:00
MysterD 5375ad4d5b Desync fixes for hoot, piranha, spiny 2020-10-14 23:25:59 -07:00
MysterD 53c8ce18ec Allow bubbled players to go through elevators 2020-10-14 23:20:43 -07:00
MysterD 47b158cce9 Bubbled visual improvements (pitch to player) 2020-10-14 23:18:05 -07:00
MysterD d3735ef097 Prevent people from hosting a discord game when discord fails 2020-10-14 21:17:28 -07:00
MysterD a1d8d73c6d Prevented vanish cap players from interacting with other players 2020-10-14 20:58:03 -07:00
MysterD 3028b2c6b2 Sync riddenObj, prevent remote interaction with shell 2020-10-14 20:50:55 -07:00
MysterD 753d2ed21e Prevent players from interacting with a shell that someone else is riding 2020-10-14 20:42:04 -07:00
MysterD c7c1b17500 Properly synchronize koopa shells spawned from boxes 2020-10-14 20:34:38 -07:00
MysterD 8f59d20024 Added a way to debug sync object tables through chat 2020-10-14 20:33:23 -07:00
MysterD 08183e3712 Prevent cursor from going past array in course completion screen 2020-10-14 20:03:05 -07:00
MysterD 02e71e4494 Removed two-player hacks for packet_spawn_objects 2020-10-14 00:15:56 -07:00
MysterD 4136783211 Smooth over transition from sending raw enums 2020-10-13 23:04:08 -07:00
MysterD ba2733295a Removed two-player hacks for heldObj and spawning offsets 2020-10-13 22:26:13 -07:00
MysterD 927231c719 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 cd05b6ffc9 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 9f52061f5c Removed two-player hack for held objects 2020-10-13 18:12:33 -07:00
MysterD 297e5bed53 Remove two-player hack for packet_object 2020-10-13 18:11:40 -07:00
MysterD c15d646f43 Slight improvement to small breakable box sync 2020-10-12 18:10:40 -07:00
MysterD b31277c863 Standardized de-duplication of reliable packets 2020-10-12 18:40:38 -07:00
MysterD cd64f2e0e6 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 3741c21c67 remove unused version call 2020-10-11 20:45:44 -07:00
MysterD 58cbd7dd01 Possible fix for big bully spawn 2020-10-11 19:16:21 -07:00
MysterD dafb426073 Reset override_ownership to null (fixes crash in THI) 2020-10-11 18:54:05 -07:00
MysterD de573e14f3 Made version mismatch screen more descriptive 2020-10-11 18:26:10 -07:00
MysterD 2933efa49c Display instructions on how to fix Discord error to user 2020-10-11 18:11:11 -07:00
MysterD 168f352350 Fix how scancodes are read for text input
May fix issue where spanish keyboards are unable to press enter to chat
2020-10-11 17:20:47 -07:00
MysterD f3ea468247 Synchronized the controller properly (fixes 64bit-to-32bit communication bug) 2020-10-11 17:20:08 -07:00
MysterD c5fac42ab1 Establish new versioning system (beta 1) 2020-10-11 15:49:24 -07:00
MysterD 30d93d374d Added all levels to support levels! 2020-10-11 14:55:08 -07:00
MysterD e7f1ec26f9 Synchronized Bowser 3 fight platforms 2020-10-11 14:54:16 -07:00