GitHub/Super-Mario-Bros.-Remastered-Public
1
0
Fork 0
mirror of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git synced 2025-10-22 07:28:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
350 Commits 2 Branches 2 Tags
e6bc64affb161f05650ecbd5405b90c69fb1eb3d
Commit Graph

350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2fb96e40a9 Merge pull request #535 from Tsank35/main 
Coin Heaven fix
 2025-10-09 00:42:00 +02:00
guzlad
6d7590ced0 Moved Bowsers brother into the scrollable menu on Bowser 2025-10-09 00:37:59 +02:00
guzlad
379da41f04 Added Bowser's brother to the level editor 2025-10-08 21:35:47 +02: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
jdaster64
5cc8718941 Added challenge-hunt invis blocks near end of 2-3, 6-3 in SMB1 (#529) 2025-10-07 20:11:10 +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
26ea7963ab Added missing fireblock to LL C-4 #523 2025-10-07 07:53:06 +02:00
guzlad
bc5a970be9 Merge pull request #528 from jdaster64/firebar-timer-fixes 
Miscellaneous firebar rotation direction fixes
 2025-10-07 07:06:52 +02:00
jdaster64
c21fb5906e Finish testing post-merge 2025-10-07 00:16:28 -04:00
jdaster64
50a01a1a92 Fix merge issues more 2025-10-07 00:02:33 -04:00
jdaster64
6bfff3f87f revert levels with merge issues 2025-10-06 23:54:08 -04:00
jdaster64
929a6a509c Firebars fixed to rotate clockwise 2025-10-06 23:42:18 -04:00
guzlad
468bf19f19 Fixed time limits in SMBLL 4-4, C-4 2025-10-07 05:41:23 +02:00
guzlad
213feed6eb Fixed time limits in SMB1 3-4, 8-3 2025-10-07 04:46:15 +02:00
jdaster64
4fc18998a7 Change time limits for SMB1 3-4, 8-3, LL 4-4 to 300 seconds to match original games 2025-10-06 21:58:01 -04:00
guzlad
fedb5df2f6 Restarting in SMBS 1-4 and 2-2 won't bring you back to SMB1 2025-10-07 03:18:19 +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
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