429 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
guzlad	79339ab5ae	Fixed peach sprite in -1 (#576)	2025-10-12 23:05:35 +01:00
JoeMama	9e278d70ca	Merge branch 'main' of https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public	2025-10-12 15:10:57 +01:00
JoeMama	584300f8e4	Update NoteBlock.json	2025-10-12 15:10:51 +01:00
guzlad	832b34214c	Castle bridge particles on classic now only appear if Extra Effects is enabled (#569)	2025-10-12 13:35:17 +01:00
JoeMama	7560403c54	updated sprites	2025-10-12 13:34:14 +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	fbb592fbe8	Fixed GameHUD spam and an annoying warning	2025-10-10 02:53:27 +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	6768ddc005	Merge pull request #549 from JHDev2006/SkyanUltra-patch-1 ... JP Localization update for text referring to lives left.	2025-10-10 00:29: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
guzlad	711bf536e2	Merge pull request #538 from nabbup/main ... Flashing sprite fixups	2025-10-10 00:22: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
SkyanUltra	8b51723c3c	JP Localization update for text referring to lives left. ... Replaces all instances of "のこりにんずう" (nokorininsuu) with "ざんき" (zanki) which is a more traditional and concise term used to refer to the player's lives. This is a fix proposed by #539.	2025-10-09 17:24:16 -04:00
kittenchilly	897625c19d	New transition screen + no lives in modern hud for challenge mode	2025-10-09 16:20:34 -05:00
JoeMama	e771443a4c	added bowsers bro to the entity id map	2025-10-09 18:32:25 +01: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	2170d0b1a4	? Block timing matches other flashing objects now	2025-10-08 19:46:23 -04:00
Ramona	5b40319842	Make Coin HUD sprite pause-able to match objects	2025-10-08 19:43:21 -04: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