Commit Graph

3213 Commits (8d9bc4cb73b3aba4ef873b87d6f2f79183eed385)

Author SHA1 Message Date
MysterD 8d9bc4cb73 Bounds check network_receive_level_spawn_info() 2023-11-07 00:30:22 -08:00
defacube 47be56e1c7 Add support for 16 areas (#502) 2023-11-07 00:29:09 -08:00
MysterD 076dc9f602 Merge branch 'dev' of github.com:sm64ex-coop-dev/sm64ex-coop into dev 2023-11-06 23:29:01 -08:00
MysterD f3323550bd Remove built-in cheats 2023-11-06 23:28:55 -08:00
Sunk 802089f790 Fix timer issue with PSC (#509)
My last PR didn't seem to account for the race timer so now it does
2023-11-06 22:56:05 -08:00
Sunk 375639e849 Fix camera bug introduced by a previous PR (#505)
* Fix camera bug introduced by a previous PR

* Readjust camera collision code
2023-11-05 22:40:05 -08:00
MysterD cec1d3de73 Remove football 2023-11-05 18:43:39 -08:00
MysterD 16e3bf23ec Reran autogen 2023-11-04 21:10:28 -07:00
MysterD 7a7ffaf4d8 Adjustments to 'ChatUpdate-v3' 2023-11-04 21:10:14 -07:00
iZePlayzYT 23903cd5fc [ChatUpdate-v3] Added SentChatMessage-History & Added Chat-Tab-Completion for Commands,Subcommands,Playernames & Added 2 new Start-Parameters (#482)
Added SentChatMessages-History (including navigation)
    Added Tab-Completion for Main-Commands
    Added Tab-Completion for Sub-Commands
    Added Tab-Completion for Player-Names [Now finally fixed and working correctly]
    Improved some english translations
    Improved a lot of german translations
    Fixed a few bugs and bad code regarding "default commands"
    Development started on a new chat command handling system (Not in use yet)
    Fixed some stuff previously noted/criticized by other developers in a previous the code review
    Added new Start-Parameter "--playername PLAYERNAME"
    Added new Start-Parameter "--randomplayername"
2023-11-04 21:05:34 -07:00
Sunk 8d4f657930 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-04 16:59:22 -07:00
Blockyyy 02141b151c 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-04 16:58:07 -07:00
Isaac0-dev 3fd9c8477b loading screen (#495)
* loading screen

* fix compile error

* Fix animation comparisons after character anim commit

* Cleaned up character sound/anim lookup code

* hopefully fix problems with queued mods

* use dj's changes

* fix compile errors due to upstream merge
2023-11-04 16:55:34 -07:00
MysterD 3722958166 Now that sparkle_spawn_star is sync'd normally, no need to send it every frame 2023-10-30 18:22:36 -07:00
Sunk f0bce590b9 Fix stars being in an infinite loop (#496)
* Fix stars being in an infinite loop

* Give syncing a distance

In theory I would no longer need to sync cutscene flags, but it's still worth keeping
2023-10-30 17:43:04 -07:00
Sunk 068aa442fc Update PSC (#499)
* Update personal star counter mod

Decided to modernize this mod by making it more efficient and readable. Added a ton of comments to make it much easier to understand what's going on here.

* Rename mod

* Rename mod just a bit more
2023-10-30 16:06:15 -07:00
U-DESKTOP-F0TJMO2\Utilisateur a48c397fca Fixing smlua_level_util_get_info_from_short_name typing and bug reintroduced by commit 22cbfd7 - Instant Warp Function (#494) 2023-10-30 12:44:41 +01:00
MysterD 1d5488efd3 Change version string from 'v 36' to 'v36' 2023-10-28 00:37:08 -07:00
MysterD 857bb342b7 Made the hang prevention message go to LOG_ERROR instead of stdout 2023-10-28 00:21:18 -07:00
EmeraldLockdown 139fcc1dd2 Native Arm Support for macOS (#492)
Remove the need to use rosetta 2, and now use arm instead.
    Intel macs should still work, although have not been tested (I don't have a intel mac).
    Coopnet and lua have both been tested, and both work.
    I ended up removing the logfile stuff, as 1, it was only used once for mario action hang, and 2, it was causing pointer misalignment on macos arm.
    Discord integration is disabled on arm.
    Compilation now takes 25 seconds instead of a minute and 20
2023-10-28 00:19:00 -07:00
EmeraldLockdown c2f1ed69a0 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 f106a0acbd Fix animation comparisons after character anim commit 2023-10-27 23:45:48 -07:00
MysterD 4293544109 Have camera ignore all of the correct surfaces 2023-10-27 23:32:03 -07:00
MysterD 267cb30769 Bump version to v 36 2023-10-27 19:54:32 -07:00
MysterD dcebdcac0d Prevent pausing in transitions if singleplayer pause is active 2023-10-27 19:54:12 -07:00
MysterD 1c3e3305f6 Fix compile error on Windows 2023-10-27 19:45:53 -07:00
MysterD c840987ba9 Cleaned up character sound/anim lookup code 2023-10-27 18:59:00 -07:00
MysterD 834a7e68c8 Fix compile errors from recent merges 2023-10-27 18:02:04 -07:00
Keeberghrh af60ec4ecb 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 f07f5e5433 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
MysterD ccace962a5 Reran autogen 2023-10-27 03:18:01 -07:00
defacube 22cbfd760e Instant Warp Function (#494)
* Add the function in smlua_level_utils.c

* Add the function in smlua_level_utils.h

* Update smlua_functions_autogen.c
2023-10-27 03:13:47 -07:00
EmeraldLockdown 86bb6aeee0 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
MysterD 30ca5bf018 Eyerok can now get attacked by remote players 2023-10-27 01:03:20 -07:00
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