Commit Graph

358 Commits (0b66a50a00d276d6aca7b110b7c9ed62298706b8)

Author SHA1 Message Date
Agent X cc9348c71c Fix compilation warnings 2023-11-21 17:44:36 -05:00
Sunk a85c8dbbf8 Create `hook_exclamation_box` in place of `set_exclamation_box_contents` (#524)
* Revert set_exclamation_box_contents()

In favor of the hook

* Create `hook_exclamation_box`
2023-11-21 17:22:54 -05:00
David Joslin fbfbc15e44 manual.lua fixes 2023-11-21 17:17:21 -05:00
Isaac0-dev ea487fe342 actually fix extended pause menu + improve act/course replacement (#523) 2023-11-21 17:15:18 -05:00
Isaac0-dev 23193887db added HOOK_MIRROR_MARIO_RENDER to Lua (#514)
* added HOOK_MIRROR_MARIO_RENDER to Lua

Previously there was no way to interact with mirror Mario using the Lua api, so this fixes that.

* remove premature optimisation

* revert that
2023-11-21 17:00:35 -05:00
Agent X d9a59aa0ed Merge branch 'main' of https://github.com/coop-deluxe/sm64coopdx-rebase 2023-11-17 18:32:14 -05:00
Blockyyy c2c846f650 Expose lvl_set_current_level (#513)
* Expose Initiate_warp

exposed initiate_warp function
exposed WARP_NODE_ constants

* expose lvl_set_current_level

* remove initiate_warp
2023-11-17 18:29:37 -05:00
SharenTheCat 5b72836c15 Modify Mario's head and torso rotation outside of specific cases
Adds "m.marioBodyState.allowPartRotation", which when set to 1, will make "m.marioBodyState.headAngle" and "m.marioBodyStates.torsoAngle" actually change where Mario's head and torso face outside of very specific cases (like running, or being underwater).
2023-11-16 23:01:18 -03:00
Blockyyy 5d39741be1 Delete star flags (#501)
* Expose save_file_remove_star_flags

* new packet

added a new packet type and two new functions

* oops

* create packet_save_remove_flag.c

move the new network functions to a new file

* Switch u32 to u8

Switched courseStarsToRemove from u32
 to u8 for consistency

* fixed the function

-Fixed empty save file marked as existing
-Fixed SAVE_FILE_EXISTS flag being deleted
-Fixed removing ALL flags from the remote saves
2023-11-14 20:40:34 -05:00
eros71-dev ff17fa4a67 Add ON_COLLIDE_LEVEL_BOUNDS hook
Called whenever Mario hits the level boundaries "wall"
2023-11-12 19:28:38 +01:00
Agent X ce987ef3dd Add first person functions to Lua 2023-11-12 09:53:08 -05:00
Agent X e79775aea4 Improve first person and add gFirstPersonCamera 2023-11-11 16:49:46 -05:00
Agent X ae22eaac98 Add "-- deluxe:" field to mods 2023-11-11 14:16:27 -05:00
Agent X 281efe57fe Fix autogen convert constants 2023-11-11 12:35:32 -05:00
Agent X 802affd839 ENHANCE_LEVEL_TEXTURES and make all DynOS textures overridable in Lua 2023-11-11 12:15:32 -05:00
Agent X 140d50ebb2 Misc fixes and cleanup 2023-11-10 19:12:21 -05:00
David Joslin c7edf85ad9 Fix crash in tox_box_move() 2023-11-08 19:55:28 -05:00
MysterD 081a7fd9dc Added HOOK_ON_RENDER_BEHIND, deprecated djui_hud_set_render_behind_hud() 2023-11-08 19:53:27 -05:00
defacube 36e9274ef5 Add support for 16 areas (#502) 2023-11-08 19:48:09 -05:00
David Joslin 8ab0e17876 Remove built-in cheats 2023-11-08 19:48:00 -05:00
Agent X c9489ba165 Small fix 2023-11-07 16:50:56 -05:00
Agent X 7343c019af Update info panel 2023-11-07 16:48:57 -05:00
Sunk da5c4a68db Added romhack camera dpad functionality (#497)
* Aglambi (Added romhack camera dpad functionality)

* Remove this random comment on request

* Make dpad camera disabled by default

* Force axis alignment when dpad camera is off
2023-11-06 15:00:23 -05:00
Blockyyy 56e7470e7b Exposed warp_special (#493)
Exposes the warp_special function and adds some constants for it

Fixed the crash by making it so a script error happens instead.
2023-11-06 14:59:20 -05:00
Agent X e8b6a8cffa Build first person player camera into the game 2023-11-04 21:32:03 -04:00
Agent X 395ac50532 Add ability to set fog intensity multiplier (ramps up quickly) 2023-11-01 21:21:46 -04:00
Agent X 49bca1cc01 sm64coopdx
Co-Authored-By: Yuyake <140215214+AngelicMiracles@users.noreply.github.com>
Co-Authored-By: FluffaMario <50761036+FluffaMario@users.noreply.github.com>
Co-Authored-By: Gregory Heskett <gheskett@gmail.com>
Co-Authored-By: iZePlayzYT <69536095+iZePlayzYT@users.noreply.github.com>
Co-Authored-By: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com>
Co-Authored-By: eros71 <16540103+eros71-dev@users.noreply.github.com>
2023-10-30 01:03:36 -04:00
David Joslin b199f203a4 Made the hang prevention message go to LOG_ERROR instead of stdout 2023-10-28 00:21:18 -07:00
EmeraldLockdown 9b502346a7
Console Overhaul (#490)
Completely redid the console ui to look more like the rest of coop
    Added log_to_console and djui_console_toggle to lua
    Made the keybind to activate it the tilda key (~) instead of ctrl+f1
2023-10-28 00:18:23 -07:00
MysterD b002061609 Cleaned up character sound/anim lookup code 2023-10-27 18:59:00 -07:00
MysterD 27b799055c Fix compile errors from recent merges 2023-10-27 18:02:04 -07:00
Keeberghrh e02a68e221
Character Animation System (#441)
Replaces references to set_mario_animation() with set_character_animation(), but the old function still exists as a way to play any character animation on any character. Waluigi has two animations, added as a test and may not be final. Exposed new functions to Lua for usage in mods.
Primary concern is that each character requires 209 lines indicating what animations they use, similar to Character Sounds.
2023-10-27 17:43:45 -07:00
Isaac0-dev c9e4efdb31
custom level fixes and fixes from other pr (#483)
clean up custom level code
    fixed a bug where custom level course numbers weren't used by dynos warps
    removed a bunch of unused dynos code
    fix demos triggering incorrectly
    allowed the right Ctrl key to be used when opening the in game console
    fixed a softlock that was possible to experience when talking to the snowman in CCM
    fixed the bug where you can permanently lose your cap (bug created by my own PR from beta 32)
    fix the moderator feature I made a while back; I am amazed it even worked at all before
    fixed dynos warp initial actions being skipped (read ec8aabc for explanation)
    completely changed the way star names and course names work
2023-10-27 16:42:27 -07:00
David Joslin 2df5456793 Reran autogen 2023-10-27 03:18:01 -07:00
EmeraldLockdown 95d4d627ea
Fix Popup Setting (#485)
* Remove old setting

* Readded setting

* Make setting actually work

* Add override functions

* Reset overrides on network shutdown

* Use djui_is_popup_disabled instead of ternary expression

* Move all the other stuff out of .h file
2023-10-27 03:10:32 -07:00
David Joslin cf20658079 Eyerok can now get attacked by remote players 2023-10-27 01:03:20 -07:00
David Joslin 8fe77eaf9f Ran autogen 2023-10-26 17:15:01 -07:00
flipflop bell 22761949f7
Fix gBehaviorValues.GrateStarRequirement and add gBehaviorValues.Chil… (#471)
* Fix gBehaviorValues.GrateStarRequirement and add gBehaviorValues.ChillyChiefDeathPosY

For some reason, the castle_cannon_grate.inc.c file was unaltered so gBehaviorValues.GrateStarRequirement would not do anything.
gBehaviorValues.ChillyChiefDeathPosY is self explanatory, it lets you change the Y position where the Chilly Chief bully dies.

* ChillyChiefDeathPosY -> ChillBullyDeathPosY

---------

Co-authored-by: <peachy.peach.sm64@gmail.com>
2023-10-20 19:15:38 +02:00
Sunk 302b9b71fa
Patch out toxic gas camera from romhacks (#462)
* Patch out toxic gas camera from romhacks

* Allow toxic gas camera in romhacks to be disabled with camera_allow_toxic_gas_camera()

In romhacks only. Toxic gas camera in vanilla levels will always remain active.
Passing in 0 means enable toxic gas camera.

* Reset gOverrideAllowToxicGasCamera to network_shutdown()

* Swap order

I too have a hard time reading my own code
2023-09-20 19:12:08 +02:00
Sunk 284e02dcb1
Add gLevelValues.wdwWaterLevelSpeed (#469)
Some romhacks do change the speed of the wdw water level.
I am aware that the water level is an object and should be under gBehaviorValues, but that feels wrong so it's under gLevelValues.
2023-09-11 18:42:15 +02:00
PeachyPeach 31c2e23c48
allocate_mario_action fix and improvement (#453) 2023-08-18 18:55:39 +02:00
Sunk c428612a9e
Add set_exclamation_box_contents() (#445)
* Properly set Mario's y vel to 0 on popping

* Change 0 to 0.0f, just in case

* Re-introduce a few vanilla bugs under gBehaviorValues

The Shell Mario glitch was patched as a side effect to patching a different bug, but several romhacks use it so I need it back.
The ability to collect multiple normal caps at once is needed for hat-in-hand using the hat factory glitch.

* Fix Shell Mario fix

Found the actual reason why the glitch doesn't work and figured that this change shouldn't affect anything else, so I removed its entry from gBehaviorValues.

* Add InfiniteRenderDistance to gBehaviorValues

I'm well aware that disabling the infinite render distance will be very desync prone, however a few glitches, most notably cloning and chuckya double jump, need objects load and unload from render distance.

* Allow mods to disable the camera centering from romhack camera

* Allow mods to disable romhack camera centering

Done again

* Update on network shutdown

* Remove a line which I have no idea why it returned

* Add set_exclamation_box_contents()

No way this is memory safe or even well made but I did what I could

* Added (most of) peachy's suggestions

Still need to figure out how to stop the game from reading further than the size of the array without using a hardcoded number

* Added more of peachy's suggestions

I figured a good way to cap how far the exclamation box reads is to pass in the length of the array as well
2023-07-18 18:18:02 -04:00
Sunk d1aa4aee1e
Add gLevelValues.bubbleOnDeathBarrierInCapStages (#449)
Also add a few smaller fixes with bubbles
2023-07-18 18:01:05 -04:00
Sunk 3242c4e7c8
Document manual.lua (#443)
* Properly set Mario's y vel to 0 on popping

* Change 0 to 0.0f, just in case

* Massively increase surface pool size

Also exposed the surface pool counts by creating a few functions to get them. They only existed for debugging but may as well keep them.

* Allow extended moveset to be toggled from a chat command

I got permission to edit extended moveset. Eventually I'll try to see if I can improve upon this moveset.

* Remove old surface code

Part 1

* Heavily document manual.lua

Hopefully nothing I added is wrong

* Small change in descriptions
2023-07-18 18:00:35 -04:00
Agent X ed60d53ab3
Mod Storage C++ (#448)
* Mod Storage C++

* Implement Peachy's suggestions.

Thank you Peachy.
2023-07-18 17:52:11 -04:00
Agent X d63abe9c7e
Changes to light shade color (#444) 2023-07-10 15:40:45 -04:00
Sonicxryan 3258064a7f
Shading (#439) 2023-07-06 16:21:37 -04:00
Dominicentek 809cbc314b
Add lifeCap, coinCap and coinToLife to gLevelValues (#429)
* Add lifeCap, coinCap and coinToLife to gLevelValues

* autogen

* forgor

* renamed the properties
2023-07-04 14:16:07 -07:00
MysterD aeb8817f0d Reduced Lua GC pressure by a lot, reuse cobjects/pointers 2023-06-24 23:43:03 -07:00
Sunk f6a78e0c77
Allow mods to disable romhack camera centering (#423) 2023-06-23 16:58:47 -07:00