Commit graph

3025 commits

Author SHA1 Message Date
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
612dc2b78d
Merge pull request #304 from Agent-11/server-settings
Add gServerSettings to Lua manual tables
2023-03-20 20:00:21 -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
Sunk
2370f2e3d9 Merge remote-tracking branch 'upstream/coop' into coop 2023-03-18 00:13:54 -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
Agent X
b13b96cc19 Add gServerSettings to Lua manual tables 2023-03-07 17:46:09 -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
Sunk
6c362312f7 Fix inaccuracies in hooks.md 2023-03-01 20:24:12 -05:00
Sunk
8b85588793 Merge branch 'coop' of https://github.com/Sunketchupm/sm64ex-coop-weird into coop 2023-03-01 20:17:07 -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
5653b2bec4
Add new param to documentation 2023-02-28 22:43:47 -05: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
Isaac0-dev
a22f930d27
fix crash when incompatible tag is null (#299)
* rerun autogen

* give clients access to mod incompatible tags

And fix a crash when warping to the cake end picture

* whoops
2023-02-28 07:52:47 -05:00
Isaac0-dev
904a3e944f
Merge branch 'coop' into apple 2023-02-28 22:50:40 +10:00
Isaac0-dev
2d9fd2ad18 whoops 2023-02-28 22:49:10 +10:00
wRadion
2927425025
Define HARDCODED_H in header file (#297) 2023-02-27 12:30:03 -05:00
Isaac0-dev
eeae1f0f38
give clients access to mod incompatible tags (#296)
* rerun autogen

* give clients access to mod incompatible tags

And fix a crash when warping to the cake end picture
2023-02-27 11:22:31 -05:00
Isaac0-dev
d3f76b7351 give clients access to mod incompatible tags
And fix a crash when warping to the cake end picture
2023-02-27 22:58:00 +10:00
PeachyPeach
1e175b5ce7
Make most used and useful features built-ins (#242)
* made all bools u8 for consistency with fixCollisionBugs
* preview blue coins + visible secrets
* preserve indexing
* star number
* hud cap timer
* red coins radar + secrets radar
* extended pause display
* autogen
* only sDynosBuiltinFuncs is sensitive to indexing
* rebased
2023-02-26 03:15:54 +01:00
Sunk
5b5231eca2 Merge remote-tracking branch 'upstream/coop' into coop 2023-02-24 10:58:34 -05:00
Isaac0-dev
ce3efd3ba7
Merge branch 'sm64ex-coop-dev:coop' into coop 2023-02-23 18:11:49 +10:00
Prince Frizzy
98c9d103fb
Fix memory leak generating .tex files. (#295) 2023-02-23 00:44:51 -05:00
Sunk
9ec75abc60
Add HOOK_BEFORE_SET_MARIO_ACTION (#253)
* Small quality of life changes

Disabled fixed collision in sm74 by default.
Popping should now completely set the popped player's speed to 0.

* Add HOOK_BEFORE_SET_MARIO_ACTION

Param: incoming action
Return: changes incoming action
If the return value is 1, prevent the action from happening entirely.
0 can't be used here since it'll break the title screen.

* Update hooks.md

* Revert "Small quality of life changes"

This reverts commit 05dd235cd0.
2023-02-22 20:28:23 -05:00
Prince Frizzy
756719bb81
Hopefully fix GCC error. (#294) 2023-02-22 20:27:28 -05:00
Isaac0-dev
33a0d1ddb6
Merge branch 'sm64ex-coop-dev:coop' into coop 2023-02-23 06:16:41 +10:00
Sunk
fd6745954b
Force the player to stop moving upon being popped (#289) 2023-02-22 15:13:11 -05:00
Prince Frizzy
5e95fb14f1
Sanity checks for the .bhv system (#293)
* Barebones fix.

* Sanity checks for the .bhv system.

* Two more sanity checks.
2023-02-22 15:12:09 -05:00
Prince Frizzy
463c92b774
Bump version number (#292)
* Fix empty .bhv in Star Road.

* Bump version number.
2023-02-22 01:32:52 -05:00
Isaac0-dev
baedae5412
rerun autogen (#291) 2023-02-22 00:56:30 -05:00
Isaac0-dev
2c957733c4 rerun autogen 2023-02-22 15:55:02 +10:00
Prince Frizzy
a2d326000d
Fix empty .bhv in Star Road. (#290) 2023-02-22 00:32:19 -05:00
Prince Frizzy
716fc5faa8
Update Star Road. (#288) 2023-02-21 21:31:59 -05:00
Prince Frizzy
48d1f28d81
Fix wiggler glitching when being jumped on when small. (#287) 2023-02-21 02:46:59 -05:00
Sonicxryan
f6fcf65ed2
Updated Waluigi Model (#261)
* Updated Waluigi Model

Waluigi model

* Add files via upload

* Few Waluigi Animations

* Revert "Few Waluigi Animations"

This reverts commit ba0a554290a021d8ee5b694cc52ff1b2cd94e9c9.
2023-02-21 01:43:52 -05:00
Agent X
ea7f0a11c2
Small improvements to HUD and new functions (#268)
* Small improvements to HUD and new functions

- Split HUD_DISPLAY_FLAG_CAMERA_AND_POWER into HUD_DISPLAY_FLAG_CAMERA and HUD_DISPLAY_FLAG_POWER
- Added hud_is_hidden()
- Added camera_is_frozen()
- Added extra sanity check to hud.c

* Re-add old flags

* Fixes and improvements

* Mod compatibility
2023-02-21 00:23:15 -05:00
Agent X
a5a3dfdec9
Fix incorrect value for Makefile option (#269)
The comment for TEXTURE_FIX states "Disable texture fixes by default (helps with them purists)" and in spite of that, TEXTURE_FIX is set to 1 (on)
This PR simply sets it back to 0 as the comment intends the value to be, I just noticed this and saw an opportunity to make a PR for it. This doesn't have to be merged and all it does is restore the old smoke and pink on the Koopa's back.
2023-02-20 21:48:53 -05:00
Agent X
4aada40a62
area_create_warp_node and area_get_warp_node* (#270)
* area_get_warp_node*

- Added area_get_warp_node to Lua
- Added area_get_warp_node_from_params to Lua

* area_create_warp_node and warp constants

Here you go Isaac!

* Add object param

* Commits work again, pushing everything else
2023-02-20 21:47:32 -05:00
Agent X
e5cb5e5e15
Update built-in mods (#276)
* Update built-in mods

* Update nametags.lua
2023-02-20 21:44:24 -05:00