Commit graph

1667 commits

Author SHA1 Message Date
MysterD
d578c6a2ce Remove cppcheck log 2022-03-01 21:20:27 -08:00
MysterD
07cbeb119c Fixed more possible bugs pointed out by cppcheck 2022-03-01 21:13:00 -08:00
MysterD
637f17a8ac Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-01 20:32:39 -08:00
MysterD
d51c82e235 Fixed many bugs pointed out by cppcheck 2022-03-01 20:32:33 -08:00
Isaac
9fc838f6d3
Added init_mario_after_warp() to lua API if there is only 1 player (#7) 2022-03-01 18:54:42 -08:00
Prince Frizzy
f0c807f5b8
Fix Merry-Go-Round Boos not having their blue coins to drop. (#8) 2022-03-01 18:35:47 -08:00
MysterD
887d033804 Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-01 16:11:42 -08:00
MysterD
ecc33286ad Ran autogen 2022-03-01 12:06:06 -08:00
MysterD
555d10433b Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable-dev 2022-03-01 12:00:47 -08:00
MysterD
8d5ab43f66 Possible crash fix 2022-03-01 18:02:54 -08:00
PeachyPeachSM64
b8cdcf4795 Added obj_get_* functions; Added set_camera_mode 2022-03-01 12:00:01 -08:00
MysterD
5788d80c78 Delete custom sounds on 32-bit, they are currently breaking the build 2022-02-28 23:00:24 -08:00
MysterD
e0fb9d7bac Delete custom sounds on 32-bit, they are currently breaking the build 2022-02-28 22:59:58 -08:00
MysterD
2f15b4664c Add cpp stuff for coop-compiler 2022-02-28 21:34:30 -08:00
MysterD
9ca4a9684e Add cpp stuff for coop-compiler 2022-02-28 21:33:52 -08:00
PeachyPeach
0c42836b81
Added support for X and Y buttons; Re-mapped B button to the actual B button for controllers; Moved particleFlags code so lua scripts can spawn Mario particles with 'before Mario update' and 'after Mario update' hooks (#5) 2022-02-27 14:31:59 -08:00
MysterD
02968831c7 Merge branch 'unstable-dev' into unstable 2022-02-27 01:34:25 -08:00
MysterD
02b3e19e12 Update credits 2022-02-27 01:33:06 -08:00
MysterD
fdff27b8cd Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable-dev 2022-02-27 01:30:01 -08:00
Isaac
1774544896
Prevented the game from closing when Discord has an error (#4)
* Update discord.c

* Update discord.c
2022-02-27 01:29:32 -08:00
MysterD
0ddb59c87c Fix crash in djui_interactable_update 2022-02-27 01:23:35 -08:00
MysterD
c60f9f3e46 Prevent crash in anim_spline_poll 2022-02-27 01:05:36 -08:00
MysterD
0f86018bfe Fixed crash in configfile_save 2022-02-27 01:02:32 -08:00
MysterD
a35d759a46 Fix crash when surfaces fail to allocate 2022-02-27 00:53:58 -08:00
MysterD
e16f3eb075 Fix blue coin in boo value 2022-02-26 21:30:26 -08:00
MysterD
f92c956ea2 Fix exclamation box outline 2022-02-26 21:28:55 -08:00
MysterD
0ea1eec2ed Revert "Prevent multiple star cutscenes from causing a rare softlock"
This reverts commit ebcaddede4.
2022-02-26 18:21:21 -08:00
MysterD
19359f5e78 Revert "Prevent multiple star cutscenes from causing a rare softlock"
This reverts commit ebcaddede4.
2022-02-26 18:19:43 -08:00
MysterD
05ded440ff Update credits 2022-02-26 16:53:53 -08:00
MysterD
df047409bb Update credits 2022-02-26 16:53:31 -08:00
MysterD
32d62272b4 Merge branch 'unstable' of github.com:djoslin0/sm64ex-coop into unstable 2022-02-26 16:49:30 -08:00
SonicDarkYT
9cf1061d59
More Color Palettes (#137)
* Update pc_main.c

* Update mario_misc.c

* Update djui_panel_player.c
2022-02-26 16:49:24 -08:00
MysterD
ca8d0b9c9c Add Amy to credits 2022-02-26 16:30:51 -08:00
MysterD
f4e1647257 Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable-dev 2022-02-26 16:30:27 -08:00
Prince Frizzy
169cd9fa44 Revise this fix in mario_actions_automatic.c
Have Mario drop off the pole if it doesn't exist instead of just returning POLE_NONE.
2022-02-26 16:30:07 -08:00
Prince Frizzy
0fc5f0d768 Proper NULL check for this in water_ring.c
The water ring index should NOT increment if a water ring fails to spawn.
2022-02-26 16:30:07 -08:00
MysterD
8fd349e5b1 Merge branch 'unstable' into unstable-dev 2022-02-26 16:12:33 -08:00
Amy54Desu
a83ce7d946
Settable Player Limit (#135)
Allow a configurable maximum number of players
2022-02-26 16:11:50 -08:00
MysterD
57cfc22840 Bump version to 18 2022-02-26 15:58:39 -08:00
MysterD
d3b4e1c794 Made certain objects use their dynamically assigned model IDs 2022-02-26 02:14:30 -08:00
Beyley Thomas
bb343f9ba2 Allow binding to ports <1024 on non-linux builds (#136)
* Allow binding to ports <1024 on non-linux builds
This seems to be only a restriction on Linux and Mac versions older then Mojave

* Fix port check on djui_panel_join_ip_parse_port
2022-02-26 00:07:12 -08:00
MysterD
ccf4952baa Add spawn-stuff lua example 2022-02-26 00:03:21 -08:00
MysterD
0c4a2c99f0 Update credits 2022-02-26 00:01:40 -08:00
MysterD
1c36ea979f Fix crash on invalid domain 2022-02-25 22:58:14 -08:00
MysterD
fa36ed308e Add more constants to Lua 2022-02-25 22:44:37 -08:00
MysterD
49e48d4028 Fix crash on invalid domain 2022-02-25 22:44:23 -08:00
Beyley Thomas
a957ce2aa0
Allow binding to ports <1024 on non-linux builds (#136)
* Allow binding to ports <1024 on non-linux builds
This seems to be only a restriction on Linux and Mac versions older then Mojave

* Fix port check on djui_panel_join_ip_parse_port
2022-02-25 22:39:03 -08:00
MysterD
d504ee6975 Merge branch 'unstable' of github.com:djoslin0/sm64ex-coop into unstable 2022-02-25 21:06:33 -08:00
Isaac
b72344c6e4
Added Domain Resolution (#134)
Automatically converts domains to IPs
2022-02-25 21:05:21 -08:00
MysterD
2d70b9bb87 Switch all PATH_MAX to SYS_MAX_PATH 2022-02-25 18:33:31 -08:00