Commit Graph

188 Commits

Author SHA1 Message Date
KirbyKidJ
0f628302cb Merge remote-tracking branch 'upstream/main' into pulls/small-crouch-hitbox-fix 2025-10-09 08:23:38 -07:00
Tsank35
e94cb2d837 Adds alternate check for coin heaven variation 2025-10-08 12:13:17 -07:00
Tsank35
33d3b080d4 Removed get_room_type() from CoinHeaven.gd
Godot craps it pants when running this script it export mode.
Removing the function fixes that.
2025-10-08 12:11:59 -07:00
guzlad
a63e305ea7 Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-10-08 17:27:49 +02:00
guzlad
d0d2b83c79 Added ogg support to ResourceSetterNew 2025-10-08 17:27:34 +02:00
JHDev2006
7edfccbd76 fixed a weird bug, to do with minus world 2025-10-08 15:35:44 +01:00
guzlad
6e957e7d25 Both ui_accept and jump_0 are now able to skip death anim and intermission screen 2025-10-07 19:14:46 +02:00
guzlad
527eebd08b Fixed editor level test and custom levels crash 2025-10-07 02:59:13 +02:00
Tsank35
27ae3d5612 Room variation types (#517)
* Global.gd now has an extra variable for current room type

* ResourceSetterNew.gd now has variation category for room types

The state variable also had to include the room type, since it wouldn't update properly when entering a bonus room from a level that's already underground

* LevelClass.gd sets room type on update_theme

A new function, get_room_type() allows for the level's room type to be detected, which can easily be overwritten by other level classes. Bonus Rooms are detected by comparing the level's scene path to a pre-defined list of bonus rooms.

* Added get_room_type() to CoinHeaven.gd

* Added get_room_type() to PipeCutscene.gd

Also updates the room type in _enter_tree() since update_theme() isn't called here.

* Added get_room_type() to TitleScreen.gd
2025-10-06 22:05:43 +01:00
JHDev2006
6a48a5b32f fixed up a couple things in the level editor 2025-10-06 22:02:15 +01:00
guzlad
3a498717e5 Fixed custom character fall anims not playing 2025-10-06 16:51:36 +02: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
JHDev2006
49e6b39084 changing text label colour 2025-10-04 10:54:08 +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
982b5f691e Update GameHUD.gd 2025-10-02 19:43:40 +01:00
guzlad
fd023f82a6 Added Pause menu BGM setting 2025-10-02 20:39:55 +02:00
JHDev2006
9133629c11 LIVES NOW GET SAVED 2025-10-02 11:17:42 +01:00
JHDev2006
8dc1583f66 IGT is now visible in marathon mode 2025-10-02 11:13:02 +01: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
Jeod
77d0e9f6c3 Add a screenshot feature (#439) 2025-10-01 20:27:57 +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
b8d85d1bb2 adjusted player climbing position 2025-10-01 14:18:34 +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
8ae27f63a6 fixed up some lost levels stuff 2025-09-29 20:03:19 +01:00
Jeod
528c4ddfa9 Make cmd arg for rom a bit cleaner (#449) 2025-09-29 18:58:08 +01:00
JHDev2006
f2adcc512f OK NOW IM DONE 2025-09-29 15:50:24 +01:00
JHDev2006
87e0a2d032 OK NOW ITS DONE I SWEAR 2025-09-29 15:48:12 +01:00
JHDev2006
8c9ae3f6ab ok yea im done, updating might be a bit weird? but overall itll be fine 2025-09-29 15:39:06 +01:00
JHDev2006
62df14f804 alr, multiple inputs are DONE 2025-09-29 15:04:54 +01:00
JHDev2006
99b9de4dad ok, working now, wanna just get unbinding working 2025-09-29 14:57:22 +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
4fa07b7d06 fixed a tiling error, and not being able to skip the challenge "miss.." screen 2025-09-29 11:58:21 +01:00
jdaster64
00fffc35b7 Fix 1UP check condition for LL (#446) 2025-09-29 11:43:38 +01:00
JHDev2006
ac1c2eaf5b adjusted boo unlocking, since you could technically beat gold boo, on white boo, which i thought was a bit dumb and unfair 2025-09-28 22:16:26 +01:00
JHDev2006
1711402a6a fixed a bug where the puase menu couldnt be closed by pressing the pause button again 2025-09-28 21:52:14 +01:00
JHDev2006
c0f2044a1e Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-09-28 16:49:13 +01:00
JHDev2006
f4cdbe18cb added in coin sparkles to blue coins and red coins 2025-09-28 16:49:08 +01:00
Jeod
7ae8f97dde Use ui_accept in ResourcePackContainer.gd (#431) 2025-09-28 16:41:09 +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