Commit Graph

92 Commits

Author SHA1 Message Date
John Cooper McDonald
1e2d4d9404 Fix Extra Checkpoint option not doing anything + other checkpoint fixes (#649)
* Fix Extra Checkpoint option not doing anything + other checkpoint fixes

* Remove redundancy
2025-10-22 19:51:22 +01:00
JHDev2006
b54c4b5913 fixed a bug where the invincibility palette would stop after collecting a starman at the last second 2025-10-22 17:24:41 +01:00
John Cooper McDonald
d372ff4840 Fix Bowser not disabling flame generators (#648) 2025-10-22 16:44:56 +01:00
KirbyKidJ
50da5f62f3 Some Fake Bowser Fixes (#635)
This PR fixes the issues mentioned in #557   with Fake and Real Bowsers. Also for fun, I got the Bowser fall SFX to work when you kill a REAL Bowser or Bowser Bro by moving it outside of Bowser before they were freed from the scene.
2025-10-20 09:43:34 +01:00
SkyanUltra
b87d6e6a7c Fix for broken crouch size in marathon/boo races. (#632)
Previously, if you entered a boo race your hitbox scale changes would never be applied, meaning your crouch size would be unchanged from your standing stance. This fixes that, and adds a single parameter to apply character physics.
2025-10-20 09:41:45 +01:00
JHDev2006
65718342c6 Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-10-19 21:31:11 +01:00
JHDev2006
f77e1510cf fixed bumpers crashing, and FINALLY HAVE SORTED RESOURCE PACK EXTRACTION, ONLY TOOK BEING ABLE TO DOWNLOAD SOME OF THE FILES FROM THE FUCKING GITHUB TO WORK YEAAAAAAAAAAAAAA I LOVE GODOT 2025-10-19 21:31:09 +01:00
John Cooper McDonald
d37910a379 Don't give points for the powerup from a checkpoint (#628) 2025-10-19 09:53:26 +01:00
John Cooper McDonald
568d45ee31 Change 1-up flagpole to replace the 5000 point bonus (#550)
* Change 1-up flagpole to replace the 5000 point bonus

* Also no 1-ups in you vs boo

* Update EndFlagpole.gd

* Style

* Update EndFlagpole.tscn
2025-10-18 14:42:51 +01:00
guzlad
e48b7c2c0f [QoL] Noclip can be toggled, works w/o debug in leveltesting, some convenience functions. (#621)
* Some state machine functions to make code tidier in the future

* Added a function to Global to check if we're playtesting, for convenience

* Only allow noclip w/o debug in leveltesting, toggling added, kept jump key to exit
2025-10-18 00:24:50 +01:00
SkyanUltra
ad92f70925 Quick remapping of SwimMove to WaterMove (#614)
Fixes the fallback for WingMove to be set correctly to WaterMove.
2025-10-17 17:28:17 +01:00
John Cooper McDonald
9a17f140e0 Update hitboxes for consistency (#608)
Co-authored-by: Joe H <97353363+JHDev2006@users.noreply.github.com>
2025-10-17 17:12:57 +01:00
SkyanUltra
ed297891fd Quick fixes for optional animations (#612)
* Quick fix for flipped Jump/RunJump anims

accidentally used the condition the wrong way, my bad LOL

* >= moment

so thats why it was playing the fall animation for a single frame

* Reverted attempted fixes accidentally left in for CrouchBump
2025-10-17 13:56:12 +01:00
JHDev2006
a0521becb4 fixed an animation override bug cause im dumb and havent touched the json parser in a while 2025-10-17 13:32:08 +01:00
JoeMama
5d0a1a8101 couple fixes 2025-10-17 11:48:28 +01:00
JoeMama
80faeadafc fixed a crash when exiting pipes, and restored the LL font cause apparently i accidentily deleted it last commit, whoops, also wrote a quick optimization into the font updater to speed up load times 2025-10-17 09:48:04 +01:00
John Cooper McDonald
ae4317f9e5 Fix lingering Hammer issues (#607)
* Fix lingering Hammer issues

* CannonBall gib

* Spike Block and Rocky Wrench cleanup

* Update SpikeBlock.tscn

* Update PlayerDetection.gd
2025-10-16 18:02:29 +01:00
John Cooper McDonald
8474bc3c19 Properly implement the Hammer item (#599)
* Properly implement the Hammer item

* Update Boo.gd

* Update LongFirebar.tscn
2025-10-15 18:14:19 +01:00
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
14c193fb27 fixed an issue where coin particles werent spawning if the coin was part of the tilemap 2025-10-13 19:53:40 +01:00
JHDev2006
455aa14b35 fixed an issue where you could re-enter pipes, while exiting them, by spamming down 2025-10-13 19:25:32 +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
JoeMama
57a659ba34 re-implemented the respawning blocks + items fix, and got rid of a few annoying prints + removed the warning from the resource pack menu in the settings, as its no longer needed 2025-10-10 11:26:09 +01:00
guzlad
08adf8fd6c Added 'Is Real' option to Bowser and his bro 2025-10-10 02:58:19 +02: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
guzlad
cdcc250831 Merge pull request #511 from KirbyKid256/pulls/misc-bugfixes-from-multiplayer-branch
Miscellaneous Bugfixes From My Multiplayer Branch
2025-10-06 13:28:23 +02: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
KirbyKidJ
3f7423c72a Updated Godot Editor Custom Icons
Wanted to turn the icons used in the Godot Editor into SVGs
This has literally ZERO effect on the Game itself. I just thought it'd be neat.
2025-10-04 16:16:35 -07:00
JHDev2006
6201f39e1f bloopers top height now varies depending on the current level height 2025-10-04 11:28:46 +01:00
JHDev2006
39d6527454 swithced order of death loading, so game overs take priority 2025-10-04 11:23:39 +01:00
JHDev2006
ca050380a2 fixed lakitu throwing enemies causing their direction to be 0 2025-10-04 11:04:05 +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
guzlad
1a9d870883 Removed old Piranha Plant rotation logging 2025-10-01 17:28:42 +02:00
JHDev2006
88fc0f8075 fixed up pipe hitboxes on smaller characters + piranha plant rotation 2025-10-01 16:16:06 +01:00
JHDev2006
8fbfbd84bf added piranha plant rotation + a small optimization to playing custom levels? 2025-10-01 15:15:15 +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
00015d2650 started work on multiple input bindinghs, but is very shit, so need to rewrite how these are stored 2025-09-29 13:52:10 +01:00
JHDev2006
0a5e2ea211 added palette effect during small -> fire transformation 2025-09-29 12:19:51 +01:00
JHDev2006
f4cdbe18cb added in coin sparkles to blue coins and red coins 2025-09-28 16:49:08 +01:00
KirbyKidJ
6d23f9dcd4 Added Coin Sparkle Effects (#350)
* Just the Coin Sparkle stuff

FYI, if a property in the json is formatted like `exa.exb` then it reads `exa` as another object and `exb` as a property in `exa` assuming the root `property_node` contains this object.
Also primarily for Resource Packs to change how the particles work and should explain how I got there with my personal SMAS skin.

* Added Coin Sparkle Texture to Scene

Of course I broke it in some form.
2025-09-28 11:30:45 +01:00