Commit graph

2538 commits

Author SHA1 Message Date
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