Commit graph

3058 commits

Author SHA1 Message Date
MysterD
53cf736908 Merge branch 'coop' into dev 2023-04-30 18:07:51 -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
f586fd0c19 Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-04-30 17:39:49 -07:00
MysterD
01d91ff07d Added profiling to more places to make lag easier to track down 2023-04-30 17:39:45 -07:00
PeachyPeach
b88542f7d9
a few api functions for psc (#372) 2023-04-30 08:46:47 -04:00
MysterD
b2a17a018d Added Dutch (thanks charaster.rar) 2023-04-29 22:44:55 -07:00
MysterD
db939f8efd Fix when compiling without COOPNET 2023-04-29 18:15:41 -07:00
MysterD
bc0a7f948f Makefile adjustments for coop-compiler 2023-04-29 18:14:44 -07:00
djoslin
242740fbf5 Increase max resend attempts for the initial packet 2023-04-29 00:43:34 -07:00
djoslin
7ee00a12a8 Add Mac coopnet support 2023-04-29 00:23:40 -07:00
MysterD
0c23456fd9 Added win32 coopnet builds 2023-04-28 22:34:40 -07:00
MysterD
e4a0d126da Update win64 coopnet 2023-04-28 21:13:51 -07:00
MysterD
ecfcc34f63 Removed color from Hide and Seek 2023-04-28 21:08:53 -07:00
Blockyyy
229664da6e
massive Hide and Seek overhaul (#364)
- Seekers only go faster in water
- No more Act Select
- Pause exits only allowed 30 seconds after entering a level
- Dying no longer makes you seeker unless next to a seeker
- Picks random seeker at the end of a round instead of last seeker
- staying too long in a cannon shoots you out
- can't trigger text or dialog
- Defaults to hit to tag instead of touch to tag
- no levels are banned
- Anti camp removed
- Much more optimized

- Probably other stuff i cannot remember
2023-04-28 21:01:55 -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
Agent X
c042ffca02
Update Nametags with updated version (#368)
Ported interpolation
2023-04-29 01:54:33 +02:00
MysterD
093bddfedd More arena balance tweaks/bug fixes 2023-04-28 13:25:13 -07:00
MysterD
61bb4ff439 Sync player knockbackTimer 2023-04-28 13:07:58 -07:00
MysterD
d9361989cf Added russian (thanks Fox), updated french (thanks wRadion) 2023-04-28 12:16:30 -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
360a655edd Updated lang files (thanks Skeltan and longjump guy 2023-04-27 01:00:22 -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
8fb5064847 Have DynOS read texture.inc.c when generating actor 2023-04-26 15:02:47 -07:00
MysterD
c8669e7dd3 Add incomplete support for multi-textures 2023-04-26 14:55:26 -07:00
MysterD
69b3fc587c Updated lang files (ty SonicDark and murilo) 2023-04-25 22:50:05 -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
93a1b7af8c Fix sounds compilation problems
Stopped copying over peach's lines from the mario folder to wario/luigi sound folders
Stopped compiling peach's lines for wario/luigi sound folders
Created a tool to precompile the aiffc tables and append them into custom sounds
    this matches what mario's sound files are like

I believe the issue is that previously we would copy over the sound files and
they were either incomplete or would be compiled during the copying process

I noticed that Mario's sounds had their sound tables inserted into the aiff
file already, and none of our custom sounds did. This caused a different path
to be taken for mario sounds than the rest of ours. In order to prevent the
possibility that there was a problem with that seperate path, I've created
a tool that can insert the table into the file to match how mario sounds are.
2023-04-25 11:25:46 -07:00
MysterD
6ed3c2cc60 Prevent rumbling when other players are swimming 2023-04-24 17:00:29 -07:00
MysterD
0412044456 Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop 2023-04-24 16:45:59 -07:00
MysterD
f2a8df7728 Made nametags mod interpolate names and health 2023-04-24 16:45:25 -07:00
DemnyxOnyxfur
c2ee21c22b
Update personal-starcount-ex.lua (#358)
* Update personal-starcount-ex.lua

Adds an incompatible tag for gamemodes, as you aren't collecting any stars outside of the main game.
Also adds some HUD trickery via djui_hud_set_render_behind_hud to draw underneath screen transitions, and the vanilla pause screen.

* Update personal-starcount-ex.lua

* Update personal-starcount-ex.lua

* Update personal-starcount-ex.lua
2023-04-24 16:07: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