Commit Graph

3179 Commits (f7f10b98812d35047f490cf664f410a8999a187c)

Author SHA1 Message Date
MysterD f7f10b9881 Ran autogen 2023-10-26 17:15:01 -07:00
MysterD 5925d4cc0e Allow pausing in most circumstances 2023-10-26 17:07:27 -07:00
MysterD f05c147d92 Force hidden 1up triggers to be invisible and E_MODEL_NONE 2023-10-26 16:53:50 -07:00
MysterD 52727ee4bb Force broken romhack port missing skyboxes to BACKGROUND_HAUNTED 2023-10-26 16:09:36 -07:00
MysterD 0f60e3fe95 Add support for the missing dialog text characters for romhacks 2023-10-26 16:09:13 -07:00
MysterD 07a6672169 Add a 1 second window to prevent a warp from instantly warping you back (a workaround for broken romhack ports) 2023-10-26 16:08:43 -07:00
flipflop bell 00716ec9ba 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
defacube 1973b59551 Fix Ukiki and Koopa the Quick crashing the game (#481)
* Fix KTQ Crash

* Fix Ukiki Crash

* Just mark ukiki for deletion instead

* Add a return;
2023-10-20 18:20:26 +02:00
defacube dde0991843 Fix crashes when pausing in certain invalid acts of levels (e.g. act 65400 of TTM) (#480)
* Fix crashes when pausing in certain invalid acts of levels (e.g. act 65400 of TTM)

* Cap the player's act number at ?-6 (unless the number is 99)

* Removed the original changes (because they're useless)

* Remove the old changes again

* Use PeachyPeach's suggestion

* Remove useless include

* Update ingame_menu.c
2023-10-20 18:19:52 +02:00
xLuigiGamerx 9ca0ba8c39 Fixing up the glyphs and changing some things (#479)
* Readded version checks, added some extra symbols and changed print.c and print.h a bit, also changed all characters head icons. And made ~ into multiply and ^ into key (no longer beta key) and remade all beta textures for all versions.

* Changed the Q to q in the custom hud font

* Added mathematical symbols

* Turns out there are ? in other versions and there was a jp check stopping us from using it and I am dumb

* No more funny comments

* No more print.c funny comments

* Fixed accidentally screwed up coin counter

---------

Co-authored-by: xLuigiGamerx <mohammmedsadawi666@gmail.com>
2023-10-20 18:19:21 +02:00
xLuigiGamerx 5a1370fb14 Playerlist Improvements and Username Character Limit Increase (#476)
* xLuigiGamerxsDevFork

* xLuigiGamerxsDevFork

* Fixed Accidentally used older character.c file

* Modified the playerlist so that it can support more than 16 players if it is to be added and increased the username character limit from 20 to 60 so people with longer names can use hex codes

* Changed the Makefile back

* Just Fixing up the makefile which for some reason changed

* Fr this time I hopefully fixed the Makefile

* Bruh why did this even change it's fucking annoying

* Modified the playerlist so that it can support more than 16 players if it is to be added and increased the username character limit from 20 to 60 so people with longer names can use hex codes (Removed Whitespace lol)

* Modified the playerlist so that it can support more than 16 players if it is to be added and increased the username character limit from 20 to 60 so people with longer names can use hex codes (Removed Whitespace V2 lol)

* Used MAX_PLAYER_STRING instead of a number

* Apparently math.h wasn't needed

* Me when I use google translate only for it to fuck up french:

* Used MAX_PLAYER_STRING and removed ceils and removed multiplicaion by sPlayerListSize

* Added comment for p variable

* Removed 16

* Update djui_panel_playerlist.c

---------

Co-authored-by: xLuigiGamerx <mohammmedsadawi666@gmail.com>
Co-authored-by: PeachyPeach <72323920+PeachyPeachSM64@users.noreply.github.com>
2023-10-20 18:16:49 +02:00
Sunk 518f582ed2 Fix stars not respawning + other syncing fixes (#460)
* Force secret stars to respawn

Hacky fix for sure. I'll need to see how to deal with this in a better way.

* Improve star syncing

All stars now respawn (hopefully) and the red coin star no longer repeatedly respawns.
Also forced oSyncDeath for other objects.

* Remove leftover include

* (Probably) improve star syncing

It'll still spam packets but at least it'll only spam packets to people who are able to receive them

* Revert "(Probably) improve star syncing"

This reverts commit 86ff2c5451cff0a06e8c3410b2815e12b414f264.

* Weird sync

No idea why this works but it does. At least no fields have to be synced over, as far as I can tell.
2023-10-20 18:10:43 +02:00
Sunk 718be07a79 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
Emerald Lockdown 23c7e0fbc8 Bunch of macOS related changes (#467)
* Fix macOS Sonoma Linker Error

* Just redo the entire app thing

* Make icon .icns instead and make sizing more accurate
2023-09-13 03:08:52 -07:00
Cooliokid956 76989faabf offset djui power meter textures (#465)
the functions were missing the offset present in the original, so i've gone ahead and added it here
2023-09-13 03:05:22 -07:00
xLuigiGamerx 24d8566923 Adding the missing colorful letters (q, v, x, z). (#464)
* xLuigiGamerxsDevFork

* xLuigiGamerxsDevFork

* Fixed Accidentally used older character.c file

---------

Co-authored-by: xLuigiGamerx <mohammmedsadawi666@gmail.com>
2023-09-13 03:04:30 -07:00
Sunk cf1db4c86b 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
Sunk aafa8a58da Hopefully fix purple switches expanding infinitely (#470) 2023-09-11 18:37:18 +02:00
Sunk 461ccf68f9 Allow extended moveset to be fully disabled and improved performance (#461)
* Allow extended moveset to be fully disabled and improved performance
2023-08-27 20:18:08 +02:00
Sunk a976077697 Fix not being able to talk to doors twice (#458) 2023-08-18 19:25:39 +02:00
PeachyPeach cdc1b30c6f allocate_mario_action fix and improvement (#453) 2023-08-18 18:55:39 +02:00
PeachyPeach 930d225b5e fix C string typing (#459) 2023-08-18 18:31:59 +02:00
Sunk af2a80007a 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 e97f8e6632 Add gLevelValues.bubbleOnDeathBarrierInCapStages (#449)
Also add a few smaller fixes with bubbles
2023-07-18 18:01:05 -04:00
Sunk 2c4ff40a23 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 6945b4729e Mod Storage C++ (#448)
* Mod Storage C++

* Implement Peachy's suggestions.

Thank you Peachy.
2023-07-18 17:52:11 -04:00
Agent X 5c5e7430cd Changes to light shade color (#444) 2023-07-10 15:40:45 -04:00
Sonicxryan 2f949a3250 Shading (#439) 2023-07-06 16:21:37 -04:00
Agent X b4b65ea4fc Remove joke star from PSC (#438) 2023-07-05 18:12:41 -04:00
Dark 15ea01d241 audio: increase max simultaneous notes (#437)
We go with a very generous amount here to ensure that we basically never
reach the limit. A few fixes were also made in load.c to catch any
segfaults in case someone decides to increase the limit even further.
2023-07-05 12:01:42 -07:00
Sonicxryan 19be94168d Waluigi model update (#435)
Fixed mistake in model.inc.c
2023-07-04 16:24:20 -07:00
FluffaLuigi dc8d11c5be Update Mario, Luigi and Wario's Models (#434)
Updated Luigi and Wario's models to their latest revision.
Mario, Luigi and Wario's sideburns now match the color of the rest of their hair with the player's palette.
Mario and Luigi's Logos were made into IA16 textures and are now shaded to look a bit better with the rest of the cap.
Cap inside was made a darker variant of the regular cap color across both the held and item caps.
Fixed an oversight with the cap wings, though mostly so that they're more consistent.
Removed Mario's unused model data since none of it is ever getting used as far as I'm aware.
2023-07-04 16:23:34 -07:00
Skeltan 62144aa5cd Updated characters.c (#431)
Remaking this pull request because I realized I cloned the wrong branch so commits were messed up

Thanks DYosh for reminding me about Fire Wario and Fire Waluigi
Updated those 2 palettes to match the recently changed Wario and Waluigi palettes
new-palettes

Also made Waluigi's Overalls a bit darker to correspond the N64 model and render
2023-07-04 14:17:17 -07:00
Sonicxryan 3730a80f6a Updated Waluigi's Model (#430)
Consistency with FluffaLuigi's emblem updates.
2023-07-04 14:16:34 -07:00
Dominicentek 041e7ef6ef 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
Emerald Lockdown 6ee029e16f Improve menu levels (#401)
* Fix menu stuff

* Revert other change

* Whoops
2023-07-04 14:12:21 -07:00
MysterD db77e38c0d Clear texture 1 on level init (fixes corrupt level textures) 2023-06-27 15:38:08 -07:00
MysterD ba02695d89 Double the amount of max simultaneous notes 2023-06-27 00:51:58 -07:00
MysterD 8c17d89384 Remove flamethrower lol 2023-06-25 17:54:26 -07:00
MysterD 628353988e Sanity check collisions, and increase efficiency of growingpool 2023-06-25 17:54:01 -07:00
MysterD 2dfc081469 Reduced Lua GC pressure by a lot, reuse cobjects/pointers 2023-06-24 23:43:03 -07:00
MysterD 0e888217b0 lol whoops 2023-06-24 17:54:26 -07:00
MysterD 7050bf4e65 Disable 'custom packets', a relic from patches 2023-06-24 17:49:41 -07:00
MysterD b1514cd2ee Revert Lua GC settings to defaults 2023-06-24 17:49:19 -07:00
MysterD 2cc0fe338a Fix warnings 2023-06-24 13:57:32 -07:00
MysterD dd0d8bc49f Merge branch 'dev' of github.com:sm64ex-coop-dev/sm64ex-coop into dev 2023-06-24 13:53:16 -07:00
MysterD 09a50f7b58 Fixed vanilla sounds on 32-bit 2023-06-24 13:48:44 -07:00
MysterD 9d3676f7cb Change cobject allowlist to C++ maps 2023-06-24 01:44:01 -07:00
Sunk 243bddf634 Allow mods to disable romhack camera centering (#423) 2023-06-23 16:58:47 -07:00
Sunk eba3cdd7bc Add toggle to extended moveset using chat commands (#421)
* 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.
2023-06-23 16:45:24 -07:00