Commit graph

3171 commits

Author SHA1 Message Date
defacube
a62f7a63f9
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
7a8bffa318
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
46b3167cce
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
62eeb01b4b
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
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
Emerald Lockdown
e2e34eb914
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
96616ba315
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
5ec85180ec
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
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
Sunk
780ffb8cba
Hopefully fix purple switches expanding infinitely (#470) 2023-09-11 18:37:18 +02:00
Sunk
628dbfed75
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
df7e469016
Fix not being able to talk to doors twice (#458) 2023-08-18 19:25:39 +02:00
PeachyPeach
31c2e23c48
allocate_mario_action fix and improvement (#453) 2023-08-18 18:55:39 +02:00
PeachyPeach
610bdfcf04
fix C string typing (#459) 2023-08-18 18:31:59 +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
Agent X
ddde827f85
Remove joke star from PSC (#438) 2023-07-05 18:12:41 -04:00
Dark
dda8f6d0c3
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
c3fba60a2b
Waluigi model update (#435)
Fixed mistake in model.inc.c
2023-07-04 16:24:20 -07:00
FluffaLuigi
2a52b4af4e
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
b13d6fd3f1
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
53f5783193
Updated Waluigi's Model (#430)
Consistency with FluffaLuigi's emblem updates.
2023-07-04 14:16:34 -07: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
Emerald Lockdown
4210312a6a
Improve menu levels (#401)
* Fix menu stuff

* Revert other change

* Whoops
2023-07-04 14:12:21 -07:00
MysterD
70d551ab82 Clear texture 1 on level init (fixes corrupt level textures) 2023-06-27 15:38:08 -07:00
MysterD
7f79099ef1 Double the amount of max simultaneous notes 2023-06-27 00:51:58 -07:00
MysterD
622efdcbcd Remove flamethrower lol 2023-06-25 17:54:26 -07:00
MysterD
3456e10216 Sanity check collisions, and increase efficiency of growingpool 2023-06-25 17:54:01 -07:00
MysterD
aeb8817f0d Reduced Lua GC pressure by a lot, reuse cobjects/pointers 2023-06-24 23:43:03 -07:00
MysterD
aaa23a8394 lol whoops 2023-06-24 17:54:26 -07:00
MysterD
b56b591c68 Disable 'custom packets', a relic from patches 2023-06-24 17:49:41 -07:00
MysterD
0bb8d6b5cd Revert Lua GC settings to defaults 2023-06-24 17:49:19 -07:00
MysterD
f06d75017c Fix warnings 2023-06-24 13:57:32 -07:00
MysterD
def597ee7d Merge branch 'dev' of github.com:sm64ex-coop-dev/sm64ex-coop into dev 2023-06-24 13:53:16 -07:00
MysterD
b93c5e2ff1 Fixed vanilla sounds on 32-bit 2023-06-24 13:48:44 -07:00
MysterD
2a809f2bdc Change cobject allowlist to C++ maps 2023-06-24 01:44:01 -07:00
Sunk
f6a78e0c77
Allow mods to disable romhack camera centering (#423) 2023-06-23 16:58:47 -07:00
Sunk
a2dc56e1ac
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
djoslin
e3386d6622 Update for MacOS 2023-06-23 16:40:46 -07:00
MysterD
56ec000839 Arena - make flag holders have normal speed when spring launching 2023-06-23 15:58:54 -07:00
MysterD
52c1e50e10 Init dynos packs after djui is created 2023-06-23 14:26:04 -07:00
MysterD
be19fbaf15 Show who spawns what in in-game console 2023-06-23 13:08:19 -07:00
MysterD
2684b223a2 Update libcoopnet on windows, fix windows error 2023-06-23 11:28:07 -07:00
MysterD
ad91385e2b Prevent dropping items on non-stop star pickup 2023-06-22 23:48:12 -07:00
MysterD
319f8292f7 Fix camera stuttering when opening door 2023-06-22 23:39:37 -07:00
MysterD
2bf43b5b2e Slight tweak to fixCollisionBugsPickBestWall 2023-06-22 22:02:48 -07:00