Commit graph

1523 commits

Author SHA1 Message Date
MysterD
5653a4f20d Merge branch 'unstable' into level-scripts 2022-04-06 01:39:15 -07:00
MysterD
8e7f0e2ea9 Fix warning 2022-04-06 01:39:02 -07:00
MysterD
52e705c9d8 Merge branch 'unstable' into level-scripts 2022-04-06 01:36:33 -07:00
Altiami
b71c0b4b83
Return TRUE for interactions with Power Stars when Non-stop mode is enabled (#57) 2022-04-06 01:14:47 -07:00
MysterD
cba22bc73d Merge branch 'level-scripts' of github.com:sm64ex-coop-dev/sm64ex-coop into level-scripts 2022-04-05 23:00:20 -07:00
MysterD
78a2e17d7c Added support for custom skyboxes in DynOS level gen 2022-04-05 22:56:03 -07:00
Agent-11 / Agent X
746dd50c5c
Add get/set_environment_region (#56)
Set the water height with a function. Also added an example for it in the documentation.
2022-04-05 15:53:16 -07:00
Prince Frizzy
73df85276e
Add support for dynamic water regions. (#55)
* Add support for dynamic water regions.
2022-04-05 13:44:05 -07:00
MysterD
abce3b3afd Added ability for DynOS levels to call into lua for custom objects 2022-04-04 18:16:36 -07:00
PeachyPeach
95f60fd113
Set loading order of mods files to alphabetical; Fixed a bug with downloaded mod folders (#54)
Mods as a directory of files depend on loading order for them to work
properly. Currently, the loading order is basically undefined behavior
and unpredictable. The function mod_set_loading_order is here to
specify this order. By default (and for now), the order will be
alphabetical and will follow the ascii table values, meaning digits
come before capital letters and lowercase letters.

Fixed a bug with mods as directories of files when they are downloaded.
The bug was the following: If two selected mods have files with the
same relative filename, they overwrite each other when downloaded,
causing file corruption and making the client game crash when loaded.
To fix it, the mod's directory name is appended to every .lua filename,
so each file has a unique filename when downloaded.
2022-04-04 13:43:29 -07:00
MysterD
32388bf6ff All vanilla levels can be compiled through DynOS now 2022-04-04 01:11:02 -07:00
MysterD
046c595f92 More progress toward custom DynOS levels 2022-04-02 15:14:04 -07:00
Isaac
87aa18ef65
Credits skip (you can merge this now) (#52) 2022-03-31 01:52:28 -07:00
MysterD
36c1d52e1f Fixed DynOS saving/loading with spaces in pack name 2022-03-31 00:21:48 -07:00
MysterD
7aab487adb Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-31 00:13:10 -07:00
MysterD
8a7097b802 Refactor coop-specific DynOS code 2022-03-30 23:05:53 -07:00
Isaac
a9c1c9b4e4
Credits skip (#50)
Press the start button to skip the credits.
Works during ACT_END_PEACH_CUTSCENE and ACT_CREDITS_CUTSCENE.
2022-03-30 21:45:37 -07:00
MysterD
34d28ffb3c Ran autogen 2022-03-30 20:03:59 -07:00
MysterD
d049c647dd Allow Lua mods to prevent exit to castle/exit course 2022-03-30 20:03:22 -07:00
MysterD
0e50998a39 Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-30 19:26:06 -07:00
Prince Frizzy
e52173f109
Bomb-Omb Buddy sanity improvement (#51) 2022-03-30 19:25:21 -07:00
Prince Frizzy
a1af1c2ffb
Grand star fix and etc (#47)
A ton of Bowser fixes, Grand star included.

Fixed Grand Star cutscene syncing.
Partially fix grand star syncing after joining late.
Fix Bowser's intro cutscene always playing even if you joined after the first person.
Hopefully fixed Bowser's state getting interrupted mid-fight just a bit.
Add nothing state sanity check, and send object reliability when cutscene is finished.
Fix ownership override.
2022-03-30 19:03:53 -07:00
MysterD
71dd7b8d97 Resynchronized WDW water level and water diamonds 2022-03-30 18:10:36 -07:00
MysterD
9d16605c3b Force drop objects on instant warp 2022-03-29 22:34:48 -07:00
MysterD
51c1af7c68 Allow lua's network_init_object() to use 16 and 8 bit fields 2022-03-29 21:42:41 -07:00
MysterD
ddcb9ad6d3 Fixed 'skip intro' setting. Intro lakitu spawns when he's supposed to now 2022-03-29 21:22:08 -07:00
MysterD
2115e4358d Fix compile errors / run autogen 2022-03-29 21:12:42 -07:00
MysterD
dec4d0c51c Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-29 21:07:28 -07:00
MysterD
8f50ee17c9 Fixed critical flaw with txEventId/rxEventId, fixed up controllable platform 2022-03-29 20:57:47 -07:00
Prince Frizzy
54a6135cb9
Cleanup Deluxe (#45) 2022-03-29 20:45:56 -07:00
Isaac
6fa9a0f3f5
Fix camera for bubble in water (#49)
When a player dies in water, the camera continues to use the camera for under water even when you exit the water with the bubble. This commit fixes the issue.
2022-03-29 20:04:01 -07:00
MysterD
d76f060af0 Display the correct hidden number count on late join 2022-03-29 19:49:36 -07:00
MysterD
ee8257475d Properly forget sync objects even if their syncDeathEvent is false 2022-03-29 19:47:11 -07:00
MysterD
bf7066e9e3 Synchronized tumbling bridge for late joins 2022-03-29 19:34:48 -07:00
MysterD
45286eb46e Specify sync object field size 2022-03-29 19:29:57 -07:00
MysterD
ed53a5422c Desynchronize bouncing fireball spawner - just too noisy 2022-03-29 19:04:50 -07:00
MysterD
5455f59ad5 Prevent LLL puzzle from dropping more coins on late join 2022-03-29 18:59:05 -07:00
MysterD
84ab07bde6 Only send respawn info for macro objects when they are altered 2022-03-29 18:57:48 -07:00
MysterD
d17aa69052 Synchronized behParams for macroObjects on late join 2022-03-29 18:52:53 -07:00
MysterD
217a969208 Sync'd bobomb coin status on late join 2022-03-29 18:46:23 -07:00
MysterD
c855dd9855 Sync'd wooden posts coin status on late join 2022-03-29 18:45:17 -07:00
MysterD
167334973e Fix Discord's activity max players 2022-03-29 18:31:25 -07:00
MysterD
be30578bf3 Allow dpad to navigate DJUI menus 2022-03-29 18:27:42 -07:00
MysterD
a34293a58a Bump version 2022-03-29 18:20:45 -07:00
MysterD
8df2f4efae Only have local player face camera during stardance 2022-03-29 18:20:13 -07:00
MysterD
bc11f06136 Remove player's bubble when they leave the area 2022-03-29 18:17:37 -07:00
MysterD
0a5d4cd215 Fix softlock when player is grabbed by enemy 2022-03-28 18:57:52 -07:00
MysterD
26bd3d67c5 Prevent keys from typing when bound to chat 2022-03-28 18:42:46 -07:00
MysterD
33579b1a65 Prevent alt+enter from opening chat 2022-03-28 18:36:31 -07:00
MysterD
3e9ceb53b4 Reduce round-trip time during downloads by 8x 2022-03-28 01:09:06 -07:00
MysterD
d74f5cfe61 Add custom collisions to DynOS/Lua 2022-03-28 01:02:33 -07:00
MysterD
0bb48cb6e7 Rewrote structure of packet_level_area_inform - should fix 'Peach's Castle' bug 2022-03-27 18:25:04 -07:00
MysterD
61a1d1fc9c Fix errors pointed out by clang 2022-03-27 17:25:39 -07:00
MysterD
d78c87c06e Fix compile error 2022-03-27 00:16:23 -07:00
MysterD
7afc5d7d18 Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-26 23:58:24 -07:00
MysterD
47d2fe30a7 Made Lua object custom fields allocate deterministically 2022-03-26 23:58:04 -07:00
Isaac
a217eea63b
Improvements to debug move (#44) 2022-03-26 22:46:32 -07:00
Prince Frizzy
0fdd721241
Cleanup (#43)
* Rewrite a bit of get_level_name() and a bunch of cleanup.
2022-03-26 22:13:57 -07:00
MysterD
3f3936e874 Make Discord update the activity if player count changes 2022-03-26 01:21:36 -07:00
MysterD
de048928ce Added ability for Lua mods to adjust gServerSettings 2022-03-26 01:08:15 -07:00
MysterD
4a9e618efe Add set_mario_y_vel_based_on_fspeed() to lua 2022-03-26 00:01:13 -07:00
MysterD
b7be386200 Add gLakituState to Lua 2022-03-25 23:58:10 -07:00
MysterD
4d9ff3a3b1 Added a bunch of camera functions to Lua 2022-03-25 23:46:37 -07:00
MysterD
322e4983ae Add HOOK_ON_PAUSE_EXIT 2022-03-25 23:06:14 -07:00
MysterD
c0b6590fcd Separate ptrData from rawData on all platforms 2022-03-25 23:05:58 -07:00
MysterD
6ab992446d Fixed respawners 2022-03-25 22:45:40 -07:00
MysterD
506d7dad55 Fixed crash in geo_remove_child() 2022-03-25 22:19:29 -07:00
MysterD
033b11ac22 Make new timers immutable 2022-03-25 21:39:03 -07:00
MysterD
5b45e44b81 Improve sanity check for torsoPos (fixes PVP when using non-player-models) 2022-03-25 21:36:46 -07:00
MysterD
9ab1021f33 Fixed area desync 2022-03-25 21:19:36 -07:00
MysterD
d6aa5531cc Add additional info to level area inform packets 2022-03-24 20:52:19 -07:00
MysterD
3218f771e6 Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-24 19:30:53 -07:00
MysterD
67bffe8125 Bump version 2022-03-24 19:30:50 -07:00
Isaac
65df754b09
Add save file flag functions to lua api (#41) 2022-03-24 19:30:15 -07:00
MysterD
bac952c370 Make players invincible to pvp attacks on area load 2022-03-24 18:16:26 -07:00
MysterD
8bc0abb6a2 Remove spawn object field remembering system. Broken and unnecessary 2022-03-24 18:08:05 -07:00
Isaac
acd14c2718
Fixed desync for late joiners when using Non-stop mode and made bubble when no lives remaining kick you out of the level (#40) 2022-03-23 20:48:06 -07:00
MysterD
cb8bd36698 Revert "Revert "Fix smlua_field_valid for Lua""
This reverts commit e371ff272b.
2022-03-22 20:31:07 -07:00
MysterD
473c318f71 Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-22 20:26:58 -07:00
MysterD
aa5ce47f18 Prevent debug mode from corrupting Lua's stack when sending sync table 2022-03-22 20:26:54 -07:00
Isaac
989e304552
Made slide-kick minimum speed a bit more reasonable (#38)
* Made slide-kick minimum speed a bit more reasonable

* Changed the speed minimum to 15

* Minor adjustment

* Fix spelling and punctuation.
2022-03-22 19:51:25 -07:00
Prince Frizzy
a89aa6ced8
A load of fixes and cleanup.. (#39)
Red Coins will now properly play the cutscene for who collected the last red coin.
Secrets will now properly play the cutscene for who collected the last secret.
Treasure Chests will now only play the star cutscene for the person who opened the last chest.
Properly named some unknown Treasure Chest fields.
The Chain Chomp Chain should now properly be despawned for late joiners.
Improved the Big Boo's Haunt Merry-Go-Round checks for Mario.
2022-03-22 19:50:13 -07:00
MysterD
2cf7a87ab4 Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-21 19:47:23 -07:00
MysterD
bd2aac290e Give generate remote base path a return value. wtf 2022-03-21 19:47:10 -07:00
MysterD
e371ff272b Revert "Fix smlua_field_valid for Lua"
This reverts commit 5b69173d0a.
2022-03-21 22:43:58 -07:00
MysterD
5b69173d0a Fix smlua_field_valid for Lua 2022-03-21 15:20:54 -07:00
MysterD
823f28acd3 Fix compile error 2022-03-21 13:02:16 -07:00
MysterD
03dcb25273 Check types for spawn object transmission 2022-03-21 12:49:37 -07:00
MysterD
a35165bd9f Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-21 12:38:25 -07:00
MysterD
0fc592a430 Made bowser bomb use extended model loading 2022-03-21 12:36:01 -07:00
MysterD
0d2f9d1e8f Fixed crash in dist_between_objects() 2022-03-21 12:31:37 -07:00
MysterD
c088d6f7a4 Fixed crash in find_floor_from_list() 2022-03-21 12:29:30 -07:00
MysterD
a767df7e73 Fix crash in init_mario_after_warp() 2022-03-21 12:27:16 -07:00
MysterD
9ae1a7c525 Fix crash in spawn_default_star() 2022-03-21 12:25:06 -07:00
Prince Frizzy
74be5ad3d6
Swimming interference fix (#37) 2022-03-21 11:55:36 -07:00
MysterD
41275835e7 Lua : remember up to 16 extra fields to send on spawn lua object 2022-03-21 11:45:19 -07:00
MysterD
9538c551e4 Lua Bugfix: send tables inside of sync tables on join 2022-03-21 00:15:19 -07:00
MysterD
db1c2dd758 Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-19 00:59:06 -07:00
MysterD
c58702df93 Misc Lua fixes/enhancements
approach_s32 now stays within 32 bits
Fixed SOUND_ARG_LOAD
Added OBJ_COL_FLAGS_*
Added reset_rumble_timers
Added get_hand_foot_pos_*
Added get_water_surface_pseudo_floor
Adjusted new hooks to be called at the appropriate times
2022-03-19 00:56:59 -07:00
Prince Frizzy
579fa40524
Some small cleanup, And re-add generating the coop.map to the Makefile. (#36) 2022-03-18 21:31:04 -07:00