Commit graph

2265 commits

Author SHA1 Message Date
MysterD
dde4eb4cb5 Bump version 2023-05-04 12:11:49 -07:00
MysterD
1e8a7c709b Merge branch '2cycle' into dev 2023-05-04 12:09:04 -07:00
MysterD
94b979a98f Cleanup 2cycle stuff 2023-05-04 12:08:53 -07:00
MysterD
7623753e68 Handle shader overflow cases 2023-05-04 11:59:36 -07:00
MysterD
5eae02936b Whoops 2023-05-04 01:43:51 -07:00
MysterD
f82f5149f4 Disable accurate interpolation on 32 bit 2023-05-04 01:29:08 -07:00
MysterD
14e80106c4 Fix 32 bit builds 2023-05-04 01:06:49 -07:00
MysterD
8a7778bbff Increase default resolution by a little bit 2023-05-03 21:42:17 -07:00
MysterD
607590fcaf Add 2cycle/lightmap support to dx12 2023-05-03 21:41:39 -07:00
MysterD
a191884c28 Port 2cycle/lightmap code to dx11 2023-05-03 21:07:22 -07:00
MysterD
ab2cbb2dbc Get GL_LEGACY working again (poorly) 2023-05-03 13:21:34 -07:00
MysterD
0bb7adfd2d Fix crash in bhv_lll_bowser_puzzle_piece_update() 2023-05-03 13:13:11 -07:00
Prince Frizzy
117379eba4
Fix default painting warps. (#380) 2023-05-03 06:26:19 -04:00
MysterD
c711f9f7c9 Actually fix crash in init_mario_after_warp() 2023-05-03 01:38:08 -07:00
MysterD
d60349663e Fixed warnings, changed version/game strings 2023-05-03 01:12:13 -07:00
MysterD
0a4dfd17a4 Re-ran autogen 2023-05-03 01:01:36 -07:00
MysterD
5b108e50e6 Merge branch 'coop' into dev 2023-05-03 01:01:18 -07:00
MysterD
5b5089dece Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-05-03 00:59:27 -07:00
Skeltan
2bd2089ed3
Added Toad default palette + other palette tweaks (#370) 2023-05-03 00:58:19 -07:00
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