Commit Graph

91 Commits

Author SHA1 Message Date
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
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
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
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
Ramona
46d7ef5a1f forgot about Modern UI and Key icon 2025-10-08 20:07:05 -04:00
Ramona
5b40319842 Make Coin HUD sprite pause-able to match objects 2025-10-08 19:43:21 -04:00
JHDev2006
6a48a5b32f fixed up a couple things in the level editor 2025-10-06 22:02:15 +01:00
JHDev2006
8ca35bdcad updated levelbg snow + leaves particles, to be replaceable 2025-10-06 18:50:40 +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
guzlad
fd023f82a6 Added Pause menu BGM setting 2025-10-02 20:39:55 +02: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
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
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
09c4b3c31b fixed some sfx's not being able to be replaced, via resource packs 2025-10-01 14:28:58 +01:00
JHDev2006
9e5d7bd8e6 skid particles + extra particles setting 2025-10-01 12:33:34 +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
23c0cb5791 ok, now its REALLY done 2025-09-29 15:16:30 +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
2f6a36395a edited red coin and blue coin particles to also be CPUParticles 2025-09-29 11:45:07 +01:00
Jeod
5819dee966 Use CPUParticles2D for coin sparkle (#444) 2025-09-29 11:44:45 +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
f4cdbe18cb added in coin sparkles to blue coins and red coins 2025-09-28 16:49:08 +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
JHDev2006
872e7fe468 added in pause button rebinding 2025-09-27 21:17:50 +01:00
JHDev2006
ec803a64a6 you can now bind UI / Menu options to keys in the settings 2025-09-27 18:38:03 +01:00
Jeod
659e9f3ce8 Add true portable mode (#259) 2025-09-26 20:32:42 +01:00
KirbyKidJ
3a3340ed88 Prevents small crouch if it's not a used animation
Also added some functions for debugging and toggling visible collisions.
Also fixed some inconsistencies with both small and big collisions.
2025-09-26 11:46:09 -07:00
KirbyKidJ
4f06366c94 Merge remote-tracking branch 'upstream/main' into pulls/small-crouch-hitbox-fix 2025-09-26 10:51:17 -07:00
JHDev2006
0ef8a28826 updated the pipe cutscene, so that itll use the pipewalk animation, and custom characters pipe sfx 2025-09-26 12:48:14 +01:00
JHDev2006
40c2c04fcd couple things, icr 2025-09-25 22:54:23 +01:00
JHDev2006
21098feb72 error messages now properly wrap, so they dont go off screen 2025-09-24 19:03:23 +01:00
JHDev2006
df13040b45 Fixed a colour palette issue with autumn yellow pipes 2025-09-24 18:22:02 +01:00
JHDev2006
5edc5466b8 fixed a door bug with cusotm levels 2025-09-24 17:53:33 +01:00