Commit Graph

429 Commits

Author SHA1 Message Date
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
JHDev2006
ce9ded6a83 Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-10-06 18:50:48 +01:00
JHDev2006
8ca35bdcad updated levelbg snow + leaves particles, to be replaceable 2025-10-06 18:50:40 +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
guzlad
b0f976f883 Merge pull request #416 from SkyanUltra/patch-2
Fixed "spiny's" and "hachisuki" misspellings.
2025-10-06 01:23:47 +02:00
guzlad
c30dfc28be Merge pull request #506 from KirbyKid256/pulls/updated-godot-editor-icons
Updated Custom Icons for the Godot Editor
2025-10-06 01:20:48 +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
170f2e3063 Smoothened the pipe corners 2025-10-04 16:39:18 -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
d8003af13d Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-10-04 10:54:31 +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
guzlad
32d7a919e4 Added text alignment options to level editor labels 2025-10-04 02:37:06 +02: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
guzlad
6526479cb5 Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-10-02 14:27:47 +02:00
guzlad
1eddf5ca9a Fixed RaceCountdown.wav cutting off 2025-10-02 14:27:33 +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
f89a48905b Added if check for pirahna plant offsets to slightly optimize it 2025-10-01 19:24:08 +02:00
JHDev2006
31f8702cde Update PiranhaPlant.tscn 2025-10-01 17:55:22 +01:00
guzlad
0412d3745d Fixed piranha plant offsets 2025-10-01 17:45:06 +02:00
guzlad
cc270e99cc Set GDScript export to text for other platforms 2025-10-01 17:31:55 +02: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
95416e3639 added sigebou into entity id map 2025-10-01 14:31:45 +01:00
BarrierFalki
b397ff4f6b Add Sigebou to the editor (#468)
* Add Sigebou to the editor

* Add translations for Sigebou
2025-10-01 14:30:36 +01:00
JHDev2006
09c4b3c31b fixed some sfx's not being able to be replaced, via resource packs 2025-10-01 14:28:58 +01:00
JHDev2006
76953f8e40 ANN + LL ending npc's are no longer hard coded 2025-10-01 14:24:26 +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
d0d04c64c7 Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-10-01 10:58:21 +01:00
JHDev2006
51d81844d0 Added Death Counter to Custom Levels + Fixed castle bridge axe bonus sprites 2025-10-01 10:58:20 +01:00
Jeod
5848b3e5ef Merge pull request #469 from CST1229/gitattributes
Force LF line endings in .gitattributes
2025-09-30 17:22:18 -04:00
KirbyKidJ
3b30fb5f84 I forgot a few Conveyer Belt frames 2025-09-30 11:00:40 -07:00
CST1229
0595371b2b Force LF line endings in .gitattributes 2025-09-30 19:52:10 +02:00
Jeod
fa4c1c711c Fix slightly off colors on a few sprites (#464) 2025-09-30 17:07:53 +01:00
KirbyKidJ
8b5d9afba9 Animated Tilesets for All-Stars Resource Packs
This PR adds animated tilesets! I spent the day working on these, and it wasn't easy. This is primarily to help animate the All-Stars' grass tiles. You should be able to animate the other tilesets as well, but I haven't tested them.

JSONs are provided in the assets for Conveyer Belts and Liquids. There's two ways to animate the tilesets. The first is by the traditional way as used by `AnimatedSprite2D`, and the other is by how Godot animates tilesets normally as seen with the conveyer belts and liquids.

The last thing is that while doing this, I actually managed to fix the Resource Pack bug where reloading also reloads the blocks! It was surprisingly straightforward. I just edited the `BlockClass.gd` file to erase the cells when a block is hit or destroyed.

Let me know if you have any suggestions for things I should change or fix.
2025-09-30 00:04:03 -07:00
JHDev2006
9311424f55 fixed bob omb explosions AGAIN 2025-09-29 20:40:46 +01:00
JHDev2006
6fb271e5aa Update LevelSelectNew.tscn 2025-09-29 20:27:35 +01:00
JHDev2006
8ae27f63a6 fixed up some lost levels stuff 2025-09-29 20:03:19 +01:00