Commit graph

2768 commits

Author SHA1 Message Date
U-DESKTOP-F0TJMO2\Utilisateur
76271c2118 Fix fire piranha plant out of bounds read when behavior params > 0x00010000 2023-11-21 17:14:25 -05:00
U-DESKTOP-F0TJMO2\Utilisateur
c75ec7c946 Fix pause menus 2023-11-21 17:14:25 -05:00
Isaac0-dev
2c0b112cba more fixes and dynos cleanup (#520)
- fix paginated panels when a page doesn't exist anymore
- fix colored mod names carrying over to other mod names in lobby mod lists
- even more dynos cleanup
    - remove unused code
    - more clean up for dynos levels code (mostly just better code layout)
2023-11-21 17:14:25 -05:00
David Joslin
d1ffab4219 Have the loading screen indicate when it's generating texture/model packs 2023-11-21 17:14:25 -05:00
David Joslin
d6b3f3660d Tweak loading screen visuals, indicate which mod is being loaded 2023-11-21 17:14:23 -05:00
David Joslin
c5a3a6cf32 Made fire palettes non-beige again 2023-11-21 17:02:13 -05:00
David Joslin
da95b3febe Fixed manta ring spawning and likely other object desync bugs 2023-11-21 17:02:13 -05:00
David Joslin
520cff93d9 Prevented rendering of disconnected mirror marios 2023-11-21 17:02:13 -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
Isaac0-dev
156cca9607 fix course naming again (#515)
* fix course naming again

whoops that was my fault (hopefully for the last time)

* +1 course index in pause_castle_get_stars
2023-11-21 16:41:04 -05:00
David Joslin
e3fc8e92a4 Fixed 100 coin star in act select
It will appear in act selection again
Sanity checked 'score' so that if the 100 coin star was collected, it will return at least 100
2023-11-21 16:41:04 -05:00
Agent X
092a5fab32 Make chat & console disallow mouse look 2023-11-19 22:24:07 -05:00
Agent X
706f6ab1f8 Oops, fix silly mistake 2023-11-19 19:41:49 -05:00
Agent X
508ad40e44 Change output name to sm64coopdx & clean up a bit 2023-11-19 19:38:26 -05:00
Agent X
3158b5f741 Declutter DJUI pause menu 2023-11-18 15:56:44 -05:00
Agent X
b552b9a8b3 Move first_person_update() call 2023-11-18 15:00:03 -05:00
Agent X
72c58f722e Prevent some mod init related lua crashes 2023-11-17 19:55:20 -05:00
Agent X
5fd6d685d7 Only call WAPI.delay if no network launch args 2023-11-17 19:47:07 -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
defacube
5767ae985f Fix going OOB sometimes crashing the game (#517)
* Fixed going OOB sometimes crashing the game

* Avoid nested if statements

* Update camera.c

---------

Co-authored-by: PeachyPeach <72323920+PeachyPeachSM64@users.noreply.github.com>
2023-11-17 18:27:54 -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
Agent X
1cb69df30f Revert DJUI button height change 2023-11-16 17:43:57 -05:00
FluffaMario
7764597a6e Almost forgot this, whoops! 2023-11-15 19:06:37 -06:00
Agent X
345bf8af50 Expand DJUI elements a little so text fits better 2023-11-14 21:50:35 -05:00
Agent X
dd3b39739e Continue making DJUI text use DCDCDC instead of C8C8C8 for consistency 2023-11-14 21:49:41 -05:00
David Joslin
2ac0c9079d Fix allowing any layer in the mirror 2023-11-14 20:41:26 -05:00
David Joslin
d9829fac08 Add support for any layer in mirror 2023-11-14 20:41:23 -05: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
Agent X
8eb0babc07 Fix my bug in common_air_action_step 2023-11-14 17:55:52 -05:00
FluffaMario
ab4b797ff8 Updated Mario, Added code for mirror culling. 2023-11-14 00:34:13 -06:00
Agent X
3a55baa6a8 Allow First Person in credits 2023-11-13 19:11:18 -05:00
Agent X
8110c83891 File Select Theme 2023-11-13 12:16:49 -05:00
Agent X
b6d1a8a706 Bouncy Level Bounds server option 2023-11-13 08:27:20 -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
caf2f3233c ACTUALLY fix free cam offset + other fixes 2023-11-12 12:42:39 -05:00
Agent X
4df5037399 April Fools 2023-11-12 09:59:04 -05:00
Agent X
5b306b2a17 Fix free cam being offset by instant warps 2023-11-12 09:53:27 -05:00
Agent X
ce987ef3dd Add first person functions to Lua 2023-11-12 09:53:08 -05:00
Agent X
ac24f5878e Consistent word casing in info panel 2023-11-11 21:03:29 -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
11864d9018 Establish sm64coopdx versioning 2023-11-11 13:02:23 -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
8e5ffe9467 Fixed crash in obj_is_in_view() 2023-11-09 17:18:04 -05:00
Agent X
3227d17266 Change how console scaling works 2023-11-09 16:56:33 -05:00
eros71-dev
ff79711fb8 Fix djui_panel_host_settings.c includes
Added the missing pc/pc_main.h include that prevented it from compiling because of the "undeclared" gCoopCompatibility
2023-11-09 17:46:08 +01:00
David Joslin
732c646d0c Cleanup from Isaac 2023-11-08 20:03:46 -05:00
David Joslin
e8e22197a8 Made console scale to window height 2023-11-08 20:03:44 -05:00
David Joslin
17e5a81dde Fix crash in djui_inputbox_on_text_input() 2023-11-08 19:58:32 -05:00
David Joslin
c6be02e042 Fixed crash in djui_panel_join_lobbies_create() 2023-11-08 19:58:32 -05:00
David Joslin
7e7f6067a9 Fixed crash in uv_update_scroll() 2023-11-08 19:58:32 -05:00
David Joslin
4fcc1ac26c Fix crash in build_synthetic_wave() 2023-11-08 19:58:32 -05:00
David Joslin
66a1dd36ae Fixed crash in ordered packets 2023-11-08 19:58:32 -05:00
David Joslin
d824e77cf5 Fixed crash in generate_parent_id() 2023-11-08 19:58:32 -05:00
David Joslin
c63ac1655d Fix crash in network_send_to() 2023-11-08 19:58:31 -05:00
David Joslin
36ebb8affe Fix crash in move_into_c_up() 2023-11-08 19:58:29 -05:00
David Joslin
d25ae5a130 Fix crash in init_level() 2023-11-08 19:55:31 -05:00
David Joslin
61fa9faf2e Remove tas controller 2023-11-08 19:55:31 -05:00
David Joslin
d0e6b7a1f6 Fixed crash in djui_unicode_get_base_char() 2023-11-08 19:55:31 -05:00
David Joslin
522d7c0373 Fixed crash in import_texture_*() 2023-11-08 19:55:31 -05:00
David Joslin
9b23b7dab4 Fixed crash in act_dile() 2023-11-08 19:55:31 -05:00
David Joslin
c7edf85ad9 Fix crash in tox_box_move() 2023-11-08 19:55:28 -05:00
David Joslin
6378681e96 Fixed crash in find_mario_floor_and_ceil() 2023-11-08 19:53:36 -05:00
David Joslin
c21aa2d85f Fixed crash in warp_credits 2023-11-08 19:53:36 -05:00
David Joslin
750b9a8730 Added bounds checking to gActiveMods.entries[] 2023-11-08 19:53:36 -05:00
David Joslin
10aedbfd97 Adjustments to ping and resend rate to reduce packet spam 2023-11-08 19:53:36 -05:00
David Joslin
9d5422f2d8 Log global popup messages in console 2023-11-08 19:53:30 -05:00
MysterD
081a7fd9dc Added HOOK_ON_RENDER_BEHIND, deprecated djui_hud_set_render_behind_hud() 2023-11-08 19:53:27 -05:00
MysterD
1f54996d47 Fix bounds checking of course/act name replacement 2023-11-08 19:50:55 -05:00
Isaac0-dev
cece41f1a8 fix new course/act name replacement system (#506)
* fix new course/act name replacement system

* check array bounds

* fix small oversight from an older pr

* whoops, forgot this
2023-11-08 19:50:55 -05:00
MysterD
0727ce0a21 Made soft-resetting of the camera no longer change camera position 2023-11-08 19:50:55 -05:00
David Joslin
27df58b4f0 Made sure to update 'statusForCamera' whenever we soft_reset_camera() 2023-11-08 19:50:55 -05:00
David Joslin
362c31fe94 Fix controller reading 2023-11-08 19:50:51 -05:00
David Joslin
74ea705f8b Bounds check network_receive_level_spawn_info() 2023-11-08 19:48:09 -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
Sunk
d3c14ce038 Fix camera bug introduced by a previous PR (#505)
* Fix camera bug introduced by a previous PR

* Readjust camera collision code
2023-11-08 19:47:40 -05:00
Agent X
7343c019af Update info panel 2023-11-07 16:48:57 -05:00
Agent X
f58127a0bc Update loading screen 2023-11-06 18:51:08 -05:00
Agent X
521b0ab7a9 DynOS Skyboxes 2023-11-06 18:37:02 -05:00
Agent X
1a7a75bda3 Fix merge conflicts 2023-11-06 15:52:33 -05:00
David Joslin
8852fe16dd Reran autogen 2023-11-06 15:04:47 -05:00
David Joslin
aa7859c9a0 Adjustments to 'ChatUpdate-v3' 2023-11-06 15:04:44 -05:00
iZePlayzYT
32b54fac9b [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-06 15:04:20 -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
Isaac0-dev
b12b479d70 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-06 14:59:17 -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
a4cb43bbb9 Tear out External Data and make Free Cam always compile 2023-11-01 20:17:55 -04:00
David Joslin
4ecbca1473 Now that sparkle_spawn_star is sync'd normally, no need to send it every frame 2023-10-31 14:54:09 -04:00
Sunk
55d786d9f5 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-31 14:53:59 -04:00
Agent X
6d1f1cb776 Fix main menu intro cutscene pipe 2023-10-30 19:16:16 -04:00
Agent X
7131a80167 Fix interpolation compile warning 2023-10-30 19:00:16 -04:00
Agent X
a6d456fed7 Add Disconnect Key (F2) 2023-10-30 19:00:08 -04:00
U-DESKTOP-F0TJMO2\Utilisateur
0b53dbcdbd Fixing smlua_level_util_get_info_from_short_name typing and bug reintroduced by commit cc4f4e9 - Instant Warp Function (#494) 2023-10-30 17:53:03 -04:00
Agent X
f4b08ddf52 Revert new pressed_pause behavior 2023-10-30 17:37:20 -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
0d7476d7ab Change version string from 'v 36' to 'v36' 2023-10-28 00:37:08 -07: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
bd17129398
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
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
David Joslin
048f4f1fd4 Fix animation comparisons after character anim commit 2023-10-27 23:45:48 -07:00
David Joslin
b28fd30b43 Have camera ignore all of the correct surfaces 2023-10-27 23:32:03 -07:00
David Joslin
07a0c199de Bump version to v 36 2023-10-27 19:54:32 -07:00
David Joslin
d0825d1122 Prevent pausing in transitions if singleplayer pause is active 2023-10-27 19:54:12 -07:00
David Joslin
15f4d252bd Fix compile error on Windows 2023-10-27 19:45:53 -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
defacube
cc4f4e9815
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
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
David Joslin
19f878e858 Allow pausing in most circumstances 2023-10-26 17:07:27 -07:00
David Joslin
3cd9b60f87 Force hidden 1up triggers to be invisible and E_MODEL_NONE 2023-10-26 16:53:50 -07:00
David Joslin
99ad09cfd3 Force broken romhack port missing skyboxes to BACKGROUND_HAUNTED 2023-10-26 16:09:36 -07:00
David Joslin
3e727d6362 Add support for the missing dialog text characters for romhacks 2023-10-26 16:09:13 -07:00
David Joslin
48d517ab0d 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
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
defacube
40fe8ef649
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
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
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
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
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
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
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
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
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
djoslin
e3386d6622 Update for MacOS 2023-06-23 16:40:46 -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
MysterD
2842803362 Added gLevelValues.fixCollisionBugsPickBestWall 2023-06-22 20:18:10 -07:00
MysterD
3fa5823578 Properly determine the correct wall between multiple, turn off rounded corners in the air 2023-06-22 20:00:43 -07:00
MysterD
2ad4cfceaa Small scrolling texture fix 2023-06-22 18:47:10 -07:00
MysterD
c7a557d870 Add gLevelValues.fixCollisionBugsGroundPoundBonks 2023-06-22 11:40:59 -07:00
Agent X
3f60869fcb
Add the ability to change lighting color (#420)
* Add the ability to change lighting color

Well it's actually multiplying the lighting color and not changing it completely but I think it's better that way.

* Consistency
2023-06-22 11:28:17 -07:00
MysterD
ec876be1b5 Fix romhack cam bug 2023-06-22 11:21:13 -07:00
MysterD
c92b62fe58 Enable romhack cam by default when in a non-vanilla level 2023-06-22 02:12:57 -07:00
MysterD
c82e45c0a0 Add level script pointer validation 2023-06-22 01:13:38 -07:00
MysterD
ef86423f2a Disable some level-specific camera code when in a romhack level 2023-06-21 19:38:30 -07:00
MysterD
7136a06dba Prevent bubble popping on dying players, prevent collision on recently unbubbled 2023-06-21 19:08:39 -07:00
MysterD
f013f0b10b Remove ground pound bonks when fix collision bugs is enabled 2023-06-21 18:29:30 -07:00
Dominicentek
2629381971
Customizable dialogs (#411)
* add customizable dialogs

* remove testing mod

* add HOOK_ON_DIALOG

* Reset dialog overrides in `network_shutdown`

It may have compile errors idk editing code on phone sucks

* typo smh

* copy over the file from original repo so this fork can be synced

* run autogen again

* actually im stupid
2023-06-18 20:04:39 -07:00
Agent X
f1990c618e
Add tons of new save file / star related functions (#419)
These were needed to port interact_star_or_key to Lua but are also just good to have exposed IMO.
2023-06-18 20:04:02 -07:00
MysterD
b3eff990ae Re-ran autogen 2023-06-18 12:28:26 -07:00
MysterD
ec09ac67c9 Merge branch 'dev' of github.com:sm64ex-coop-dev/sm64ex-coop into dev 2023-06-18 12:28:07 -07:00
MysterD
ef66a18fc2 Update Linux coopnet 2023-06-18 12:27:57 -07:00
MysterD
1409ba829b Reduced player particle spam 2023-06-16 19:25:48 -07:00
MysterD
2b80d6480b Switched SSL moving pyramid wall to timer syncing 2023-06-16 18:26:14 -07:00
MysterD
ccfb46043b Fixed character anim offsets during certain dialog boxes 2023-06-16 18:09:23 -07:00
MysterD
9e0e2be194 Made player-to-player collisions respect the intangible flag 2023-06-16 17:53:04 -07:00
MysterD
d1bd8f1bfb Fix monty moles in Star Road 2023-06-16 17:39:50 -07:00
MysterD
feee5eb569 Fixed more memory corruption with object collisions 2023-06-16 17:19:18 -07:00
MysterD
b3cae34234 Add bounds checking to instant warps, and make object collisions dynamic
in size
2023-06-15 20:50:12 -07:00
MysterD
488ef1c6d2 Added collision_get_temp_wall_collision_data() to Lua 2023-06-15 19:55:55 -07:00
MysterD
c594179cca Make surface pools infinite 2023-06-15 19:40:34 -07:00
MysterD
69f16bebb5 Separate fog from vertex alpha so lightmaps can render it 2023-06-15 01:01:39 -07:00
MysterD
d22961e863 Merge branch 'dev' of github.com:sm64ex-coop-dev/sm64ex-coop into dev 2023-06-14 23:25:09 -07:00
MysterD
2a5a4607a8 Update lang files 2023-06-14 23:25:04 -07:00
MysterD
ab10fad09f Fix noise rendering for dx' 2023-06-14 23:04:28 -07:00
MysterD
529058ad77 Add support for noise in color combiners 2023-06-14 22:04:55 -07:00
MysterD
f35a6621dc Update win64 coopnet 2023-06-14 01:38:19 -07:00
MysterD
61b72ae1ee Allow object sounds to fade out to 0 2023-06-12 02:20:58 -07:00
MysterD
f04be96225 Cleanup 2023-06-11 14:41:14 -07:00
PeachyPeach
175dbada5a
Various checks for binary lua files (#397)
* various checks for binary lua files

* endianness
2023-06-11 14:36:15 -07:00
Emerald Lockdown
2fc3d7fee9
Fix lua packet's index always being 0 (#405) 2023-06-11 14:35:41 -07:00
MysterD
880ba52e05 Disabled printing of gfx_cc_print() 2023-06-11 14:33:18 -07:00
Agent X
74847919be
Extend mod name max length from 32 to 64 (#408)
I remember it being more than 32 at some point but I could be wrong, I'm making this PR so color codes can be better utilized in names without hitting the max limit so quickly.
2023-06-11 14:30:43 -07:00
MysterD
3a85b7051e Cleanup 2023-06-11 14:25:28 -07:00
Sunk
a0ff975ec8
Re-introduce a few vanilla bugs under gBehaviorValues (#413)
* Properly set Mario's y vel to 0 on popping

* 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.
2023-06-11 14:24:13 -07:00
MysterD
def1122159 Allow toggling the false ledge grab fix 2023-06-11 13:00:11 -07:00
MysterD
cc1ca691ad Fix false ledge grabs when fixCollisionBugs is on 2023-06-10 16:21:40 -07:00
MysterD
91b6514d8a Make OpenGL lightmap overexposure simpler 2023-06-10 15:33:59 -07:00
MysterD
6207f3ea01 Fixed directx compiles 2023-06-10 04:34:42 -07:00
MysterD
c2a40b1564 Adjust light map rendering to allow for over-exposure 2023-06-09 21:18:49 -07:00
MysterD
533cb2c8da Increase visible lobbies-per-page to 10 2023-06-05 15:53:34 -07:00
MysterD
8367e7d6ee Make DirectX call discord_update() 2023-06-05 15:36:22 -07:00
MysterD
1ad83bd004 Display chat messages in console 2023-06-05 15:34:08 -07:00
MysterD
c07c80f5ef Fix weird camera state when vanilla c-up cam is interrupted 2023-06-03 02:17:53 -07:00
MysterD
d73d8e97bd Made the player bubble faster 2023-06-03 02:00:20 -07:00
MysterD
40dfbb7589 Fix crashes and errors when exit-to-castle isn't set properly 2023-06-03 01:50:41 -07:00
MysterD
efba660738 Seeded smlua's random functions by default 2023-06-02 22:10:54 -07:00
MysterD
0a41cc70e9 Buffed basic pvp attacks 2023-06-02 22:04:22 -07:00
Isaac0-dev
05f4c42f81
add cancels to HOOK_BEFORE_PHYS_STEP allowing for custom step systems (#400)
* add cancels to HOOK_BEFORE_PHYS_STEP allowing for custom step systems

* give lua mods access to stepArg and nextPos from hanging and air step; fix a crash when m.floor is null
2023-05-31 21:10:06 -07:00
MysterD
aaaf59e1e4 Fix djui_popup_create_global() 2023-05-31 21:07:41 -07:00
Emerald Lockdown
3e52c4f5db
djui_popup_create_global (#402)
* Add djui_popup_create_global
2023-05-31 21:05:07 -07:00
MysterD
929b10995c Allow other mods to add levels to arena 2023-05-31 16:56:57 -07:00
MysterD
e70ed3ed2b Added lightmaps to arena, slight balance tweaks 2023-05-31 00:34:38 -07:00
MysterD
ac6fa1cd32 Made camera interpolation more seamless on warp 2023-05-30 19:36:40 -07:00
Dominicentek
3a89ffa267
Add Czech translation (#398)
* Add Czech translation

* Add glyphs to font files

* Register Czech glyphs to djui_unicode.c
2023-05-25 22:03:40 -07:00
MysterD
7ff1622745 Added last remote object information to crash screen 2023-05-22 23:00:11 -07:00
MysterD
1dd70283da Fixed bounds checks in save_file_is_cannon_unlocked() 2023-05-20 20:07:17 -07:00
Dominicentek
9a065ffced
Expose save_file_is_cannon_unlocked to smlua (#395)
* Update convert_functions.py

* Update save_file.c

* Update save_file.h

* Update cannon_door.inc.c
2023-05-20 20:06:15 -07:00
Prince Frizzy
1e5c2f2aa1
Fix bug with audio running of out sequence channels for the Sppedrun Timer mod. (#396) 2023-05-20 20:05:06 -07:00
MysterD
d043fdd22d Added in-game console for DynOS and Lua errors 2023-05-19 04:20:08 -07:00
MysterD
75861d365e Add backwards compatibility to ground pound checks 2023-05-19 01:37:52 -07:00
MysterD
cf7d4bc8d2 Prevent deduplication of area models - it would overwrite the areaIndex 2023-05-18 21:29:57 -07:00
MysterD
b0408a1379 Fix some bugs found in testing 2023-05-18 17:54:29 -07:00
MysterD
41a4fcf516 Keep animations in-bounds 2023-05-18 12:42:18 -07:00
MysterD
ddd2f19ca1 Fix more memory errors 2023-05-18 01:57:36 -07:00
MysterD
87f076cd26 Fix sync of models on late join 2023-05-17 23:32:39 -07:00
MysterD
f53ffcd491 Keep the previous dynamic pool in memory
Due to sm64 weirdness, I can't reliably free memory at certain points
The hacky solution is to keep the previous dynamic pool in memory,
essentially requiring two frees to actually clear all memory from it
2023-05-17 22:33:14 -07:00
MysterD
136ac0d84c Fix crash in packet_spawn_star 2023-05-17 17:48:54 -07:00
MysterD
0a224396ef Make pageup/pagedown in the chat box better 2023-05-17 12:12:29 -07:00
MysterD
4c0a226536 Fix improper culling of mirrored player models 2023-05-17 12:00:22 -07:00
MysterD
5d98a20e76 Fixed custom animations in the mirror 2023-05-17 11:59:40 -07:00
MysterD
93020c04e5 Prevent broken mods from messing up the sync table of others 2023-05-17 00:01:09 -07:00
MysterD
2dde74b4b6 Fix warnings 2023-05-16 22:17:43 -07:00
MysterD
18bf5847a2 Prevent rending of corrupted graphnodes, only run lua GC once per frame 2023-05-16 21:49:13 -07:00
MysterD
ab585db973 Prevent lua mods from saving over your camera settings 2023-05-16 02:03:49 -07:00
MysterD
00e64fbf6c Add backwards compatibility for cur_obj_is_mario_ground_pounding_platform() 2023-05-16 00:37:30 -07:00
MysterD
fa88a5aee0 Make certain GraphNodeObject fields mutable again 2023-05-16 00:05:26 -07:00
MysterD
688cd3b399 Rewrite how models are loaded and retrieved... yet again 2023-05-16 00:01:10 -07:00
MysterD
60d70d0d38 Fix several more possible crashes from the Lua API 2023-05-15 15:55:16 -07:00
MysterD
ed163203d8 Make gEnvironmentRegions safer 2023-05-15 12:04:07 -07:00
MysterD
2eb2b8c18f Make GraphNode flags mutable from lua again 2023-05-15 01:19:10 -07:00
MysterD
2083242b66 Fixed several crashes and errors found in static analysis 2023-05-15 01:15:20 -07:00
Agent X
55dc1b6403
Reset paintings on network shutdown (#393) 2023-05-14 19:15:25 -07:00
MysterD
05592d524b Add wide character support to language file handling 2023-05-14 18:33:14 -07:00
MysterD
9a99ee492e Fix crash in retrieve_animation_index() 2023-05-14 12:30:55 -07:00
MysterD
c159fabeb7 Fix crash in execute_mario_action() 2023-05-14 12:28:31 -07:00
MysterD
5598ac95e7 Merge branch 'dev' of github.com:sm64ex-coop-dev/sm64ex-coop into dev 2023-05-14 12:12:30 -07:00
MysterD
064a60526a Redo how surface memory is handled 2023-05-14 12:04:08 -07:00
MysterD
94aa0796d9 Fix more possible crashes in object_helpers.c 2023-05-14 10:13:32 -07:00
MysterD
c3b82a811a Re-enable mirror rendering 2023-05-13 03:39:53 -07:00
MysterD
12e533c2a9 Fix bug where secret stars stopped being counted 2023-05-13 03:29:24 -07:00
MysterD
8129ab7665 Prevent crashes and hangs 2023-05-13 03:07:20 -07:00
MysterD
d74a67ee10 Cleanup memory/memory_dynamic files 2023-05-13 02:01:46 -07:00
MysterD
bbdf51bc33 Remove the main pool 2023-05-13 01:49:54 -07:00
MysterD
6798b2db29 Make anim dma table dynamic 2023-05-13 01:44:40 -07:00
MysterD
c45e76c870 Switch all mempools to dynamic memory 2023-05-12 22:10:27 -07:00
MysterD
4aa4386319 Make envfx use dynamic memory 2023-05-12 21:30:16 -07:00
MysterD
1e67809cd8 Convert display lists to dynamic memory 2023-05-12 20:39:42 -07:00
MysterD
57b06e3e09 Rename AllocOnlyPool to DynamicPool, add GrowingPool 2023-05-12 18:53:25 -07:00
MysterD
2341a0be78 Make surfaces use dynamic memory 2023-05-12 17:16:03 -07:00
MysterD
bc73468e64 Load all models into dynamic memory, and store them in a way for reuse 2023-05-12 16:15:35 -07:00
MysterD
e391faf574 WIP: start making memory management better 2023-05-12 13:19:10 -07:00
MysterD
3478db9655 Fix more possible crashes 2023-05-12 12:31:11 -07:00
MysterD
cc1ec3e81f Prevented hundreds of additional crashes from the Mod API 2023-05-11 20:33:21 -07:00
Isaac0-dev
fad7984cd4
add djui_open_pause_menu() (#391) 2023-05-11 06:10:25 -04:00
MysterD
82945f9c0f Fix some problems found in static analysis 2023-05-11 02:17:10 -07:00
MysterD
039be71266 Prevent even more possible crashes from the mod api 2023-05-11 01:46:27 -07:00
MysterD
f785050ccb Fix more possible crashes 2023-05-11 00:19:01 -07:00
MysterD
af01a214ee Fix autogen for AnimationTable 2023-05-10 22:29:39 -07:00
MysterD
8ed8fc31d2 Fix another ~200+ crashes that could happen from mods 2023-05-10 21:28:13 -07:00
MysterD
d30b1e61a6 Add a container to animation tables so that we can track their length and stay in bounds 2023-05-10 20:57:35 -07:00
MysterD
e666719baf Rename func_80321080 -> stop_secondary_music 2023-05-10 15:39:15 -07:00
MysterD
b22230db5d Merge branch 'dev' of github.com:sm64ex-coop-dev/sm64ex-coop into dev 2023-05-10 15:21:00 -07:00
Prince Frizzy
d368e4e844
Name more audio code and variables, Document some others. (#386) 2023-05-10 14:31:58 -07:00
PeachyPeach
52e4bac21a
fixed disable acts (#390) 2023-05-10 17:07:29 -04:00
MysterD
b863cc80c8 Prevent several possible crashes and hangs, limit more struct fields to read-only 2023-05-10 13:25:41 -07:00
PeachyPeach
3ab4c944ac
better kick/punch/trip, gp and flying detection (#388) 2023-05-09 15:38:29 -04:00
MysterD
cb499491f4 Fix crash in network_receive_lua_sync_table 2023-05-07 22:46:00 -07:00
MysterD
34db74660c Fixed crash in cutscene_bowser_arena_end() 2023-05-07 16:02:46 -07:00
MysterD
ae76ad7c00 Fixed crash in uv_update_scroll() 2023-05-07 16:01:41 -07:00
MysterD
8f938e25ca Fixed crash in import_texture_*() 2023-05-07 16:00:52 -07:00
MysterD
0aac200258 Fixed crash in packet_ordered_check_for_processing 2023-05-07 15:56:56 -07:00
MysterD
03a7c1f086 Fix crashes in various obj functions 2023-05-07 15:55:11 -07:00
MysterD
f3e1392a51 Possible config corruption fix 2023-05-07 13:22:08 -07:00
MysterD
8eefbccc81 Make djui_hud_get_screen_width() more readable 2023-05-06 00:16:37 -07:00
Agent X
9901c89a33
Fixed forced 4:3 (#384)
Just reverting a 'fix' to my code someone else made.
2023-05-06 00:13:54 -07:00
MysterD
1ee3fd1d13 Fixed ~240 possible crashes 2023-05-05 23:59:58 -07:00
MysterD
f06a422ff9 Add hack to disable 2cycle if using a texture that doesn't exist 2023-05-05 01:47:42 -07:00
MysterD
352f72a1ac Remove tile checks from gfx_pc 2023-05-04 14:55:18 -07:00