Commit Graph

210 Commits (e548b80c9d119cacb0ff93fd7fcc01a83dcdedac)

Author SHA1 Message Date
MysterD 2d159af4cc Allow coop mods to use the backup save slot independently of the normal one 2022-04-10 00:30:47 -07:00
MysterD 2e8017a39c Allow course names/acts to be changed from Lua 2022-04-09 23:28:36 -07:00
MysterD 47dd967af5 Added a way to bind to movtexqc ids through lua, added the rest of the object constants 2022-04-09 01:47:20 -07:00
MysterD 38ac873568 Made trajectories overridable from Lua 2022-04-08 23:01:41 -07:00
MysterD d4f462d491 Added custom level script overrides, warps work now 2022-04-08 19:29:16 -07:00
MysterD 56a314bab5 Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions 2022-04-08 19:17:57 -07:00
MysterD 0342f767df Refactored actor geos in DynOS 2022-04-08 18:56:22 -07:00
MysterD 420789b570 Split dynos_misc stuff into mgr files 2022-04-08 08:18:06 -07:00
MysterD ac8db94f53 Renaming cleanup 2022-04-08 01:52:53 -07:00
MysterD 837f1e4f71 Function pointer cleanup 2022-04-08 01:46:29 -07:00
MysterD 652452540c Added vanilla lvl cols to level gen, changed how pointer offsets are saved 2022-04-07 23:06:10 -07:00
MysterD 8d0eff3cb2 Added support for SM76's JUMP_AREA, added missing lvl geos, reordered parsing 2022-04-07 18:34:44 -07:00
MysterD c5f7aecd40 Fixed token corruption in DynOS, added support for runtime LOAD_MODEL_FROM_GEO 2022-04-07 08:21:19 -07:00
MysterD 2cc48515a7 Added support for known models and unknown behaviors for level gen 2022-04-06 23:10:39 -07:00
MysterD 56be400f7e Only force in movtexs and collisions within that levels subfolders 2022-04-06 22:14:40 -07:00
MysterD ab115da1de Refactored how vanilla data is stored/retrieved within DynOS 2022-04-06 21:32:55 -07:00
MysterD 6dd90100ad Adjustments for Lua/Mods 2022-04-06 18:24:50 -07:00
MysterD 5da4060f0a Memory management improvements
Log errors on allocation failure
NULL check all display list allocations
Fix reading a freed string
2022-04-06 18:10:22 -07:00
MysterD 6aa29a54e7 Added extended bounds 2022-04-06 08:40:22 -07:00
MysterD e49593d5cf Sneaky files re-appeared in the merge 2022-04-06 01:44:27 -07:00
MysterD 2aeb96cc59 Merge branch 'unstable' into level-scripts 2022-04-06 01:36:33 -07:00
MysterD 4c734762b1 Fix compile error 2022-04-05 23:10:39 -07:00
MysterD 431a2b5da8 Merge branch 'level-scripts' of github.com:sm64ex-coop-dev/sm64ex-coop into level-scripts 2022-04-05 23:00:20 -07:00
MysterD 635b23aa6f Added support for custom skyboxes in DynOS level gen 2022-04-05 22:56:03 -07:00
Prince Frizzy e6f97a3ef7 Add support for dynamic water regions. (#55)
* Add support for dynamic water regions.
2022-04-05 13:44:05 -07:00
MysterD babcdb551e Force Movtexs into compiled DynOS lvls 2022-04-05 08:15:08 -07:00
MysterD 5fe27f6974 Fixed how DynOS writes lua variables into level scripts, added all level geos 2022-04-05 00:22:09 -07:00
MysterD 7055d1c21c Backwards compatibility fix for DynOS 2022-04-04 21:42:14 -07:00
MysterD ab149832be Added Light_t, Ambient_t, and began adding vanilla lvl geos to DynOS level gen 2022-04-04 21:25:40 -07:00
MysterD 4cd4849ada Added ability for DynOS levels to call into lua for custom objects 2022-04-04 18:16:36 -07:00
MysterD a495a775be All vanilla levels can be compiled through DynOS now 2022-04-04 01:11:02 -07:00
MysterD 9cb6d3cae2 Added rooms parsing to DynOS level gen 2022-04-03 23:42:25 -07:00
MysterD 79233b994f Added Movtex and MovetexQC to DynOS level gen 2022-04-03 22:12:17 -07:00
MysterD 1309eb7ef9 More DynOS custom level progress - BOB can now compile 2022-04-03 03:30:47 -07:00
MysterD 30f468e869 Added trajectories to custom DynOS levels 2022-04-02 16:08:19 -07:00
MysterD a204fc996c Recursively parse DynOS level folders 2022-04-02 15:55:06 -07:00
MysterD 95e826d1c8 Fixed custom level textures 2022-04-02 15:32:21 -07:00
MysterD 4052347247 More progress toward custom DynOS levels 2022-04-02 15:14:04 -07:00
MysterD 517b37616c More DynOS refactoring 2022-04-01 20:04:24 -07:00
MysterD a2880865c8 Fixed up DynOS collision files 2022-04-01 17:59:40 -07:00
MysterD d30555be82 DynOS cleanup 2022-04-01 17:54:32 -07:00
MysterD 018a5e4f5c DynOS level parsing - phase 1 2022-04-01 17:19:26 -07:00
MysterD 00f0562d4d Start parsing level scripts in DynOS 2022-04-01 01:43:50 -07:00
MysterD a32d14f6cc Fix how DynOS decides to generate bins for geos 2022-03-31 01:17:11 -07:00
MysterD 1cd9715cda Add 'specials' to DynOS collisions 2022-03-30 23:52:50 -07:00
MysterD 3ee38c382d Add the rest of the surface constants to DynOS 2022-03-30 23:08:19 -07:00
MysterD a4ed264285 Refactor coop-specific DynOS code 2022-03-30 23:05:53 -07:00
MysterD 745fce41a8 Add custom collisions to DynOS/Lua 2022-03-28 01:02:33 -07:00
MysterD a60a11f51d Fix errors pointed out by clang 2022-03-27 17:25:39 -07:00
MysterD b25bb84b48 Make DynOS only generate one bin per actor 2022-03-25 22:05:07 -07:00
MysterD 7c7fcbf0b5 Allow people to disabled downloaded models (from mods) 2022-03-16 22:43:43 -07:00
MysterD 0f12429fb3 Allow lua mods to override models, have DynOS generate bins 2022-03-16 21:26:29 -07:00
MysterD 40ecf7ea51 Fixed custom lua models 2022-03-16 19:57:45 -07:00
MysterD f74b6a47d0 Load Super Keeberghrh's ERROR model when DynOS can't find the model 2022-03-16 01:34:18 -07:00
MysterD 308628cea8 Hook DynOS into mods when they're activated (custom models) 2022-03-16 01:11:48 -07:00
MysterD d2522cc955 Added ability for mods to load custom geos 2022-03-14 00:11:36 -07:00
MysterD 72c7ef7d26 Make DynOS generate a bin for every Geo Layout 2022-03-13 21:22:26 -07:00
MysterD ece5b138fd Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable 2022-03-13 18:45:50 -07:00
MysterD f8025309d8 Fix warnings/compile errors on Linux 2022-03-13 18:45:42 -07:00
Isaac 128efd2c3b Allowed DynOS Packs to be placed in %appdata%/sm64ex-coop (#27) 2022-03-13 18:09:57 -07:00
Isaac 0b9196f248 Fix headless server compile (again) (#23) 2022-03-13 14:10:24 -07:00
Prince Frizzy 43ae67c337 Update to Refresh 13 (#19)
* Refresh 13

Co-authored-by: n64 <n64>
2022-03-13 00:17:10 -08:00
MysterD 425a0ad0eb Preserve 'unpause to skip transition' for speedrunners 2022-03-12 01:16:19 -08:00
MysterD 2876251fb6 Added DynOS warp functions to Lua API 2022-03-11 18:11:32 -08:00
MysterD bb9e14d4ad Fix DynOS pack-to-name conversion 2022-03-10 23:24:22 -08:00
MysterD 54810a2a85 Implemented dynos model packs into configfile 2022-03-10 19:23:38 -08:00
MysterD 8aeaa88c40 Added dynos model packs to djui interface 2022-03-10 18:16:12 -08:00
MysterD 3f442c474a Ported the rest of DynOS, but left the options menu disabled 2022-03-10 01:18:53 -08:00
MysterD 4ddb6bbf5f 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 192dd33ce1 Fixed crash when spawning a custom behavior that doesn't override fomr Lua 2022-03-08 00:50:15 -08:00
MysterD 3de0900bbc Initial custom behavior commit 2022-03-03 01:04:15 -08:00
MysterD 3ada1eaaf6 Fix various bugs with spiny and lakitu 2022-01-14 20:06:26 -08:00
MysterD 12fd68e47a Added a callback for area timer objects to only run certain things once per frame 2021-08-19 00:31:20 -07:00
MysterD 54fb90b549 Split luigi/custom character models into custom and zcustom 2021-08-15 01:06:25 -07:00
MysterD c60a2b797c Fixed late join for items a Boo was carrying 2021-08-12 18:48:17 -07:00
MysterD f5c2b5ebe0 Added new MAXIMUM type to network area timer system. Exclamation boxes now reappear at the correct time 2021-08-12 18:13:41 -07:00
MysterD 3fc8e45f77 Rewrite the core of network area timer (yet again) 2021-08-10 18:29:49 -07:00
MysterD 810f425472 Synchronized moat draining and cap switch unlocks 2021-06-14 19:59:11 -07:00
MysterD cabdab421b Improvements to late-join synchronization
Removed (slightly) old coin and static ent removal system
Resynchronized respawners
Added packet for macro deletions
    better than previous system since the entities don't need a sync id and we can synchronize deletion station across areas
    allows the synchronization of odd entities like lines of coins
Added packet for spawn info deletions
Split packet_location_request into multiple files
2021-06-09 22:35:34 -07:00
MysterD 09282cc63b Synchronize late-join coin collection 2021-06-08 02:26:35 -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 cbc2a463ca Synchronized Eyerok, add SSL to supported levels
Eyerok was synchronized, but I'm still not super pleased with the
result. I had to sacrifice dialog to prevent weird states and he's
completely controlled by the server. His synchronization should be
revisited in the future.

SSL should be fully synchronized now.
2020-09-30 18:20:13 -07:00
MysterD 0895f41353 Ensure bowser key/star spawns, make bowser intro less glitchy 2020-09-24 20:28:59 -07:00
MysterD fc023fed56 Improvements to Bowser 2 (still not fully supported) 2020-09-23 22:00:20 -07:00
MysterD 61b3f603b4 Synchronize various LLL platforms 2020-09-21 00:32:14 -07:00
MysterD 066220a49d Synchronized Bullies 2020-09-20 23:30:49 -07:00
MysterD 416f4a1398 Rewrote how players are initialized, stored, and displayed
Since the second-player code was the first code I wrote, it was implemented
poorly. At that point, I didn't know the code base at all and the way it was
written would prevent anyone from ever adding to those parts.

The rewrite allows me to use the default geo.inc.c file for Mario, and removes
all of the geo2.inc.c files. I no longer do a bunch of bit shifting to figure
out which player is being drawn in the rendering code.

I'm also now able to remove tons of duplicate code that exists just for the
remote player. The main player code is generic enough to support both indices.
A side-effect of the rewrite is I was able to remove many assumptions in the
code where two-players is assumed, but many other parts of the code still
assume two players.

This is a fairly major change that, if all goes well, will be completely
unnoticed by the player. However, I do expect new bugs to pop up in strange
places. Time will tell.
2020-09-06 18:52:52 -07:00
MysterD 5857b71209 Players turn into bubbles when they die
Player life counters are separate.
When one player dies they lose a life and are turned into a bubble.
If the other player pops it, they are alive again.
If all players are bubbled, they get kicked out of the level.
If the bubbled player ran out of lives, they can not come back to life
until the level is over.
Whenever a level change happens, everyone's life count is set to a
minimum of two.
No game overs.

Took heavy inspiration from Kaze Emanuar
2020-09-05 18:10:55 -07:00
MysterD a54d60b135 Added player-to-player interactions
Players are now solid to each other and can push each other
Players can now attack each other (but they do not deal damage)
Players can bounce on top of each other, and they get squished
temporarily
Players are given slightly offset positions when they transition between
areas and levels, so they're no longer on top of one another.
2020-09-02 23:50:27 -07:00
MysterD dca1863392 Synchronized Bowser 1 2020-08-29 12:59:07 -07:00
MysterD 0c33337d35 Synchronized square platforms as groups of two 2020-08-28 20:25:34 -07:00
MysterD f0757561e4 Resynchronized checkerboard platforms 2020-08-27 21:39:13 -07:00
MysterD 680db50f64 Fixed tower platform spawning bug 2020-08-11 23:27:37 -07:00
MysterD 4584b8b8f2 Gave each BehaviorScript an ID
Created functions to trivially translate an ID to a Behavior and vice
versa. Sent ID over packets instead of Behavior pointer. This should
allow Linux and Windows to play together.
2020-08-09 16:21:12 -07:00
MysterD a1522c9eaf L is real 2020
Added Luigi model.
Renamed all previous references to 'Luigi' to 'Mario2' since player 1
isn't always mario, and player 2 isn't always luigi.
Now server is always mario and client is always Luigi.

Luigi model credits:
Original model by Cjes, converted by AloXado320, textures added/fixed by
SunlitSpace542.
2020-08-08 21:36:49 -07:00
MysterD f84e9c92af Started adding player 2 / Luigi 2020-07-29 21:08:38 -07:00
danielh05 7d2471860d fix spacing and remove include 2020-06-25 13:34:53 +02:00
danielh05 febd557cfd Make tree only Cylboard when "BETTERCAMERA" is detected 2020-06-25 02:38:23 +02:00
n64 5bee83faa8 merge refresh 10 2020-06-20 02:49:59 +03:00
uncletrunks 7c7287b33a putting out fires 2020-05-14 21:50:10 -05:00
uncletrunks d0c0a31fea adds cylindrical billboarding, enables it for trees. 2020-05-14 20:31:52 -05:00
n64 4d54e2f91a Refresh 8 2020-04-03 14:57:26 -04:00
n64 88e2433da5 Refresh 7 2020-03-01 22:42:52 -05:00
n64 88b91e7c75 refresh 6 2020-02-03 00:51:26 -05:00
n64 ced3a63505 refresh 5 2020-01-03 10:38:57 -05:00
n64 99e662fa5d refresh 4 2019-12-01 21:52:53 -05:00
n64 8bc51a5025 Refresh 3 2019-11-03 14:36:27 -05:00
n64 5effc886be Refresh 2 2019-10-05 15:08:05 -04:00
n64 33b27a1ceb Refresh 1 2019-09-01 15:50:50 -04:00
n64 89e8690857 init2 2019-08-25 00:46:40 -04:00