Commit Graph

44 Commits

Author SHA1 Message Date
SkyanUltra
447b6d3ea7 Optional Animations 2: Electric Boogaloo (#596)
* Additional optional animations for water/wing power-up + extras

* Added animation fallbacks for new animations

* Kicking animation function

* Kick anim functionality for shells

* Player performs kick animation

* RunJump anims + quick fixes

new anims, including RunJump, RunJumpFall and RunJumpBump (incredible name) which play depending on the X velocity the player left the ground with.

also fixed the bob-omb to play the kick animation as well as it should

also

* Updated "FlyMove" to "WingMove" for consistency

* Update "FlyMove" to "WingMove" in animation fallbacks
2025-10-15 12:51:38 +01:00
guzlad
a0369cd612 [QoL] FPS Counter disabled by default, show message after screenshot, show message if noclip is enabled/disabled (#591)
* FPS counter is off by default, enable with F4

* A message or error is now shown on-screen if a screenshot is taken with F2

* Show message when noclip is enabled or disabled
2025-10-14 16:04:08 +01:00
SkyanUltra
a9b4cbe674 StarFall animation fallback fix (#584)
if you don't have StarJump, it would ignore your JumpFall animation when you have invincibility. this fixes that.
2025-10-13 19:56:40 +01:00
JHDev2006
a9055451ae fixed an issue where you could throw a fireball frame one of exiting a pipe 2025-10-13 19:23:24 +01:00
SkyanUltra
22a4afbc95 Slight tweak to animation fallbacks (#573)
Changes a few animation fallbacks to something more reasonable, and fixes potential broken animation fallbacks (notably PipeMove, which didn't work if you didn't define a Move animation.)
2025-10-12 23:06:29 +01:00
KirbyKidJ
e6bc64affb Refactored Small Crouching and Big Crouching
- Added new variables to `CharacterInfo.json`
- Made it so `BlockCollision` area position is attached to top of `SmallCollision` and `BigCollision`
2025-10-09 15:16:14 -07:00
KirbyKidJ
0f628302cb Merge remote-tracking branch 'upstream/main' into pulls/small-crouch-hitbox-fix 2025-10-09 08:23:38 -07:00
guzlad
527eebd08b Fixed editor level test and custom levels crash 2025-10-07 02:59:13 +02:00
JHDev2006
6a48a5b32f fixed up a couple things in the level editor 2025-10-06 22:02:15 +01:00
KirbyKidJ
84a34ff3b9 Miscellaneous Bugfixes From My Multiplayer Branch
This is just a bunch of bugfixes I did while I was working on the Multiplayer Support PR. I know I should've kept them separate, but then I'd also be dealing with said bugs. So this PR adds most of the bugfixes I did while working on Multiplayer.

- De-globalized Pipe SFX from Pipe Cutscene (helps with lowering audio)
- De-globalized 1-up SFX for Players
- Removed an error log spam with the `ResourceSetter`s (involving connecting already connected signals)
- Made sure to insert "BaseAssets" folder into the FIRST slot in the Resource Packs array.
- Replaced `"BaseAssets"` for the above fix with `Godot.ROM_PACK_NAME`
- Removed unused `"character"` setting from `SettingsManager`
- Reset P-Switch timer when `Global.reset_values()` is called. Fixes bug when pressing a P-Switch and immediately restarting the level.
- Added Skid SFX to `AudioManager`
- Added slightly longer delay for when pausing with a controller (it can easily unpause before you press the button again)
- Null check if LevelBG is in the level or not (for added for test levels)
2025-10-05 12:12:39 -07:00
JHDev2006
39d6527454 swithced order of death loading, so game overs take priority 2025-10-04 11:23:39 +01:00
KirbyKidJ
0a026a44dd Merge remote-tracking branch 'upstream/main' into pulls/small-crouch-hitbox-fix 2025-10-03 21:46:36 -07:00
JHDev2006
05bca140fd fixed up players getting stuck in blocks, after collecting a powerup mid air 2025-10-02 10:09:21 +01:00
JHDev2006
f088c9b606 fixed pipes, being terrible and i hate them 2025-10-01 21:48:17 +01:00
JHDev2006
9e5d7bd8e6 skid particles + extra particles setting 2025-10-01 12:33:34 +01:00
JHDev2006
51d81844d0 Added Death Counter to Custom Levels + Fixed castle bridge axe bonus sprites 2025-10-01 10:58:20 +01:00
JHDev2006
9311424f55 fixed bob omb explosions AGAIN 2025-09-29 20:40:46 +01:00
JHDev2006
0a5e2ea211 added palette effect during small -> fire transformation 2025-09-29 12:19:51 +01:00
SkyanUltra
f6a31f8508 New Optional Animation States (#420)
* new animation states

additional conditional animation states, including:
- SkidAttack
- IdleAttack
- WalkAttack
- RunAttack
- CrouchJump
- CrouchMove
... along with a new set of animations, the Bump animations (play when hitting your head on a block)
- JumpBump
- CrouchBump
- SwimBump

* added fly animations & tweaked bump animation time

new anims for FlyIdle, FlyUp, FlyMove, FlyAttack, and FlyBump, which all fallback on their Swim counterparts if not found. also changed around some animation fallbacks which made more sense, like bumps using fall animations instead if applicable.

* added bump ignore checks and added a general bump animation

you can now define Bump which will define a bump animation for all bump animations. additionally, bump animations will only play if they can detect an animation. no more fallbacks needed
2025-09-28 11:25:50 +01:00
Jeod
659e9f3ce8 Add true portable mode (#259) 2025-09-26 20:32:42 +01:00
KirbyKidJ
3a3340ed88 Prevents small crouch if it's not a used animation
Also added some functions for debugging and toggling visible collisions.
Also fixed some inconsistencies with both small and big collisions.
2025-09-26 11:46:09 -07:00
KirbyKidJ
4f06366c94 Merge remote-tracking branch 'upstream/main' into pulls/small-crouch-hitbox-fix 2025-09-26 10:51:17 -07:00
JHDev2006
11a4b57ac5 cleaned up some of the posing code 2025-09-26 12:58:25 +01:00
KirbyKidJ
2d4b6105b6 All-Stars Pose at Level End
This adds a new and optional animation for Characters called `PoseDoor`. When a character uses this animation, they stop at the entrance of the castle door to strike a pose like in All-Stars.
2025-09-25 17:47:11 -07:00
jdaster64
b3694e0cf2 Revert 10k stomp change in Player 2025-09-24 10:32:16 -04:00
jdaster64
9e6b453fe0 Merge upstream before Koopa scoring PR 2025-09-24 10:25:53 -04:00
jdaster64
beea267f99 Suppress stomp points shortly after a kick 2025-09-24 00:54:44 -04:00
KirbyKidJ
cd2e7522b5 Renamed CrouchShape to SmallCrouchShape
Easier to search for on VSC
2025-09-22 21:51:48 -07:00
Falkimore
4d036c3add update each character's CharacterInfo to include new parameters 2025-09-22 18:11:13 -05:00
Falkimore
a770541ddd add new physics parameters and descriptions 2025-09-22 18:02:44 -05:00
Joe H
d3e07180df Merge pull request #348 from JeodC/optimize-1
Convert repetitive function in Player.gd to dispatch table
2025-09-22 21:40:08 +01:00
JHDev2006
3fe00f7589 fixed death animation, not playing correctly sometimes 2025-09-22 17:48:33 +01:00
Jeod
7f44b4bc2e Convert some repetitive functions in Player.gd to dispatch tables
Convert some repetitive functions in Player.gd to dispatch tables. This makes reading the code easier and clarifies purpose.
2025-09-22 09:50:23 -04:00
Joe H
080ec8f908 Merge pull request #330 from JeodC/main
Reset death flag on death in boo race
2025-09-22 10:02:59 +01:00
KirbyKidJ
d501e08995 Hitbox Change for When Small and Crouching
Adds a quick change to parallel SMM2. I noticed when trying to duck under a Rocky Wrench's wrench while small, I still got hit. So I added an extra hitbox for when you crouch and are small.
It was actually incredibly hard to test if this was accurate in SMM2 since the enemy had Stormtrooper aim. But when it throws a wrench directly at your face and you duck, you can dodge it.
2025-09-22 00:24:52 -07:00
JHDev2006
ebdd1795b2 Modern transformation animation now actually looks like mario maker now, rejoice 2025-09-21 23:01:41 +01:00
Jeod
a1e9f3e21b Reset death flag on death in boo race 2025-09-21 17:41:01 -04:00
JHDev2006
873ef53dfd fixed frame 1 water jumping 2025-09-21 21:43:32 +01:00
JHDev2006
c26bf96dd9 Fixed LL ending being at day instead of night 2025-09-21 16:51:14 +01:00
JHDev2006
483ad1e93f fixed bug #270 2025-09-19 16:18:32 +01:00
JHDev2006
2a26c6a7e7 The speedrun timer, can now be paused (not fullgame marathons tho, cause uhhhhh yea) 2025-09-16 15:18:53 +01:00
JHDev2006
9228b7bca1 fixed dying causing 2 lives to be taken, instead of 1 2025-09-15 09:59:33 +01:00
JHDev2006
9f6f9c40c5 made it so coins actually coin 2025-09-13 19:53:31 +01:00
JHDev2006
3773bdaf64 added the game 2025-09-13 16:30:32 +01:00