Merge remote-tracking branch 'upstream/main'

Assets/Sprites/Blocks/Cannon.json

@@ -8,11 +8,11 @@
 		"Desert": {"source": "Cannon.png", "rect": [0, 16, 48, 16]},
 		"Jungle": {"source": "Cannon.png", "rect": [48, 16, 48, 16]},
 		"Snow": {"source": "Cannon.png", "rect": [96, 16, 48, 16]},
-		"Space": {"source": "Cannon.png", "rect": [144, 16, 48, 16]},
+		"Volcano": {"source": "Cannon.png", "rect": [144, 16, 48, 16]},
 		"Autumn": {"source": "Cannon.png", "rect": [0, 32, 48, 16]},
 		"Beach": {"source": "Cannon.png", "rect": [48, 32, 48, 16]},
 		"Mountain": {"source": "Cannon.png", "rect": [96, 32, 48, 16]},
-		"Volcano": {"source": "Cannon.png", "rect": [0, 32, 48, 16]},
+		"Space": {"source": "Cannon.png", "rect": [144, 32, 48, 16]},
 		"Bonus": {"source": "Cannon.png", "rect": [0, 48, 48, 16]}
 	}
 }

README.md

@@ -35,6 +35,15 @@ A Remake / Celebration of the original 'Super Mario Bros.' games. Features new l
 ## Contributing
 You are more than welcome to contribute any fixes / improvements you'd like, simply open a pull request, and I'll review it ASAP!
 
+## System Requirements
+
+Please refer to the Godot engine requirements for minimum and recommended hardware specifications.
+
+[Minimum Requirements]([url](https://docs.godotengine.org/en/latest/about/system_requirements.html#desktop-or-laptop-pc-minimum))
+
+[Recommended Requirements]([url](https://docs.godotengine.org/en/latest/about/system_requirements.html#id3))
+
+
 ## Issues
 When opening an issue, please keep it to one report, per post, and try and be as helpful as possible, when telling me what has occured, so that its as easy to fix as possible.
 Please do not open issues, for feature requests, suggestions, or opinions. BUG REPORTS ONLY

Resources/Locale/locale.csv

@@ -277,7 +277,7 @@ DELETION_BOO,,Delete You VS. Boo Data,Supprimer Données de Vous Contre Boo,Usu
 DELETION_ACHIEVEMENT,,Delete Achievement Data,Supprimer Données des Succès,Usuń Dane Osiągnięć,Удaлиtь дahhыe дoctижehий,Eliminar datos de logros,Elimina dati degli obiettivi,ＤＥＬＥＴＥ ＡＣＨＩＥＶＥＭＥＮＴ ＤＡＴＡ,I-delete ang data ng mga Tropeo,Erfolge-Speicherdaten löschen,Başarı Verİlerİnİ Sİl,Hapus Data Achievement,Deletar Dados de Conquistas,トロフィーデータをさくじょする
 DELETION_ALL,,Delete Everything,Tout supprimer,Usuń Wszystko,Удaлиtь bcё,Eliminar todo,Elimina tutto,ＤＥＬＥＴＥ ＥＶＥＲＹＴＨＩＮＧ,I-delete ang kabuohang data,Alle Speicherdaten löschen,Herşeyİ Sİl,Hapus Semuanya,Deletar Tudo,すべてのデータをさくじょする
 CREDITS_SKIP,,Press Jump to Skip...,Appuyez sur Saut pour passer,Wciśnij Skok aby Pominąć,"haжmиte пpыжok, чtoбы пpoпУctиtь...",Pulse Saltar para omitir,Premi Salta per saltare...,ＰＲＥＳＳ ＪＵＭＰ ＴＯ ＳＫＩＰ...,Pindutin ang Jump para magpatuloy,Zum Überspringen Sprung-Taste drücken.,Atlamak İçİn Zıplayın...,Tekan Lompat untuk Melewati...,Aperte Pular para Pular,ジャンプキーでスキップ
-EDITOR_MAIN_CREATE_0,,New Level,Nouveau Niveau,Nowy Poziom,hobый Уpobehь,Neuvo nivel,Nuovo livello,ＮＥＷ ＬＥＶＥＬ,Bagong Lebel,Neues Level,Yenİ Level,Level Baru,Novo Nível,あたらたなステージ
+EDITOR_MAIN_CREATE_0,,New Level,Nouveau Niveau,Nowy Poziom,hobый Уpobehь,Nuevo nivel,Nuovo livello,ＮＥＷ ＬＥＶＥＬ,Bagong Lebel,Neues Level,Yenİ Level,Level Baru,Novo Nível,あたらたなステージ
 EDITOR_MAIN_CREATE_1,,Make a level…,Créer un niveau,Stwórz poziom,coздatь Уpobehь...,Crear un nivel...,Crea un livello...,ＭＡＫＥ Ａ ＬＥＶＥＬ…,Gumawa ng Lebel...,Erstelle ein Level.,Level Oluştur...,Buat level…,Crie um nível...,ステージをつくる
 EDITOR_MAIN_LIST_NOLEVEL,,No levels found!,Aucun Niveaux trouvés !,Nie znaleziono poziomów,Уpobheй he haйдeho!,¡No se han encontrado niveles!,Nessun livello trovato!,ＮＯ ＬＥＶＥＬＳ ＦＯＵＮＤ!,Walang makitang lebel...,Keine Level vorhanden!,Level Bulunamadı!,Tidak ada level yang ditemukan!,Nenhum nível encontrado!,ステージがみつからない！
 EDITOR_MAIN_LEVEL_PLAY,,Play,Jouer,Graj,Игpatь,Jugar,Gioca,ＰＬＡＹ,Play,Spielen,Oyna,Main,Jogar,あそぶ

Scenes/Levels/CustomLevelMenu.tscn

@@ -368,11 +368,11 @@ layout_mode = 2
 focus_mode = 0
 
 [node name="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LevelInfo/SelectedLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="0"]
-scroll_horizontal = 200
+scroll_horizontal = 166
 is_active = true
 
 [node name="ScrollContainer2" parent="BG/Border/Levels/VBoxContainer/LevelInfo/SelectedLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="1"]
-scroll_horizontal = 8
+scroll_horizontal = 41
 is_active = true
 
 [node name="Panel" type="PanelContainer" parent="BG/Border/Levels/VBoxContainer/LevelInfo"]
@@ -383,7 +383,7 @@ theme_override_styles/panel = ExtResource("8_psbt7")
 [node name="AutoScrollContainer" type="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LevelInfo/Panel"]
 layout_mode = 2
 mouse_filter = 2
-scroll_vertical = 54
+scroll_vertical = 49
 horizontal_scroll_mode = 3
 vertical_scroll_mode = 3
 script = ExtResource("24_wf6nb")
@@ -569,12 +569,12 @@ layout_mode = 2
 focus_mode = 0
 
 [node name="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LSSLevelInfo/SelectedOnlineLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="0"]
-scroll_horizontal = 30
+scroll_horizontal = 9
 is_active = true
 auto_connect_focus = false
 
 [node name="ScrollContainer2" parent="BG/Border/Levels/VBoxContainer/LSSLevelInfo/SelectedOnlineLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="1"]
-scroll_horizontal = 8
+scroll_horizontal = 41
 is_active = true
 auto_connect_focus = false
 
@@ -587,7 +587,7 @@ theme_override_styles/panel = ExtResource("8_psbt7")
 [node name="AutoScrollContainer" type="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LSSLevelInfo/Panel"]
 layout_mode = 2
 mouse_filter = 0
-scroll_vertical = 54
+scroll_vertical = 49
 horizontal_scroll_mode = 3
 script = ExtResource("24_wf6nb")
 direction = 1

Scripts/UI/CustomLevelMenu.gd

@@ -17,6 +17,7 @@ func _ready() -> void:
 	Checkpoint.passed = false
 	Global.world_num = 1
 	Global.level_num = 1
+	Global.reset_values()
 	Checkpoint.sublevel_id = 0
 	Global.current_campaign = "SMB1"
 	AudioManager.stop_all_music()