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 23:48:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into pulls/resource-pack-expansion

Browse Source
This commit is contained in:
KirbyKidJ
2025-09-18 19:19:22 -07:00
parent 7fdbdbf826 864d38258f
commit 88a97597ae
29 changed files with 2239 additions and 2238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Scenes/Prefabs/LevelObjects/BulletBillGenerator.tscn
View File

@@ -22,6 +22,7 @@ texture = ExtResource("3_8rftf")
[node name="PlayerDetection" type="Area2D" parent="."]
visible = false
priority = 1
script = ExtResource("4_wggyr")
metadata/_custom_type_script = "uid://cnheej0sxmoxg"

4
Scenes/Prefabs/LevelObjects/EntityGeneratorStopper.tscn
View File

@@ -10,4 +10,8 @@ entity_scene = null
[node name="Sprite" parent="LevelEditorVisibleNode" index="0"]
texture = ExtResource("2_bd4qu")
[node name="PlayerDetection" parent="." index="1"]
visible = true
priority = 1
[connection signal="player_entered" from="PlayerDetection" to="." method="deactivate_all_generators" unbinds=1]

4
Scenes/Prefabs/UI/ChallengeModeEnd.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://jv82ssp7gwn4"]
[gd_scene load_steps=8 format=3 uid="uid://jv82ssp7gwn4"]
[ext_resource type="Script" uid="uid://by48a8oa5hefr" path="res://Scripts/UI/StoryPause.gd" id="1_1nlpt"]
[ext_resource type="StyleBox" uid="uid://comkghpj0djcl" path="res://Resources/UI/Panel.tres" id="2_37ia2"]
@@ -6,7 +6,6 @@
[ext_resource type="Script" uid="uid://cbal8ms2oe1ik" path="res://Scripts/Classes/Components/ResourceSetterNew.gd" id="4_r6n62"]
[ext_resource type="JSON" path="res://Assets/Sprites/UI/Cursor.json" id="5_f5hk3"]
[ext_resource type="Script" uid="uid://co6tjg3w6qpd8" path="res://Scripts/Parts/LabelFontChanger.gd" id="6_6v5ys"]
[ext_resource type="Resource" uid="uid://8dcuxbc3h2u2" path="res://Resources/ThemedResources/Font.tres" id="7_g5edx"]
[ext_resource type="PackedScene" uid="uid://dnksdgorle8su" path="res://Scenes/Prefabs/UI/SettingsMenu.tscn" id="8_s7xbe"]
[node name="PauseMenu" type="Control" node_paths=PackedStringArray("options")]
@@ -89,7 +88,6 @@ metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
[node name="LabelFontChanger" type="Node" parent="." node_paths=PackedStringArray("labels")]
script = ExtResource("6_6v5ys")
labels = [NodePath("../Control/PanelContainer/MarginContainer/VBoxContainer/Label"), NodePath("../Control/PanelContainer/MarginContainer/VBoxContainer/Label2"), NodePath("../Control/PanelContainer/MarginContainer/VBoxContainer/Label3"), null]
resource = ExtResource("7_g5edx")
metadata/_custom_type_script = "uid://co6tjg3w6qpd8"
[node name="SettingsMenu" parent="." node_paths=PackedStringArray("disabled_containers") instance=ExtResource("8_s7xbe")]

9
Scenes/Prefabs/UI/SettingsMenu.tscn
View File

@@ -257,7 +257,7 @@ size_flags_vertical = 3
theme_override_constants/separation = -4
script = ExtResource("4_avtty")
category_name = "SETTINGS_VIDEO"
options = [NodePath("Language"), NodePath("WindowMode"), NodePath("Size"), NodePath("Visuals"), NodePath("Scaling"), NodePath("VSync"), NodePath("DropShadows"), NodePath("HudStyle")]
options = [NodePath("Language"), NodePath("WindowMode"), NodePath("Size"), NodePath("Visuals"), NodePath("Scaling"), NodePath("VSync"), NodePath("DropShadows"), NodePath("HudStyle"), NodePath("FrameLimit")]
[node name="Control" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer/Video"]
custom_minimum_size = Vector2(0, 4)
@@ -321,6 +321,12 @@ option_key = "hud_scaling"
title = "VIDEO_HUD_SCALING"
values = ["VIDEO_HUD_STRETCHED", "VIDEO_HUD_CENTER"]
[node name="FrameLimit" parent="PanelContainer/MarginContainer/VBoxContainer/Video" instance=ExtResource("3_dl6kk")]
layout_mode = 2
option_key = "frame_limit"
title = "FRAME LIMIT"
values = ["Unlimited", "60fps", "120fps", "144fps", "240fps"]
[node name="WindowChanger" type="Node" parent="PanelContainer/MarginContainer/VBoxContainer/Video"]
script = ExtResource("5_hnwhb")
@@ -884,6 +890,7 @@ script = ExtResource("19_k6yev")
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Video/VSync" to="PanelContainer/MarginContainer/VBoxContainer/Video/WindowChanger" method="vsync_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Video/DropShadows" to="PanelContainer/MarginContainer/VBoxContainer/Video/WindowChanger" method="drop_shadows_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Video/HudStyle" to="PanelContainer/MarginContainer/VBoxContainer/Video/WindowChanger" method="hud_style_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Video/FrameLimit" to="PanelContainer/MarginContainer/VBoxContainer/Video/WindowChanger" method="frame_limit_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode" to="PanelContainer/MarginContainer/VBoxContainer/Audio/AudioAdjuster" method="master_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode2" to="PanelContainer/MarginContainer/VBoxContainer/Audio/AudioAdjuster" method="music_changed"]
[connection signal="value_changed" from="PanelContainer/MarginContainer/VBoxContainer/Audio/SelectableOptionNode3" to="PanelContainer/MarginContainer/VBoxContainer/Audio/AudioAdjuster" method="sfx_changed"]