Commit Graph

197 Commits

Author SHA1 Message Date
guzlad
b1f6024fa7 Added special scrolling to menu + fixes (#618)
* Added Special Scrolling to the visuals menu

* Added the actual functionality for special scrolling to work with menu

* Fixed PC-8801 mode if smooth transitions are enabled

* Special scrolling, not-so special translations
2025-10-18 00:27:25 +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
JoeMama
8fbe607983 Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-10-17 11:48:30 +01:00
JoeMama
5d0a1a8101 couple fixes 2025-10-17 11:48:28 +01:00
SkyanUltra
b088ad91e1 Peach now uses correct node and supports resource packs. (#609)
This fixes Peach in the minus world to now use her properly exported sprite, and additionally allows for her to be animated and changed through PeachNPC.json.
2025-10-17 09:59:18 +01:00
guzlad
52208528b5 Halved 1-2 minus world collision box (#611) 2025-10-17 09:58:46 +01:00
JHDev2006
77b91b3840 the main font now only uses ONE .fnt file, and the other language fonts fnt files are now embedded into the main .fnt file 2025-10-16 23:20:36 +01:00
JHDev2006
c16903e9a9 final touches 2025-10-16 22:50:31 +01:00
JHDev2006
44e7da3fea fonts can now have custom variations via jsons 2025-10-16 22:46:02 +01:00
JHDev2006
135dad712c fsr the challenge mode results menu was still visible upon loading, so made it not visible 2025-10-16 19:29:38 +01:00
JHDev2006
0d2f0a0187 added Special style scrolling, just for funsies, might make toggleable, not sure yet 2025-10-16 18:13:02 +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
JHDev2006
6b598e717d added a quick updating thing to resource extraction + fixed a bug where the timer warnings would play, upon death 2025-10-15 14:37:05 +01:00
JHDev2006
69fb2b5005 fixed some warning spam on startup 2025-10-14 16:30:37 +01:00
JHDev2006
11e74a0171 Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-10-14 16:27:13 +01:00
JHDev2006
0e36cdfc60 block destruction particles now get cached, hopefully reducing stutter 2025-10-14 16:27:10 +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
guzlad
74270bcca4 Fixed leftover upside-down pipe tiles in SMBS 7-4b (#587) 2025-10-13 22:50:25 +01:00
JHDev2006
c994bb3503 Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-10-13 20:05:46 +01:00
JHDev2006
21499f3697 fixed challenge mode results being able to be closed 2025-10-13 20:05:42 +01:00
guzlad
83bff6397a Ground tiling in 8-2a is now fixed (#581) 2025-10-13 20:04:40 +01:00
guzlad
4ce4d2bddf Fixed ChallengeEnd and ChallengeResults (#583) 2025-10-13 20:04:28 +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
guzlad
79339ab5ae Fixed peach sprite in -1 (#576) 2025-10-12 23:05:35 +01:00
JoeMama
9a23059362 Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public 2025-10-11 22:48:58 +01:00
JoeMama
efe3b98aa0 added a quick and dirty fps counter (press F4 or R3 on controller, for it to be toggled) 2025-10-11 22:48:52 +01:00
guzlad
333ceae967 Fixed certain upside down pipe tiles in SMBLL and SMBS (#560) 2025-10-11 16:27:12 +01:00
JoeMama
01238a0f1c fixed the results menuu persisting to the title screen in ANN 2025-10-10 11:41:22 +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
JoeMama
437f98884d Revert "Merge pull request #458 from KirbyKid256/pulls/more-animated-tilesets"
This reverts commit 07cb5015cf, reversing
changes made to ad03246040.
2025-10-10 11:06:32 +01:00
guzlad
7e0443d030 Fixed C-4 LL Bowser throwing hammers 2025-10-10 05:31:14 +02:00
guzlad
6b53e86ac1 Fixed axe flashing while the game is paused 2025-10-10 05:27:42 +02:00
guzlad
08adf8fd6c Added 'Is Real' option to Bowser and his bro 2025-10-10 02:58:19 +02:00
guzlad
07cb5015cf Merge pull request #458 from KirbyKid256/pulls/more-animated-tilesets
Animated Tilesets for Resource Packs
2025-10-10 00:46:40 +02:00
guzlad
ad03246040 Merge pull request #342 from KirbyKid256/pulls/small-crouch-hitbox-fix
Hitbox Change for When Small and Crouching
2025-10-10 00:39:37 +02:00
guzlad
bf962801ac Merge pull request #548 from kittenchilly/challenge-transition
New transition screen + no lives in modern hud for challenge mode
2025-10-10 00:28:53 +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
kittenchilly
897625c19d New transition screen + no lives in modern hud for challenge mode 2025-10-09 16:20:34 -05:00
KirbyKidJ
0f628302cb Merge remote-tracking branch 'upstream/main' into pulls/small-crouch-hitbox-fix 2025-10-09 08:23:38 -07:00
Ramona
46d7ef5a1f forgot about Modern UI and Key icon 2025-10-08 20:07:05 -04:00
Ramona
32583d0295 Merge branch 'JHDev2006:main' into main 2025-10-08 19:49:38 -04:00
Ramona
5b40319842 Make Coin HUD sprite pause-able to match objects 2025-10-08 19:43:21 -04: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
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
26ea7963ab Added missing fireblock to LL C-4 #523 2025-10-07 07:53:06 +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