Commit graph

1370 commits

Author SHA1 Message Date
MysterD
e747f50f8b Compilation fixes 2022-03-10 20:07:50 -08:00
MysterD
64173ecf2a Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-10 19:25:33 -08:00
MysterD
bc0868e80e Implemented dynos model packs into configfile 2022-03-10 19:23:38 -08:00
MysterD
859feb530d Added ability for Lua to show/hide SM64 HUD 2022-03-10 18:33:52 -08:00
MysterD
497a250476 Allowed Lua mods to override player models and palettes 2022-03-10 18:23:25 -08:00
MysterD
e81808c314 Merge branch 'dynos' into unstable 2022-03-10 18:17:59 -08:00
MysterD
403a90e82b Added dynos model packs to djui interface 2022-03-10 18:16:12 -08:00
Prince Frizzy
85c54baa96
Fix compile error! You forgot this. (#18) 2022-03-10 14:06:26 -08:00
MysterD
f92857704d Ported the rest of DynOS, but left the options menu disabled 2022-03-10 01:18:53 -08:00
Prince Frizzy
a9aeb50e76
Crash Fixes - Sanity Checks And Cleanup. (#17)
* Add NULL check to try_allocate_object.

* Clean up spawn_object.c
2022-03-09 23:22:58 -08:00
MysterD
89d44f6501 Moved smlua_XXX_utils.[ch] to src/pc/lua/utils/ 2022-03-09 23:09:33 -08:00
MysterD
4638ff6f22 Added the ability to set surface collisions on custom behaviors 2022-03-09 23:02:20 -08:00
MysterD
9388aa8885 Show last lua mod to run in crash handler 2022-03-09 21:27:02 -08:00
MysterD
8802642296 Prevent long jump and side flip from PVP attacking 2022-03-09 21:26:51 -08:00
MysterD
d03aacc144 Added ability for Lua to spawn non-synchronized objects 2022-03-09 21:25:34 -08:00
MysterD
3641d5404e Added getter for network area timer 2022-03-09 21:25:21 -08:00
MysterD
1b99e22848 Added the ability to spawn particles from Lua
Added particles to football
Increased the object cap for particles
2022-03-09 21:25:07 -08:00
MysterD
f59513f3ae Refactored config-file options w/multiple entries 2022-03-09 21:24:49 -08:00
Isaac
355094c6ff Add reset_level to lua api (#16) 2022-03-09 21:24:39 -08:00
MysterD
5a46c5bc2f Fix warning on Linux 2022-03-09 21:24:39 -08:00
MysterD
3652a8d079 Fix problem where reliable packets were only reliable for one client instead of all 2022-03-09 21:24:39 -08:00
MysterD
4305b595c9 Fixed crash when spawning a custom behavior that doesn't override fomr Lua 2022-03-09 21:24:39 -08:00
MysterD
4dfa0ee669 Make debug binds harder to hit 2022-03-09 21:24:39 -08:00
Prince Frizzy
cdf12fb3c9 Fix two crashes. (#15) 2022-03-09 21:24:39 -08:00
MysterD
b3ed387711 Added DynOS v1.1 without the dynamic options
- Added support for coop-specific actors
- Added support for coop-specific geo functions
- Added support for coop-specific model functions
2022-03-09 18:01:03 -08:00
MysterD
5e0981824a Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable-dev 2022-03-08 21:42:15 -08:00
MysterD
f07353f94d Fix warning on Linux 2022-03-08 20:06:45 -08:00
MysterD
180fe3a8a0 Fix problem where reliable packets were only reliable for one client instead of all 2022-03-08 18:17:24 -08:00
MysterD
7a5a91007c Fixed crash when spawning a custom behavior that doesn't override fomr Lua 2022-03-08 00:50:15 -08:00
MysterD
379b51e384 Make debug binds harder to hit 2022-03-07 22:36:27 -08:00
MysterD
5fa3e27aa6 Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable-dev 2022-03-07 22:23:25 -08:00
MysterD
594202dde9 Allow network_init_object() to use fields that don't start with o 2022-03-07 22:20:53 -08:00
Prince Frizzy
3b35912305
Fix two crashes. (#15) 2022-03-06 19:14:22 -08:00
MysterD
b99c5f939f Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable-dev 2022-03-05 18:10:35 -08:00
MysterD
7aab694743 Add more vec3f functions to Lua 2022-03-05 18:10:20 -08:00
Amy54Desu
b97834a03e
This should solve the problem where players can reset the drowning animation under water. (#13)
This solves the issues where punching someone under water resets their drowning animation. This is done by setting their invincibility timer to 2. I chose 2 so they don't begin flashing since that would look weird.
2022-03-05 15:09:35 -08:00
PeachyPeach
d37ba32989
Added obj_has_behavior_id and obj_has_model_extended functions; break bhvBreakableBoxSmall objects without a wall collision by setting some flags in oInteractStatus (#12)
* Added obj_has_behavior_id and obj_has_model_extended functions; break bhvBreakableBoxSmall objects without a wall collision by setting some flags in oInteractStatus
2022-03-05 14:39:55 -08:00
MysterD
369a7cd7e5 Better fix for crash in cur_obj_follow_path() 2022-03-05 14:38:17 -08:00
MysterD
202bd1964c Revert "Fixed crash in cur_obj_follow_path()"
This reverts commit 394d1970c5.
2022-03-05 14:25:17 -08:00
MysterD
c2177b4eec Add collision_find_surface_on_ray() 2022-03-05 14:24:58 -08:00
MysterD
2d8715b330 Made adding to behaviors possible in Lua 2022-03-05 01:29:24 -08:00
MysterD
d3b9163507 Add missing AreaTimerType to documentation 2022-03-04 22:31:32 -08:00
MysterD
e740529776 Fixed how constants.md autogen'd links 2022-03-04 22:11:10 -08:00
MysterD
1fcf776e34 Enforce limits in player settings packet to prevent possible crash 2022-03-04 21:33:29 -08:00
MysterD
a924f7977b Resynchronized platform_on_track to prevent crash 2022-03-04 21:25:45 -08:00
MysterD
394d1970c5 Fixed crash in cur_obj_follow_path() 2022-03-04 20:47:43 -08:00
MysterD
15d657a7be Fix crash in set_anim_to_frame() 2022-03-04 20:40:57 -08:00
MysterD
29d9615f7b More sanity checks in network_receive_area() 2022-03-04 20:29:05 -08:00
MysterD
77a06e15b3 Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable-dev 2022-03-04 20:09:13 -08:00
Prince Frizzy
6f911738cf
Adds some sanity checks to network_receive_area, And add LOG_DEBUG (#10) 2022-03-04 20:07:35 -08:00
MysterD
a87116a632 Add networking for custom behaviors 2022-03-04 20:03:00 -08:00
MysterD
9c7036afe3 Add define_custom_obj_fields() to Lua 2022-03-04 18:16:54 -08:00
MysterD
bac0879ee7 Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable-dev 2022-03-03 19:40:30 -08:00
MysterD
e27acaff99 Improvements to crash screen 2022-03-03 19:40:18 -08:00
MysterD
3bc80ad7be Add object animations to Lua, add CPointer allowlist 2022-03-03 18:31:45 -08:00
PeachyPeach
b4507319b9
Added functions: find_ceil_height and obj_set_model_extended (#9)
* Added functions: find_ceil_height and obj_set_model_extended
2022-03-03 16:46:01 -08:00
MysterD
3ad6c721dc Initial custom behavior commit 2022-03-03 01:04:15 -08:00
MysterD
6783ef0b7f Fix Discord activity display 2022-03-02 18:25:53 -08:00
MysterD
92b5893871 Raised Lua size limit from 64KB to 2MB 2022-03-02 00:40:53 -08:00
MysterD
822cc4a4a9 More adjustments 2022-03-02 00:11:34 -08:00
MysterD
7a4505e353 Spoofing adjustments 2022-03-02 00:07:41 -08:00
MysterD
8bfadc95f1 Add anti-spoofing 2022-03-02 00:01:41 -08:00
MysterD
a1dbd4b268 Switch behavior ID length from 16bit to 32bit 2022-03-01 22:55:40 -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
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
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
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
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
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