Migrate to 4.4.1

LifeHckr · LifeHckr · commit 0449a629b030 · 2025-04-03T18:37:26.000-07:00
Fixed some UI change focus behavior, since 4.4 seemed to break/change it.
diff --git a/Classes/MidiMaestro/MidiMaestro.cs.uid b/Classes/MidiMaestro/MidiMaestro.cs.uid
@@ -0,0 +1 @@
+uid://cdykm1ykh0oqo
diff --git a/Classes/MidiMaestro/SongTemplate.cs.uid b/Classes/MidiMaestro/SongTemplate.cs.uid
@@ -0,0 +1 @@
+uid://bb2lxonulska2
diff --git a/Classes/Notes/Note.cs.uid b/Classes/Notes/Note.cs.uid
@@ -0,0 +1 @@
+uid://bkeut3tmr0kkv
diff --git a/Classes/Relics/RelicEffect.cs.uid b/Classes/Relics/RelicEffect.cs.uid
@@ -0,0 +1 @@
+uid://bppepqbww3dgb
diff --git a/Classes/Relics/RelicTemplate.cs.uid b/Classes/Relics/RelicTemplate.cs.uid
@@ -0,0 +1 @@
+uid://c2hoh6f7xdlqs
diff --git a/Funk Engine.csproj b/Funk Engine.csproj
@@ -1,8 +1,6 @@
-<Project Sdk="Godot.NET.Sdk/4.3.0">
+<Project Sdk="Godot.NET.Sdk/4.4.1">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
-    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <RootNamespace>FunkEngine</RootNamespace>
   </PropertyGroup>
diff --git a/Funk Engine.csproj.old b/Funk Engine.csproj.old
@@ -0,0 +1,19 @@
+<Project Sdk="Godot.NET.Sdk/4.3.0">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
+    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <RootNamespace>FunkEngine</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Melanchall.DryWetMidi" Version="7.2.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Globals\Translations\Translations.csv" />
+  </ItemGroup>
+  <Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0">
+    <Exec Command="dotnet tool restore" StandardOutputImportance="Low" StandardErrorImportance="High" />
+    <Exec Command="dotnet husky install" StandardOutputImportance="Low" StandardErrorImportance="High" WorkingDirectory="." />
+  </Target>
+</Project>
diff --git a/Globals/BgAudioPlayer/BgAudioPlayer.cs.uid b/Globals/BgAudioPlayer/BgAudioPlayer.cs.uid
@@ -0,0 +1 @@
+uid://1606wiel31cd
diff --git a/Globals/ContrastFilter/ContrastFilter.gdshader.uid b/Globals/ContrastFilter/ContrastFilter.gdshader.uid
@@ -0,0 +1 @@
+uid://6xa3rw1a2y5p
diff --git a/Globals/FunkEngineNameSpace.cs.uid b/Globals/FunkEngineNameSpace.cs.uid
@@ -0,0 +1 @@
+uid://doe2djfhypu11
diff --git a/Globals/SaveSystem.cs.uid b/Globals/SaveSystem.cs.uid
@@ -0,0 +1 @@
+uid://djsnp2bqxh1v6
diff --git a/Globals/Scribe.cs.uid b/Globals/Scribe.cs.uid
@@ -0,0 +1 @@
+uid://cju60m7xnn126
diff --git a/Globals/StageProducer.cs.uid b/Globals/StageProducer.cs.uid
@@ -0,0 +1 @@
+uid://frrfqkluvw56
diff --git a/Globals/TimeKeeper.cs.uid b/Globals/TimeKeeper.cs.uid
@@ -0,0 +1 @@
+uid://cv52t8b2ihgqn
diff --git a/Scenes/BattleDirector/Scripts/BattleDirector.cs.uid b/Scenes/BattleDirector/Scripts/BattleDirector.cs.uid
@@ -0,0 +1 @@
+uid://bttu0wmy2fp64
diff --git a/Scenes/BattleDirector/Scripts/Conductor.cs.uid b/Scenes/BattleDirector/Scripts/Conductor.cs.uid
@@ -0,0 +1 @@
+uid://tg14hkh1n7iv
diff --git a/Scenes/BattleDirector/Scripts/NotePlacementBar.cs.uid b/Scenes/BattleDirector/Scripts/NotePlacementBar.cs.uid
@@ -0,0 +1 @@
+uid://gj666xe815py
diff --git a/Scenes/BattleDirector/Scripts/NoteQueueParticlesFactory.cs.uid b/Scenes/BattleDirector/Scripts/NoteQueueParticlesFactory.cs.uid
@@ -0,0 +1 @@
+uid://segow0xumdrw
diff --git a/Scenes/BattleDirector/Scripts/TextParticle.cs.uid b/Scenes/BattleDirector/Scripts/TextParticle.cs.uid
@@ -0,0 +1 @@
+uid://dqtrm0p8fjg8m
diff --git a/Scenes/ChartViewport/Scripts/ChartManager.cs.uid b/Scenes/ChartViewport/Scripts/ChartManager.cs.uid
@@ -0,0 +1 @@
+uid://btgmfxqoe2wqx
diff --git a/Scenes/ChartViewport/Scripts/HitParticles.cs.uid b/Scenes/ChartViewport/Scripts/HitParticles.cs.uid
@@ -0,0 +1 @@
+uid://bjj3132iu8lrc
diff --git a/Scenes/ChartViewport/Scripts/Loopable.cs.uid b/Scenes/ChartViewport/Scripts/Loopable.cs.uid
@@ -0,0 +1 @@
+uid://cf58ep1c2o0q2
diff --git a/Scenes/ChestScene/ChestScene.cs.uid b/Scenes/ChestScene/ChestScene.cs.uid
@@ -0,0 +1 @@
+uid://cetn71kolbrmg
diff --git a/Scenes/Maps/Scripts/Cartographer.cs.uid b/Scenes/Maps/Scripts/Cartographer.cs.uid
@@ -0,0 +1 @@
+uid://dtlpiwt4n3pta
diff --git a/Scenes/NoteManager/Scripts/HoldArrow.cs.uid b/Scenes/NoteManager/Scripts/HoldArrow.cs.uid
@@ -0,0 +1 @@
+uid://ci5tt447bivmk
diff --git a/Scenes/NoteManager/Scripts/InputHandler.cs.uid b/Scenes/NoteManager/Scripts/InputHandler.cs.uid
@@ -0,0 +1 @@
+uid://bok6bnyemsgck
diff --git a/Scenes/NoteManager/Scripts/NoteArrow.cs.uid b/Scenes/NoteManager/Scripts/NoteArrow.cs.uid
@@ -0,0 +1 @@
+uid://cfdthf532wby7
diff --git a/Scenes/NoteManager/Scripts/NoteChecker.cs.uid b/Scenes/NoteManager/Scripts/NoteChecker.cs.uid
@@ -0,0 +1 @@
+uid://coukobemtvmah
diff --git a/Scenes/Puppets/Enemies/BossBlood/P_BossBlood.cs.uid b/Scenes/Puppets/Enemies/BossBlood/P_BossBlood.cs.uid
@@ -0,0 +1 @@
+uid://bpyrrnhvisxgv
diff --git a/Scenes/Puppets/Enemies/EnemyEffect.cs.uid b/Scenes/Puppets/Enemies/EnemyEffect.cs.uid
@@ -0,0 +1 @@
+uid://qq4e1plrowd0
diff --git a/Scenes/Puppets/Enemies/EnemyPuppet.cs.uid b/Scenes/Puppets/Enemies/EnemyPuppet.cs.uid
@@ -0,0 +1 @@
+uid://cfc3p0lefia1n
diff --git a/Scenes/Puppets/Enemies/Parasifly/P_Parasifly.cs.uid b/Scenes/Puppets/Enemies/Parasifly/P_Parasifly.cs.uid
@@ -0,0 +1 @@
+uid://btaqgieybx0ep
diff --git a/Scenes/Puppets/Enemies/TheGWS/P_TheGWS.cs.uid b/Scenes/Puppets/Enemies/TheGWS/P_TheGWS.cs.uid
@@ -0,0 +1 @@
+uid://3axgcdtdevtx
diff --git a/Scenes/Puppets/Scripts/HealthBar.cs.uid b/Scenes/Puppets/Scripts/HealthBar.cs.uid
@@ -0,0 +1 @@
+uid://d24uqauywe5j5
diff --git a/Scenes/Puppets/Scripts/PlayerPuppet.cs.uid b/Scenes/Puppets/Scripts/PlayerPuppet.cs.uid
@@ -0,0 +1 @@
+uid://kkb4qp3s86n3
diff --git a/Scenes/Puppets/Scripts/PlayerStats.cs.uid b/Scenes/Puppets/Scripts/PlayerStats.cs.uid
@@ -0,0 +1 @@
+uid://clck60exqqmy3
diff --git a/Scenes/Puppets/Scripts/PuppetTemplate.cs.uid b/Scenes/Puppets/Scripts/PuppetTemplate.cs.uid
@@ -0,0 +1 @@
+uid://bnfo57c070cll
diff --git a/Scenes/UI/Inventory.tscn b/Scenes/UI/Inventory.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://be6fb2sr5i515"]
 
-[ext_resource type="Script" path="res://Scenes/UI/Scripts/Inventory.cs" id="1_8rcwd"]
+[ext_resource type="Script" uid="uid://kqa0ovjph1hd" path="res://Scenes/UI/Scripts/Inventory.cs" id="1_8rcwd"]
 
 [node name="Inventory" type="Control" node_paths=PackedStringArray("_relics", "_notes", "_description", "_tabs")]
 process_mode = 1
diff --git a/Scenes/UI/Options/Scripts/HowToPlay.cs.uid b/Scenes/UI/Options/Scripts/HowToPlay.cs.uid
@@ -0,0 +1 @@
+uid://chu2uvshtv2vv
diff --git a/Scenes/UI/Options/Scripts/LanguageSelection.cs.uid b/Scenes/UI/Options/Scripts/LanguageSelection.cs.uid
@@ -0,0 +1 @@
+uid://cery6g5ojnl16
diff --git a/Scenes/UI/Options/Scripts/OptionsMenu.cs.uid b/Scenes/UI/Options/Scripts/OptionsMenu.cs.uid
@@ -0,0 +1 @@
+uid://dkuui4eib1q3e
diff --git a/Scenes/UI/Remapping/ControlSettings.cs.uid b/Scenes/UI/Remapping/ControlSettings.cs.uid
@@ -0,0 +1 @@
+uid://lnlfcp1n0mad
diff --git a/Scenes/UI/Remapping/Remap.tscn b/Scenes/UI/Remapping/Remap.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=8 format=3 uid="uid://bew23sumjs0fg"]
 
-[ext_resource type="Script" path="res://Scenes/UI/Remapping/ControlSettings.cs" id="1_ir12b"]
+[ext_resource type="Script" uid="uid://lnlfcp1n0mad" path="res://Scenes/UI/Remapping/ControlSettings.cs" id="1_ir12b"]
 [ext_resource type="Texture2D" uid="uid://dbjotl0v1ymia" path="res://SharedAssets/BattleFrame1.png" id="3_4uyjb"]
 [ext_resource type="Texture2D" uid="uid://xtygvpk7s8e4" path="res://SharedAssets/NoteArrow_Black_Outline.png" id="4_se2m3"]
 [ext_resource type="Texture2D" uid="uid://cr6wtf6j6dcfg" path="res://Scenes/UI/Remapping/Assets/Arrow_Left_Key_Light.png" id="5_xn13c"]
@@ -42,6 +42,7 @@ offset_left = 507.0
 offset_top = 54.0
 offset_right = 515.0
 offset_bottom = 62.0
+focus_neighbor_left = NodePath("../ControllerButton")
 text = "CONTROLS_WASD_BUTTON"
 
 [node name="ArrowButton" type="Button" parent="Panel"]
@@ -66,6 +67,7 @@ offset_left = 399.0
 offset_top = 57.0
 offset_right = 486.0
 offset_bottom = 88.0
+focus_neighbor_right = NodePath("../WASDButton")
 text = "CONTROLS_CONTROLLER_BUTTON"
 
 [node name="TitleButton" type="Button" parent="Panel"]
diff --git a/Scenes/UI/Scripts/DisplayButton.cs.uid b/Scenes/UI/Scripts/DisplayButton.cs.uid
@@ -0,0 +1 @@
+uid://b6urksmd4kyoj
diff --git a/Scenes/UI/Scripts/EndScreen.cs.uid b/Scenes/UI/Scripts/EndScreen.cs.uid
@@ -0,0 +1 @@
+uid://cj4bmpwdwg4qy
diff --git a/Scenes/UI/Scripts/Inventory.cs b/Scenes/UI/Scripts/Inventory.cs
@@ -45,6 +45,21 @@ private void AddDisplayButtons(IDisplayable[] displayables, Node parentNode)
 
     public override void _Input(InputEvent @event)
     {
+        if (_tabs.CurrentTab == 0) //Godot 4.4 changed neighbor behaviour
+        {
+            if (_notes.GetChildCount() > 0)
+                _tabs.GetTabBar().FocusNeighborBottom = _notes.GetChild(0).GetPath();
+            else
+                _tabs.GetTabBar().FocusNeighborBottom = null;
+        }
+        else if (_tabs.CurrentTab == 1)
+        {
+            if (_relics.GetChildCount() > 0)
+                _tabs.GetTabBar().FocusNeighborBottom = _relics.GetChild(0).GetPath();
+            else
+                _tabs.GetTabBar().FocusNeighborBottom = null;
+        }
+
         if (@event.IsActionPressed("ui_cancel") || @event.IsActionPressed("Inventory"))
         {
             ReturnToPrev();
diff --git a/Scenes/UI/Scripts/Inventory.cs.uid b/Scenes/UI/Scripts/Inventory.cs.uid
@@ -0,0 +1 @@
+uid://kqa0ovjph1hd
diff --git a/Scenes/UI/Scripts/MenuModule.cs.uid b/Scenes/UI/Scripts/MenuModule.cs.uid
@@ -0,0 +1 @@
+uid://pl57giqyhckb
diff --git a/Scenes/UI/Scripts/PauseMenu.cs.uid b/Scenes/UI/Scripts/PauseMenu.cs.uid
@@ -0,0 +1 @@
+uid://cepl3x0eyvr00
diff --git a/Scenes/UI/Scripts/RewardSelect.cs.uid b/Scenes/UI/Scripts/RewardSelect.cs.uid
@@ -0,0 +1 @@
+uid://dnex3l6lt3yr4
diff --git a/Scenes/UI/TitleScreen/Assets/TitleFont.gdshader.uid b/Scenes/UI/TitleScreen/Assets/TitleFont.gdshader.uid
@@ -0,0 +1 @@
+uid://bxvlpwylcbfvm
diff --git a/Scenes/UI/TitleScreen/Assets/TitleScreenFont.TTF.import b/Scenes/UI/TitleScreen/Assets/TitleScreenFont.TTF.import
@@ -23,6 +23,7 @@ allow_system_fallback=true
 force_autohinter=false
 hinting=0
 subpixel_positioning=0
+keep_rounding_remainders=true
 oversampling=0.0
 Fallbacks=null
 fallbacks=[]
diff --git a/Scenes/UI/TitleScreen/Assets/TransparentStars.gdshader.uid b/Scenes/UI/TitleScreen/Assets/TransparentStars.gdshader.uid
@@ -0,0 +1 @@
+uid://carejaurqw2we
diff --git a/Scenes/UI/TitleScreen/Scripts/SceneChange.cs.uid b/Scenes/UI/TitleScreen/Scripts/SceneChange.cs.uid
@@ -0,0 +1 @@
+uid://cahjluc6v7ked
diff --git a/Scenes/UI/TitleScreen/Scripts/TitleScreen.cs.uid b/Scenes/UI/TitleScreen/Scripts/TitleScreen.cs.uid
@@ -0,0 +1 @@
+uid://ce7anmo6cerw3
diff --git a/Scenes/UI/TitleScreen/TitleScreen.tscn b/Scenes/UI/TitleScreen/TitleScreen.tscn
@@ -1,19 +1,19 @@
 [gd_scene load_steps=21 format=3 uid="uid://bm41yti6ij2j"]
 
 [ext_resource type="Texture2D" uid="uid://b0tvsewgnf2x7" path="res://icon.svg" id="1_r5xy8"]
-[ext_resource type="Script" path="res://Scenes/UI/TitleScreen/Scripts/TitleScreen.cs" id="1_r22ha"]
+[ext_resource type="Script" uid="uid://ce7anmo6cerw3" path="res://Scenes/UI/TitleScreen/Scripts/TitleScreen.cs" id="1_r22ha"]
 [ext_resource type="Texture2D" uid="uid://ruxgynq6bc1m" path="res://Scenes/UI/TitleScreen/Assets/Background_Sky.png" id="1_txix1"]
 [ext_resource type="Texture2D" uid="uid://de2j543j83hmh" path="res://Scenes/UI/TitleScreen/Assets/Background_BackTree.png" id="2_4luva"]
-[ext_resource type="Script" path="res://Scenes/UI/TitleScreen/Scripts/SceneChange.cs" id="2_7f3m6"]
+[ext_resource type="Script" uid="uid://cahjluc6v7ked" path="res://Scenes/UI/TitleScreen/Scripts/SceneChange.cs" id="2_7f3m6"]
 [ext_resource type="Texture2D" uid="uid://b6fkei0i83vte" path="res://SharedAssets/Character1.png" id="2_cf582"]
 [ext_resource type="Texture2D" uid="uid://iqbqsiyjd3uq" path="res://Scenes/UI/TitleScreen/Assets/2D_Shadow_Map.webp" id="2_kw6qk"]
 [ext_resource type="Texture2D" uid="uid://dat1eoyl3do4e" path="res://Scenes/UI/TitleScreen/Assets/Background_FrontTree.png" id="3_hvvt6"]
 [ext_resource type="Texture2D" uid="uid://d3rxic3mi8jwb" path="res://Scenes/UI/TitleScreen/Assets/Background_MidTree.png" id="4_ui8kj"]
 [ext_resource type="Texture2D" uid="uid://bj8dxrlwuwrv4" path="res://Scenes/UI/TitleScreen/Assets/Background_Moon.png" id="5_squvs"]
-[ext_resource type="Shader" path="res://Scenes/UI/TitleScreen/Assets/TransparentStars.gdshader" id="5_x5dhk"]
+[ext_resource type="Shader" uid="uid://carejaurqw2we" path="res://Scenes/UI/TitleScreen/Assets/TransparentStars.gdshader" id="5_x5dhk"]
 [ext_resource type="FontFile" uid="uid://dlwfb7kb7pd76" path="res://Scenes/UI/TitleScreen/Assets/TitleScreenFont.TTF" id="8_gkfev"]
 [ext_resource type="Texture2D" uid="uid://hfxynr5jdgsp" path="res://Scenes/NoteManager/Assets/New_Arrow.png" id="10_4hnj8"]
-[ext_resource type="Shader" path="res://Scenes/UI/TitleScreen/Assets/TitleFont.gdshader" id="11_ht0dv"]
+[ext_resource type="Shader" uid="uid://bxvlpwylcbfvm" path="res://Scenes/UI/TitleScreen/Assets/TitleFont.gdshader" id="11_ht0dv"]
 [ext_resource type="PackedScene" uid="uid://bi5iqbwpsd381" path="res://Scenes/Puppets/Enemies/BossBlood/Boss1.tscn" id="12_lng3a"]
 [ext_resource type="PackedScene" uid="uid://uvlux4t6h5de" path="res://Scenes/Puppets/Enemies/Parasifly/Parasifly.tscn" id="13_j3xa4"]
 
@@ -171,9 +171,11 @@ theme_override_constants/margin_top = 20
 theme_override_constants/margin_right = 20
 theme_override_constants/margin_bottom = 20
 
-[node name="Button" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer"]
+[node name="Start" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
+focus_neighbor_right = NodePath("../../MarginContainer3/Continue")
+focus_neighbor_bottom = NodePath("../../../Options")
 text = "TITLE_START"
 script = ExtResource("2_7f3m6")
 ScenePath = 5
@@ -188,9 +190,12 @@ theme_override_constants/margin_top = 20
 theme_override_constants/margin_right = 20
 theme_override_constants/margin_bottom = 20
 
-[node name="Button" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer3"]
+[node name="Continue" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer3"]
 layout_mode = 2
 size_flags_horizontal = 3
+focus_neighbor_left = NodePath("../../MarginContainer/Start")
+focus_neighbor_right = NodePath("../../MarginContainer2/Quit")
+focus_neighbor_bottom = NodePath("../../../Options")
 text = "TITLE_CONTINUE"
 script = ExtResource("2_7f3m6")
 ScenePath = 6
@@ -204,22 +209,20 @@ theme_override_constants/margin_top = 20
 theme_override_constants/margin_right = 20
 theme_override_constants/margin_bottom = 20
 
-[node name="Button" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer2"]
+[node name="Quit" type="Button" parent="VBoxContainer/HBoxContainer/MarginContainer2"]
 layout_mode = 2
 size_flags_horizontal = 3
+focus_neighbor_left = NodePath("../../MarginContainer3/Continue")
+focus_neighbor_bottom = NodePath("../../../Options")
 text = "TITLE_QUIT"
 script = ExtResource("2_7f3m6")
 ScenePath = 4
 
-[node name="Button" type="Button" parent="VBoxContainer"]
-visible = false
-layout_mode = 2
-text = "TITLE_CONTROLS"
-script = ExtResource("2_7f3m6")
-ScenePath = 6
-
 [node name="Options" type="Button" parent="VBoxContainer"]
 layout_mode = 2
+focus_neighbor_left = NodePath("../HBoxContainer/MarginContainer/Start")
+focus_neighbor_top = NodePath("../HBoxContainer/MarginContainer3/Continue")
+focus_neighbor_right = NodePath("../HBoxContainer/MarginContainer2/Quit")
 text = "TITLE_OPTIONS"
 
 [node name="EnemPuppet" parent="." instance=ExtResource("12_lng3a")]
@@ -234,7 +237,7 @@ position = Vector2(572, 167)
 z_index = -1
 z_as_relative = false
 position = Vector2(643, 154)
-process_material = SubResource("ParticleProcessMaterial_4croe")
 texture = ExtResource("10_4hnj8")
 lifetime = 15.0
 randomness = 1.0
+process_material = SubResource("ParticleProcessMaterial_4croe")
diff --git a/SharedAssets/StarryNight.gdshader.uid b/SharedAssets/StarryNight.gdshader.uid
@@ -0,0 +1 @@
+uid://dp36iuuy414k1
diff --git a/project.godot b/project.godot
@@ -11,8 +11,9 @@ config_version=5
 [application]
 
 config/name="ProjectFunkEngine"
+config/tags=PackedStringArray("cool")
 run/main_scene="res://Scenes/UI/TitleScreen/TitleScreen.tscn"
-config/features=PackedStringArray("4.3", "C#", "Forward Plus")
+config/features=PackedStringArray("4.4", "C#", "Forward Plus")
 config/icon="res://SharedAssets/Character1.png"
 
 [audio]
