etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-10-19 11:42:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
3232 commits 3 branches 4 tags 267 MiB
Commit graph

2446 commits

Author SHA1 Message Date
Agent X
52d70e33a5
Expose some painting functions to Lua (#357) 
* Expose some painting functions to Lua

get_painting_warp_node
initiate_painting_warp

* Change initiate_painting_warp u8 to s16

In initiate_painting_warp, pass in -1 to not override the painting index.

* Add sanity checks to get_painting_warp_node

* Add requested changes
 2023-05-03 00:54:57 -07:00
Prince Frizzy
ee3a7018ab
Adds support for compiling other regions (#378) 
* Initial support for compiling with EU.

* Fix EU text.

* JP now compiles, TODO: Fix Autogen to fix JP and fix text in djui.

* audio: Prevent crash in EU.

* audio: Sync EU audio to 60 Hz instead of 50 Hz

* Add logging and remove sanity check to hopefully track EU crash.

* Various improvements for EU

Improve some memory debugging
Improve sound debugging
Initalize some variables in load.c for the sound system
Synchronize the EU cutscenes with the US version.

* Fix credits music playing in EU, Document some EU audio code.

* Autogen now supports version excluded object fields and functions. Reran autogen in accordance.

* Fix some potentional shifting issues due to version differences.

* Decrease the sleep times in some spots, We do not need them to be so long. (#373)

* Add the region to the version string.

---------

Co-authored-by: djoslin0 <djoslin0@users.noreply.github.com>
 2023-05-03 00:54:25 -07:00
Prince Frizzy
677f4591dc
Multiple Sound Support (#377) 
* Initial support for the game playing multiple sounds at once.

* Make better use of our channels and use the remaining channels.
 2023-05-03 00:51:27 -07:00
Isaac0-dev
0d42098b4e port crash handler to Linux (#363) 2023-05-01 20:49:24 -07:00
Isaac0-dev
dedf75e87a
port crash handler to Linux (#363) 2023-05-01 19:49:42 -07:00
MysterD
a555a40bcf Fix crash in bhv_mario_update() 2023-05-01 17:03:01 -07:00
MysterD
afe1ff937b Merge branch 'dev' into coop 2023-05-01 01:36:58 -07:00
MysterD
f2cfa19da7 Fixed crash in bhv_wiggler_body_part_update() 2023-05-01 01:34:26 -07:00
MysterD
ca57853d18 Improve logging 2023-04-30 23:33:48 -07:00
MysterD
eca9d77419 Fix crash in init_mario_after_warp() 2023-04-30 23:30:15 -07:00
Marioiscool246
7b4b873d39
Add fov adjustment to djui_hud_world_pos_to_screen_pos (#374) 
* Add fov adjustment to djui_hud_world_pos_to_screen_pos
sFOVState is now a global (gFOVState)
djui_hud_world_pos_to_screen_pos now returns false if the position is behind the camera

* Fix aspect ratio parentheses

* Rerun autogen

---------

Co-authored-by: Marioiscool246 <marioiscool101@gmail.com>
 2023-04-30 22:54:55 -04:00
Prince Frizzy
9b1123dde9
Decrease the sleep times in some spots, We do not need them to be so long. (#373) 2023-04-30 22:12:37 -04:00
MysterD
57e2795682 Bump version number 2023-04-30 18:29:08 -07:00
MysterD
61e11b1e0f yoink 2023-04-30 18:05:35 -07:00
MysterD
03d2590b3d Merge branch 'dev' into coop 2023-04-30 17:59:54 -07:00
MysterD
d5663f2cb1 Moved dev stuff 2023-04-30 17:58:52 -07:00
MysterD
01d91ff07d Added profiling to more places to make lag easier to track down 2023-04-30 17:39:45 -07:00
MysterD
db939f8efd Fix when compiling without COOPNET 2023-04-29 18:15:41 -07:00
djoslin
242740fbf5 Increase max resend attempts for the initial packet 2023-04-29 00:43:34 -07:00
PeachyPeach
2aa6e1aa08
custom animations no dynos (#371) 
Load animations with smlua_anim_util_register_animation and set them with smlua_anim_util_set_animation.
 2023-04-28 21:00:17 -07:00
Isaac0-dev
08d31b8255
give mods more control over animations (#369) 
* give mods more control over animations

- added HOOK_ON_OBJECT_ANIM_UPDATE
- make some animation values mutable

* add to docs
 2023-04-29 01:56:18 +02:00
PeachyPeach
adba0f6de8
Bug fix: level_script_parse (#366) 
* Bug fix: level_script_parse

* level_is_vanilla_level
 2023-04-29 01:55:29 +02:00
MysterD
61bb4ff439 Sync player knockbackTimer 2023-04-28 13:07:58 -07:00
MysterD
e9ecf7a8f4 Made light maps a little less hacky 2023-04-28 00:22:30 -07:00
MysterD
ba4ed58cfa Hacked lightmaps in 2023-04-27 20:46:22 -07:00
MysterD
d84be97157 Fixed do_multiply optimization 2023-04-27 12:28:39 -07:00
MysterD
e945eb9572 Added an optimization back in 2023-04-27 00:54:02 -07:00
MysterD
36a7e674e2 Added three more combiners 2023-04-27 00:17:04 -07:00
MysterD
08df8a3c17 Support more color combiners 2023-04-26 23:12:22 -07:00
MysterD
9f269ba7dd Detect 2-cycle and when to apply optimizations 2023-04-26 21:05:32 -07:00
MysterD
8840649887 Started adding support for advanced materials (2cycle) 2023-04-26 20:37:25 -07:00
MysterD
d541d626c4 Make sure gfx_update_loaded_texture() stays in bounds 2023-04-26 16:19:53 -07:00
MysterD
c8669e7dd3 Add incomplete support for multi-textures 2023-04-26 14:55:26 -07:00
MysterD
bafd74dca6 Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-04-25 20:27:44 -07:00
MysterD
dd197f2c5e Added MSAA to OpenGL (SDL2) 
Fixed text rendering bug where UVs were rounded incorrectly
 2023-04-25 20:27:05 -07:00
Isaac0-dev
a56834ad43
Revert "Added support for the game to play multiple of the same sound at once (#361)" (#365) 
This reverts commit 6a8cd86293.
 2023-04-25 21:57:36 -04:00
Prince Frizzy
6a8cd86293
Added support for the game to play multiple of the same sound at once (#361) 
* Initial support for the game playing multiple sounds at once.

* Make better use of our channels and use the remaining channels.
 2023-04-25 21:44:23 -04:00
SMS Alfredo
57ceb6543f
Expose o->collidedObjs to Lua via obj_get_collided_object function (#362) 
* The function

* Autogen

* Add index parameter
 2023-04-25 21:43:07 -04:00
Isaac0-dev
03ddc00525
stop djui_hud_set_render_behind_hud from effecting the main djui (#359) 
* stop djui_hud_set_render_behind_hud from effecting the main djui

* use djui_reset_hud_params
 2023-04-25 21:42:21 -04:00
MysterD
6ed3c2cc60 Prevent rumbling when other players are swimming 2023-04-24 17:00:29 -07:00
MysterD
f2a8df7728 Made nametags mod interpolate names and health 2023-04-24 16:45:25 -07:00
MysterD
a216b9c2d9 Added download estimate time to join panel 2023-04-24 15:07:12 -07:00
MysterD
d57646ab5f Reset hud color if it was altered 2023-04-24 13:12:12 -07:00
MysterD
97d48d3278 Make sure djui isn't affected by mods that change settings out of HOOK_ON_RENDER 2023-04-24 13:06:36 -07:00
MysterD
2048c8a164 Reset resolution, font, and rotation before and after HOOK_ON_HUD_RENDER 2023-04-24 13:04:46 -07:00
MysterD
8bc8f59883 Fix crash in spawn_star_number() 2023-04-24 12:57:45 -07:00
MysterD
1b8baecaf9 Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-04-24 12:54:51 -07:00
MysterD
c095dcadc4 Make invalid model numbers use error model 2023-04-24 12:54:43 -07:00
MysterD
1f11cf00d2 Make permanent vanilla models use their vanilla slot 2023-04-24 12:52:44 -07:00
Blockyyy
0efd9ef21a
Recovery Heart (#360) 
changes nearest_mario_state_to_object to nearest_interacting_mario_state_to_object
 2023-04-24 07:15:29 -04:00
PeachyPeach
fe934ffe82
djui_hud_set_rotation (#356) 
* djui_hud_set_rotation

* some goddard textures
 2023-04-24 06:34:21 -04:00
MysterD
59453c6165 Notify the user when the language folder could not be read 2023-04-24 02:10:40 -07:00
MysterD
17efa994da Fixed crash in bhv_chain_chomp_gate_update() 2023-04-24 01:18:33 -07:00
MysterD
5cf9a835af Fixed crash in get_object_list_from_behavior() 2023-04-24 01:17:46 -07:00
MysterD
5113e9e99c Fixed crash in djui_gfx_render_texture_tile() 2023-04-24 01:16:54 -07:00
MysterD
07324c5396 Clarify dynos usage message 2023-04-24 01:02:44 -07:00
MysterD
c1e33f5e70 Doubled extended model id size, avoided using vanilla object slots 2023-04-24 01:01:50 -07:00
PeachyPeach
df248e5139
Adding hazardType to HOOK_ALLOW_HAZARD_SURFACE; more loading info (#355) 2023-04-23 12:11:56 -04:00
Isaac0-dev
1e8dfa66fd
stop trapping cursor in window leaving fullscreen (#353) 2023-04-23 12:10:43 -04:00
Isaac0-dev
e44a3c775d
allow players to change paginated pages with L/R (#354) 2023-04-23 12:10:30 -04:00
MysterD
b674304ddd Correct off-by-one error in paginated display count 2023-04-22 17:46:22 -07:00
MysterD
865d17b512 Adjusted kerning 2023-04-22 02:44:19 -07:00
MysterD
afe7e28fb3 Fix djui interactable crash when they get destroyed 2023-04-22 02:12:03 -07:00
MysterD
619eba7527 Fixed crash in geo_switch_mario_cap_on_off() 2023-04-22 01:53:04 -07:00
MysterD
e212a111dd Piranha plant music only plays if local player is nearby 2023-04-22 01:51:12 -07:00
MysterD
7f2c6d86c2 Prevent custom audio sequences from filling up all available memory 2023-04-22 01:47:24 -07:00
MysterD
eb413b5777 Fix osPiStartDma() crash - force sound entries to stay in bounds 2023-04-22 01:30:41 -07:00
MysterD
c6f33966b4 Fix DirectX memory leak (thanks integerbang) 2023-04-21 22:53:32 -07:00
MysterD
511434a9e9 Clear all interp variables when processing root (may fix various displaylist corruption crashes) 2023-04-20 21:56:37 -07:00
MysterD
43e63b854b Fixed crash in note_pool_clear() 2023-04-20 21:43:42 -07:00
MysterD
9836937eb1 Fixed crash in get_mario_spawn_type() 2023-04-20 21:40:35 -07:00
MysterD
230ba17c8d Fixed crash in init_mario_after_warp() 2023-04-20 21:37:22 -07:00
MysterD
e31a616103 Fixed crash in bhv_chain_chomp_chain_part_update() 2023-04-20 21:30:46 -07:00
MysterD
370ab9894b Fixed text rendering again 2023-04-20 20:57:09 -07:00
MysterD
13cfebca7a Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-04-20 20:54:28 -07:00
MysterD
030e2d68d6 Added cyrillic to normal/tiny fonts 2023-04-20 20:54:19 -07:00
PeachyPeach
8311116cdf
obj_init_animation_with_accel_and_sound + fix collision_find_surface_on_ray parameter names (#352) 2023-04-20 19:43:37 -04:00
MysterD
509c82fcd5 Made font-normal kerning consistent 2023-04-20 12:58:17 -07:00
MysterD
737b790869 Fixed some text rendering issues 2023-04-20 12:41:34 -07:00
MysterD
f80e63e8f6 Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-04-20 11:21:24 -07:00
MysterD
ab932c5eb9 Remove old code that tracked 'patches' 2023-04-20 11:21:15 -07:00
Agent X
92da90bf3f
Remove Share Lives (#351) 
it's a leftover from the very early betas, it isn't needed and isn't even fully functional anyway.
Also potentially fixed mario_get_floor_class crash
 2023-04-20 07:02:00 -04:00
MysterD
c71d3c564f Re-ran autogen 2023-04-20 01:28:42 -07:00
Isaac0-dev
bc7909c392
allow interact type to be 0 in hook_mario_action (#350) 
* allow interact type to be 0 in hook_mario_action
 2023-04-20 01:28:23 -07:00
MysterD
491a69549c Restore old version code 2023-04-20 00:51:34 -07:00
MysterD
2f59d29f95 Fix crash in pole_base_loop() 2023-04-20 00:26:17 -07:00
MysterD
4b8c40c734 Fix some audio corruption 2023-04-20 00:20:31 -07:00
MysterD
98c78a9470 Merge branch 'coopnet' into coop 2023-04-19 00:23:37 -07:00
MysterD
4b7b71e271 Change ordered packet information to u16, prevent clearing ordered packets during join 2023-04-18 23:50:11 -07:00
MysterD
bb924bd533 Fix warning 2023-04-18 23:13:28 -07:00
MysterD
0f71de2332 Increase np timeout, amount of rx seq ids, and don't clear ordered packets on connected 2023-04-18 21:47:19 -07:00
MysterD
857509d60e Enable more logs for debugging 2023-04-18 21:03:31 -07:00
MysterD
dd0060612a Another attempt at connection issue fix 2023-04-18 20:45:33 -07:00
MysterD
1c0963ba90 Test fix 2023-04-18 20:09:52 -07:00
MysterD
cea235648d Fix bug where you sometimes couldn't type to change player name 2023-04-18 12:40:51 -07:00
MysterD
c2eac34c4c DJUI paginated element fixes 2023-04-18 12:12:31 -07:00
PeachyPeach
999ea1dd42
Expose globally custom behaviors defined with hook_behavior (#345) 
* Expose globally custom behaviors defined with hook_behavior; macros for mod strings max length

* fixes

* made customBehaviorIndex a mod field to be more relevant
 2023-04-17 21:54:55 -07:00
MysterD
226d64aa85 Whoops 2023-04-17 21:03:30 -07:00
MysterD
fd9c59f0d9 Improve peer failure notification 2023-04-17 20:58:57 -07:00
MysterD
af04df0f26 Add peering failure notification 2023-04-17 20:54:40 -07:00
MysterD
f4ab060a05 Clear credits flags on network shutdown 2023-04-17 17:59:29 -07:00
MysterD
a93a9588f7 Disable discord error popups 2023-04-17 17:56:06 -07:00
MysterD
5b6888b378 Notify of coopnet incompatibility 2023-04-17 17:17:55 -07:00
MysterD
9d7e7b8b69 Refactor version stuff a bit 2023-04-17 16:54:30 -07:00
MysterD
42276e0efd Add lobby descriptions 2023-04-17 16:34:56 -07:00
MysterD
36b9dc57fc Merge branch 'coop' into coopnet 2023-04-17 15:51:06 -07:00
MysterD
1b46f90588 Use up all of the discord activity space for mods, list them more intelligently 2023-04-17 14:43:22 -07:00
MysterD
633faa793f Only allow clients to send discord invites of public lobbies 2023-04-16 22:03:46 -07:00
MysterD
0d177bde46 Fix joining a discord invite while already in game 2023-04-16 21:04:11 -07:00
MysterD
ee0e1dce44 Fix discord lobby joining 2023-04-16 20:48:19 -07:00
Isaac0-dev
df4226fdd7
clean up paginated, and fix a bug (#348) 
fix bug where text would show when there is only 1 page
 2023-04-16 23:10:45 -04:00
Agent X
bef63c3cd1
Forced 4:3 (#346) 
Turn on forced 4:3 in Options -> Display
Forced 4:3 activates in-game and doesn't affect the pause menu but does apply to the game's viewport and mods using DJUI
I've made complete sure this is mod compatible with both RESOLUTION_N64 as well as RESOLUTION_DJUI

Also fixed a small discrepancy with how object count text was rendered on the crash screen.
 2023-04-16 23:10:09 -04:00
MysterD
5337f206f0 Update lobby info on rehost 2023-04-16 19:36:27 -07:00
MysterD
0cf453f347 Make password inputboxes display '#'s 2023-04-16 18:43:07 -07:00
MysterD
ea4e335389 Restored how player packets are sent, they're compressed elsewhere 2023-04-16 18:21:54 -07:00
MysterD
9b71c30661 Compressed all game packets 2023-04-16 18:18:18 -07:00
MysterD
4dec136324 Added error handling for coopnet 2023-04-16 16:06:30 -07:00
MysterD
85c93481ae Do not display the socket page when hosting on coopnet 2023-04-16 15:10:21 -07:00
MysterD
bc0bd0a77d Compressed and reduced rate of Player packets 
Now player packets are only sent immediately if their inputs or actions changed.
Otherwise, it waits a bit before sending out another one
 2023-04-16 02:29:59 -07:00
MysterD
d63e65cd4a Actually fix discord crash 2023-04-15 23:43:51 -07:00
MysterD
cd1a91a74c Fix discord crash 2023-04-15 23:34:54 -07:00
MysterD
ddb15c0ca3 Test 2023-04-15 22:25:58 -07:00
MysterD
0e7b86017e Restore functionality of network_discord_id_from_local_index(0) 2023-04-15 21:09:26 -07:00
MysterD
e8d9ef247f Set default coopnet ip 2023-04-15 20:40:29 -07:00
MysterD
fd97b78b27 Fix case when joining discord lobby without a password 2023-04-15 20:27:28 -07:00
MysterD
8477a285a9 Clear discord party id and secrets when not in-game 2023-04-15 20:18:20 -07:00
MysterD
4dfcfb3b68 Attempt to enable discord invites 2023-04-15 20:12:06 -07:00
MysterD
dbd12976c8 Change how discord secrets are sent 2023-04-15 20:05:04 -07:00
MysterD
4566b7ee14 Ripped out discord network system, started re-adding invites 2023-04-15 19:53:34 -07:00
MysterD
8e2cd25617 Made it so changing server settings works in CoopNet 2023-04-15 15:54:44 -07:00
MysterD
875cde68e1 Added ability to set lobby password 2023-04-15 15:11:39 -07:00
MysterD
e676979630 Fix bug where replies to unknown players went to the wrong place 2023-04-15 01:16:59 -07:00
MysterD
787a5331c8 Increased starting ping 2023-04-15 00:33:56 -07:00
MysterD
4b7bb73232 Made banning work on CoopNet 2023-04-14 22:06:56 -07:00
MysterD
a1c218f9fc Added messages to lobby list when no lobbies found, or coopnet connection fails 2023-04-14 19:58:36 -07:00
MysterD
6a577d691f Make lobby hosting detect the largest mod by lua size 2023-04-14 11:59:35 -07:00
MysterD
b1aace4f04 Made version mismatch lobbies more obvious 2023-04-14 11:25:45 -07:00
MysterD
f99b5c05bb Fix how languages detect the lang file path 2023-04-14 11:04:22 -07:00
MysterD
6c7e7778d1 Merge branch 'coop' into coopnet 2023-04-14 10:53:58 -07:00
MysterD
a6d98d3103 Make sure coopnet always sets callbacks 2023-04-13 23:39:00 -07:00
MysterD
29a8c391bb Make coopnet IP and Port configurable (Isaac) 2023-04-13 22:58:58 -07:00
MysterD
0e1cda1b91 Ran autogen 2023-04-13 22:39:42 -07:00
MysterD
7d3bfa78e6 Bumped version 2023-04-13 22:39:25 -07:00
MysterD
694ba4b273 Fixed crash in void geo_process_node_and_siblings() 2023-04-13 22:38:32 -07:00
MysterD
01c379d50d Fixed crash in network_send_spawn_objects_to() 2023-04-13 22:36:47 -07:00
MysterD
fadb568519 Fixed crash in reset_camera() 2023-04-13 22:32:18 -07:00
MysterD
3a807bee06 Fixed crash in network_receive_lua_custom() 2023-04-13 22:29:10 -07:00
MysterD
e914a4e2c4 Increased max lag compensation to 1s 2023-04-13 22:23:56 -07:00
MysterD
cd347b80ee Clear interaction's invulnerable flag after each player has been processed 2023-04-13 22:17:01 -07:00
MysterD
d66c7190f6 Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-04-13 21:35:08 -07:00
Isaac0-dev
b206b75d7e
improve djui paginated panels and fix some typos (#347) 
* improve djui paginated panels and fix some typos

* naming
 2023-04-13 21:33:34 -07:00
MysterD
3f38c740d8 Add lobby refresh button 2023-04-13 18:27:18 -07:00
MysterD
fe2bb479ca Added menus for public and private lobbies 2023-04-11 21:38:17 -07:00
MysterD
a9bebc882c Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-04-11 20:07:12 -07:00
MysterD
0e7bbd2da6 Add single-lua-file mods to mod cache 2023-04-11 20:07:09 -07:00
Agent X
70de5d26af
Flying triple jump off players if wing cap (#344) 2023-04-11 18:41:41 -04:00
MysterD
de9e5f8550 Fixed crash in smlua_set_sync_table_field_from_network() 2023-04-11 15:02:51 -07:00
MysterD
1406f15995 Make sure lag_compensation_get_local_state() always returns a MarioState 2023-04-11 14:53:04 -07:00
MysterD
3825026faa Made cur_obj_call_action_function safer 2023-04-11 14:40:24 -07:00
Agent X
aba6483e5e
Hopefully fix passes_pvp_interaction_checks crash (#343) 
* Hopefully fix passes_pvp_interaction_checks crash
* Hopefully fix cur_obj_call_action_function crash
 2023-04-11 14:32:47 -07:00
MysterD
3b0e650dda Use the correct resolution for djui hud interpolation 2023-04-11 14:26:42 -07:00
MysterD
4d3e150e2d Fixed coopnet disconnect, separated coopnet_id, started adding password stuff 2023-04-11 14:07:58 -07:00
MysterD
ba338ec2dd Fix warnings, add Makefile logic for coopnet in other OS 2023-04-10 19:45:06 -07:00
MysterD
1027fdc361 WIP: lobby browser 2023-04-10 19:40:48 -07:00
MysterD
9a49ff95c7 Fixed graphical corruption when text renders offscreen 2023-04-10 19:03:34 -07:00
MysterD
41b226f9a7 Fixed crash in mod_clear() 2023-04-10 17:53:28 -07:00
MysterD
9ffd99473d Fix crash in is_anim_past_frame() 2023-04-10 17:50:57 -07:00
MysterD
03c172fa9e Crash fix for discord_activity_update() 2023-04-10 17:48:56 -07:00
MysterD
2d01367cf6 Possible crash fix for osPiStartDma() 2023-04-10 17:46:45 -07:00
MysterD
6f7b7e65ca Possible crash fix for network_receive_download() 2023-04-10 17:45:43 -07:00
MysterD
3fd8d74dc1 Fixed crash in cur_obj_follow_path 2023-04-10 17:41:51 -07:00
MysterD
69703ac29b Erase and recreate lua directories on import 2023-04-10 15:28:47 -07:00
MysterD
c1c12feb8f Cleanup zip file in more failure scenarios 2023-04-10 14:59:29 -07:00
PeachyPeach
892e48d3da
level_script_parse now calls the callback for objects with custom behaviors (#342) 2023-04-10 14:37:25 -07:00
Agent X
265a3c6b03
Hopefully fix 3 crashes (#341) 
* Hopefully fix 3 crashes
 2023-04-10 10:31:45 -07:00
MysterD
7fac22c265 Basic lobby browser 2023-04-10 01:10:24 -07:00
MysterD
b79db3b203 Add coopnet defines 2023-04-09 23:45:52 -07:00
MysterD
2e854cda60 Merge branch 'coop' into coopnet 2023-04-09 22:52:35 -07:00
MysterD
0aab42a27e Quick fix - create dynos/mods directories if they don't exist 2023-04-09 18:53:32 -07:00
MysterD
ea4a4b7d45 Made mod description panel appear behind mod selection panel 2023-04-09 17:55:29 -07:00
MysterD
54d0c03d46 Update discord activity when rehosting 2023-04-09 17:46:53 -07:00
MysterD
52eba1990b Revert some small text rendering optimizations so that mods still render correctly 2023-04-09 17:40:41 -07:00
MysterD
2b5dea60b0 Fix selectionbox crash when out of range 2023-04-09 17:25:45 -07:00
MysterD
04032a14af Started adding CoopNet 2023-04-09 17:20:07 -07:00
Prince Frizzy
f010caeb4b
Fix for djui_panel_find_first_interactable returning garbage if the loop aborts. (#339) 2023-04-09 07:52:02 -04:00
Isaac0-dev
f7a3e5f0a6
add a way for Lua mods to detect what OS coop is running on (#338) 
* patch for beta 32

* bump version

* fix lakitu cam duplication hopefully

* add a way for Lua mods to see what OS its running on
 2023-04-08 19:52:16 -04:00
MysterD
2f4008f9c9 Fixed compiling with DISCORD_SDK=0 2023-04-04 16:22:07 -07:00
MysterD
6f7d783602 Preventing spamming of join packets when the ping is high 2023-04-04 00:34:54 -07:00
MysterD
e7ebce5207 Removed lag compensation functions that shouldn't be added to the Lua API 2023-04-03 21:56:52 -07:00
MysterD
4d545fd2ca Fix zip file extraction error 2023-04-03 21:09:15 -07:00
MysterD
c437b386f6 Add drag & drop to DirectX versions 2023-04-03 20:36:29 -07:00
MysterD
4578b4e71f Added new spanish strings 2023-04-03 19:32:34 -07:00
MysterD
9c6fef9ecd Allowed Drag & Drop importing of mods and DynOS packs 2023-04-03 19:22:22 -07:00
MysterD
0d21c66037 Restore vanilla angle checks for kick/pick 2023-04-03 15:23:10 -07:00
MysterD
fce88728d2 Improve lag compensation 2023-04-03 13:55:03 -07:00
MysterD
01b2cc2997 Fix incorrect font rendering offset 2023-04-02 23:06:06 -07:00
MysterD
192d47aea0 Added FONT_TINY 2023-04-02 23:02:14 -07:00
MysterD
dcd1bc7aa8 Made rejoining popup only show up once per rejoin 2023-04-02 22:28:34 -07:00
MysterD
4328c00299 Increase rainbow buffer size 2023-04-02 22:20:04 -07:00
MysterD
5406593660 Fixed player smoke particle flags 2023-04-02 22:11:16 -07:00
MysterD
304cf9e8eb Made players invulnerable to PVP when ground pounding 2023-04-02 22:11:04 -07:00
MysterD
fda3c54c8b Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-04-02 21:19:04 -07:00
MysterD
92a8cc8675 Fix player interactions 
Separate normal player collisions from pvp
Normal collisions use local state
PVP collisions use rollback state
Make squish when bouncing completely local
Increase rollback buffer
 2023-04-02 21:18:17 -07:00
Agent X
fe53cdffd1
Fix cheats (#335) 2023-04-02 22:19:57 -04:00
MysterD
cdd077c9f8 Use the basic character on the title font if it's missing 2023-04-02 19:11:51 -07:00
MysterD
f593a263aa PVP improvements 
Removed angle check for punch/kick
Compensated for lag, so interactions favor the attacker now
 2023-04-02 18:26:00 -07:00
MysterD
8f2f46fbdc Adjust text in inputboxes 2023-04-02 15:34:47 -07:00
MysterD
44a1831698 Fix desync when changing areas 2023-04-02 14:44:52 -07:00
MysterD
193f2cc447 Turned title font into a sprite sheet 2023-04-02 13:51:52 -07:00
MysterD
68346eecf1 Text rendering optimizations + resolution increase on normal font 
Increased resolution of normal font 2x
Combined all normal font characters into a sprite sheet
Adjusted kerning on normal font
Removed 'rotatedUV' setting for DJUI fonts
 2023-04-02 13:18:10 -07:00
MysterD
e578943700 Started optimizing text rendering 2023-04-01 23:44:10 -07:00
MysterD
9cfa078b5e Make gMarioStates->controller immutable in Lua 2023-04-01 17:16:18 -07:00
MysterD
0b6e087936 coop now restores a backup configuration file if loading the config file threw an error 2023-04-01 17:01:50 -07:00
MysterD
af458cf210 Fixed crash handler 2023-04-01 05:12:46 -07:00
MysterD
bff3dc74fe Fixed clicking your cursor on the rightmost letter of inputbox 2023-04-01 03:56:23 -07:00
MysterD
d09d66b5d5 Change certain asserts in configfile to logs 2023-04-01 03:39:23 -07:00
MysterD
213af9b2dc Remove djui panels from main djui header 2023-04-01 00:30:35 -07:00
MysterD
6fc711e440 Added smlua_text_utils_get_language() 2023-04-01 00:04:45 -07:00
MysterD
fb51d48c02 Capitalize language files 2023-04-01 00:00:44 -07:00
MysterD
80aa63d090 Automatically resize join and confirm text 2023-03-31 23:57:03 -07:00
MysterD
e86aa59a4d Fix memory leak in djui panel 2023-03-31 23:54:26 -07:00
MysterD
f3c1e15659 Resized DJUI menu panels so that other languages will fit 2023-03-31 22:05:37 -07:00
MysterD
4839adf289 Made the background controller setting not require a restart 2023-03-31 22:05:09 -07:00
MysterD
a9fe991ba4 Make language configurable in-game 2023-03-31 19:38:06 -07:00
MysterD
30e802179b Added more things to the language system 2023-03-31 17:44:29 -07:00
MysterD
fe8c510ee4 Started adding the ability to translate DJUI menus 2023-03-31 15:18:19 -07:00
MysterD
abaaf10931 Continue simplifying DJUI panels 2023-03-31 12:34:20 -07:00
MysterD
2f59539d37 Started simplifying DJUI panels 2023-03-31 03:16:58 -07:00
MysterD
63f2166bab Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-03-31 00:29:32 -07:00
MysterD
8029400e48 Use UTF-8 for djui text 2023-03-30 23:12:32 -07:00
MysterD
87c6ee6e80 Reduce log spam 2023-03-30 12:19:04 -07:00
MysterD
f2c0993342 Prevent redirecting mod_list_request packets 2023-03-30 12:16:13 -07:00
Isaac0-dev
ca23c4d5e7
clean up a bit after change server settings/mods while hosting (#334) 
* clean up change server settings/mods while hosting

* update discord activity when rehosting

* optimised lakitucam mod
 2023-03-30 10:56:46 -07:00
MysterD
b7879c1d5a Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-03-29 17:36:22 -07:00
MysterD
341953390c Allow the ability to change server settings/mods while hosting 2023-03-29 17:36:13 -07:00
Prince Frizzy
79b1628dd8
Fix iteration of players for paintings. Causes undefined behavior otherwise. (#333) 2023-03-29 06:05:06 -04:00
MysterD
2acb51b314 Fix display of star 2023-03-28 22:28:04 -07:00
MysterD
90d1a71b64 Added 15 more characters 2023-03-28 16:15:42 -07:00
MysterD
c0ee5016dd Make adding extra characters even easier, add more umlaut and grave characters 2023-03-28 13:23:00 -07:00
MysterD
e0b5886bdf Make the extended character names and order make more sense 2023-03-28 12:33:13 -07:00
MysterD
4457edb412 Added portuguese letters to chat font 2023-03-28 00:57:05 -07:00
MysterD
be67a063e6 Added most of the spanish characters 2023-03-28 00:34:52 -07:00
MysterD
8f274afd49 Only send debug sync packet if no lag is detected 2023-03-27 23:08:54 -07:00
MysterD
6e46bc316e Make debug sync packet not-reliable 2023-03-27 22:48:54 -07:00
MysterD
67fefe2a9a Make ping unreliable 2023-03-27 22:16:21 -07:00
MysterD
33b5552ea6 Allow pings through unknown players 2023-03-27 22:12:48 -07:00
MysterD
7df87d583e Fix crash when removing a sync objects and iterating at the same time 2023-03-27 20:25:35 -07:00
MysterD
f4fe5a9457 Added ñ and Ñ to coop 2023-03-27 18:35:39 -07:00
Agent X
f97cc25732
Make cheats much better and add new ones (#305) 
* Make cheats much better and add new ones

Improved some, added some.
- Formatted cheats code to fit with the rest of sm64's naming style of things like structs
- Cheats will now always check for gServerSettings.enableCheats instead of its own variable
- Moon Jump: Increased vertical speed, automatically exit bonks
- God Mode: Tiny code improvements
- Super Speed: Exponentially improved, moved to step code and now works as it always should have
- Rapid Fire (New): When on, A will become rapid fire
- Always Triple Jump (New): When on, Mario will triple jump regardless of forwards velocity
- BLJ Anywhere (New): When on, spam A while BLJing to BLJ anywhere

* Add m->playerIndex == 0 checks
 2023-03-27 15:53:12 -07:00
PeachyPeach
b738cf73f9
/luaf; fix compilation issues with audio and debug + dev (#328) 
/luaf command to execute lua code from a file. Note that this command doesn't load the file the same way mod files are loaded, so no access to gGlobalSyncTable and gPlayerSyncTable. hook_chat_command cannot be called, but hook_event can.

Fix some compilation issues
 2023-03-27 15:50:49 -07:00
Isaac0-dev
32e39516d6
revert crash fix (#331) 
revert crash fix, causing more serious issues in star road
 2023-03-27 15:49:29 -07:00
MysterD
e7c52e8adb Bump version 2023-03-27 15:36:37 -07:00
MysterD
ec7cb86c2c Fixed sync ID assignments 2023-03-27 15:34:22 -07:00
MysterD
e47f40af9e Swapped out hashmap to C++ for sync objects 2023-03-27 14:29:15 -07:00
MysterD
ca94b7387e More sync object fixes 2023-03-27 12:51:10 -07:00
MysterD
de6e783c20 Fix some sync ID bugs 2023-03-27 12:29:20 -07:00
MysterD
73dfbe5e59 Increase max packets per second to 100 2023-03-27 11:59:06 -07:00
MysterD
b596cb2af2 Figure out a ping between every player, adjust resend rate based on it 2023-03-27 11:50:32 -07:00
MysterD
406bcb158d More shadow adjustments 2023-03-27 01:04:30 -07:00
MysterD
b83bda7d6b Possible fix for shadows going wonky on moving platforms 2023-03-27 00:59:19 -07:00
MysterD
68ec3a21e0 Skip animation interpolation more often 
(hands no longer swap places after side jumping)
 2023-03-27 00:24:06 -07:00
MysterD
46a95f7a72 Fixed bug in romhacks where coins re-appear when re-entering 2023-03-26 22:05:22 -07:00
MysterD
89d2eb9853 Deterministically set the syncId of child objects of level objects 2023-03-26 21:35:04 -07:00
MysterD
6346293468 Deterministically set the sync ID for level objects that spawn from spawninfo, macros, and special 2023-03-26 21:10:38 -07:00
MysterD
d12fc6c37a Remove old sync id reservation system 2023-03-26 19:06:18 -07:00
MysterD
015a49dc1a Rewrite syncID allocation and memory structure 2023-03-26 18:43:35 -07:00
MysterD
6c8b6387b4 Fix debug builds on linux 2023-03-26 14:53:01 -07:00
Isaac0-dev
c22eb8b2ba
fix version string buffer overflow (#327) 2023-03-26 14:52:13 -07:00
Agent X
01a81fc6f5
Beta 32.0.2 (#330) 2023-03-26 15:17:58 -04:00
Agent X
6c9a15cbe9
Fix envfx not resetting (#329) 2023-03-26 12:50:21 -04:00
Isaac0-dev
6cb1b2faec
Beta 32.0.1 (#325) 
* patch for beta 32

* require the development flag for Lua profiler

* autogen
 2023-03-26 01:15:28 -04:00
Agent X
4277230f20
Show players on star select toggle (#321) 
* Show players on star select toggle

* Make only toggleable by mods

* Allow player list to also be disabled
 2023-03-23 21:12:26 -04:00
Agent X
3676d2030d
Fix extended pause display (#319) 2023-03-23 17:42:53 -04:00
Agent X
1a86d46d95
Override envfx from Lua (#316) 
* Override envfx from Lua

set_override_envfx(-1) to reset override

* Fix type mismatch
 2023-03-23 14:46:15 -04:00
Agent X
c79a001f5f
Make fixed collision rounded corners toggleable (#315) 2023-03-22 21:02:43 -04:00
Agent X
d562a857d3
Clean up pause menu code and fix player menu bug (#314) 
* Clean up pause menu code and fix player menu bug

* Final fixes to player panel bugs
 2023-03-22 18:57:23 -04:00
Agent X
53b8a2f8e6
Fix compilation warnings and stop demos when hosting (#313) 
* [WIP] fix warnings

Committing now as is for Isaac to take a look at this.
Having issues with VERSION_TEXT

* Fix VERSION_TEXT crash and stop demos on host
 2023-03-21 22:41:43 -04:00
Isaac0-dev
7e46ce4a21
fixes and other improvements (#309) 
* HOOK_JOINED_GAME

* expose VERSION_TEXT, and two more adjusments

* show if a constant type is a string with autogen

* fix another blunder by that guy

* should use an or operator here

* fix frame limiter stuff
 2023-03-21 19:43:29 -04:00
Agent X
751dfe61c7
Move everything over (#280) 2023-03-20 22:36:25 -04:00
Agent X
7f6f7fea47
Fix NaN position bug with fixed collision (#312) 
* Fix fixed collision NaN position

Thanks to @Marioiscool246 for figuring this out.
Sometimes Mario's position will become NaN when doing specific things, this fixes that.

Co-Authored-By: Marioiscool246 <27823923+Marioiscool246@users.noreply.github.com>

* Formatting

Co-Authored-By: Marioiscool246 <27823923+Marioiscool246@users.noreply.github.com>

* Fix ordering

* Final fix(?)

---------

Co-authored-by: Marioiscool246 <27823923+Marioiscool246@users.noreply.github.com>
 2023-03-20 21:13:02 -04:00
Agent X
42b43a9b7e
get_ttc_speed_setting and set_ttc_speed_setting (#307) 2023-03-20 20:20:11 -04:00
Agent X
b2ba30e41c
Merge pull request #306 from Agent-11/smlua-exec-str 
/lua (Run Lua from chat IF you compiled with DEVELOPMENT)
 2023-03-20 20:12:52 -04:00
Agent X
d0318c23d5
Merge pull request #301 from Agent-11/hooks 
Touch up new hooks
 2023-03-20 20:07:14 -04:00
Agent X
b05c7ccf74
Merge pull request #302 from Isaac0-dev/apple 
put everyone in the jumbo star cutscene if one person is in it
 2023-03-20 20:06:05 -04:00
Agent X
3a45334a3d
Merge pull request #310 from Agent-11/time 
get_time()
 2023-03-20 19:59:31 -04:00
Agent X
4fd13c6bda
Bug fixes for mostly the title screen (#308) 
- Add NULL checks to DynOS warps
- Change checks for skipping interpolation on the original title screen for much better ones
- Interactions are no longer processed if you are on the title screen
- Re-add some of the legacy demo code for the original title screen
- Fix disconnecting on the original title screen
- Fix disconnecting on the act select screen
- Fix interpolation crash
 2023-03-18 17:14:01 -04:00
Agent X
22952dda05
Expose sound_banks_enable/disable to Lua (#311) 2023-03-18 17:12:33 -04:00
Agent X
c67b09b77f get_time() 2023-03-14 20:53:23 -04:00
Agent X
35eb3f1695
Merge branch 'sm64ex-coop-dev:coop' into hooks 2023-03-13 09:15:04 -04:00
Agent X
0c7de174d2 Add /lua to chat commands with dev flag 2023-03-08 19:26:03 -05:00
Agent X
36bda742cd Revert "smlua_exec_str (run Lua from string)" 
This reverts commit b32ab212a9.
 2023-03-08 19:04:32 -05:00
Agent X
b32ab212a9 smlua_exec_str (run Lua from string) 
Seemed useful for debug or any other purposes, why not?
 2023-03-08 18:54:06 -05:00
Isaac0-dev
bd2bd7c498
bring back vanilla demos (#221) 
* Bring back the demos from vanilla

the demo will activate if you are on the level that demo was meant to be from, and the default amount of time has passed

* clean up a bit and check a few things

* reset the demo input table

* config option/prevent demos playing on player menu

* update demo playing

- keep playing level music after demo finishes
- stop the demo if the player changes main menu level
 2023-03-03 01:47:03 -05:00
Isaac0-dev
a939ddc07b
bring back the ability to lose your cap (#229) 
* bring back the ability to lose your cap

* run autogen and add "cap" to the mario states guide

* fix some indentation
 2023-03-03 01:46:46 -05:00
Isaac0-dev
0500379081 put everyone in the jumbo star cutscene if one person is in it 2023-03-01 23:23:20 +10:00
Agent X
4af8af677f Touch up new hooks 2023-02-28 22:39:16 -05:00
eros71
4b567d8fc3
Remove include duplicate (#298) 
Hardcoded.h has been already included in a line before, this last duplicate shouldn't be there.
 2023-02-28 20:45:45 -05:00
Isaac0-dev
ac5204d46b
fix client crash when incompatible tag is null (#300) 
* rerun autogen

* give clients access to mod incompatible tags

And fix a crash when warping to the cake end picture

* whoops

* fix client crash
 2023-02-28 20:45:17 -05:00
Isaac0-dev
6e58ad6179 Merge branch 'apple' of https://github.com/Isaac0-dev/sm64ex-coop-broken into apple 2023-02-28 23:21:10 +10:00
Isaac0-dev
417fd1774c fix client crash 2023-02-28 23:20:55 +10:00