Minor improvements for Controller Support

Fire2 Controller mapping. - Mapped to L2 moved fire2 directly underneath fire in Input Map. Assign Focused texture for upgrade menu so there are indicators for controllers.
gdquest-demos · Mar 16, 2022 · f4dbde5 · f4dbde5
1 parent 145b620
commit f4dbde5
Show file tree

Hide file tree

Showing 31 changed files with 97 additions and 71 deletions.
diff --git a/project/Ships/Enemies/topdown-enemy.svg.import b/project/Ships/Enemies/topdown-enemy.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/Ships/Guns/projectile-enemy.svg.import b/project/Ships/Guns/projectile-enemy.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/Ships/Player/topdown-player.svg.import b/project/Ships/Player/topdown-player.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/Ships/spike.svg.import b/project/Ships/spike.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/HUD/cargo_fill.svg.import b/project/UI/HUD/cargo_fill.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/HUD/cargo_outer.svg.import b/project/UI/HUD/cargo_outer.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/HUD/shield_bar_over.svg.import b/project/UI/HUD/shield_bar_over.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/HUD/shield_bar_progress.svg.import b/project/UI/HUD/shield_bar_progress.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/HUD/shield_bar_under.svg.import b/project/UI/HUD/shield_bar_under.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/MainMenu.tscn b/project/UI/MainMenu.tscn
@@ -10,9 +10,6 @@
 [ext_resource path="res://UI/MainMenu.gd" type="Script" id=8]
 [ext_resource path="res://UI/ScreenFader.tscn" type="PackedScene" id=9]
 
-
-
-
 [node name="MainMenu" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0

diff --git a/project/UI/MainScreen/gamepads/nintendob_button.svg.import b/project/UI/MainScreen/gamepads/nintendob_button.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/MainScreen/gamepads/playstation_cross_buttton.svg.import b/project/UI/MainScreen/gamepads/playstation_cross_buttton.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/MainScreen/gamepads/xbox_a_button.svg.import b/project/UI/MainScreen/gamepads/xbox_a_button.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/Menus/Upgrades/Icons/cargo_upgrade.svg.import b/project/UI/Menus/Upgrades/Icons/cargo_upgrade.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/Menus/Upgrades/Icons/health_upgrade.svg.import b/project/UI/Menus/Upgrades/Icons/health_upgrade.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/Menus/Upgrades/Icons/mining_upgrade.svg.import b/project/UI/Menus/Upgrades/Icons/mining_upgrade.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/Menus/Upgrades/Icons/speed_upgrade.svg.import b/project/UI/Menus/Upgrades/Icons/speed_upgrade.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/Menus/Upgrades/Icons/weapon_upgrade.svg.import b/project/UI/Menus/Upgrades/Icons/weapon_upgrade.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/Menus/Upgrades/UpgradeMenu.tscn b/project/UI/Menus/Upgrades/UpgradeMenu.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://UI/Menus/Upgrades/Icons/health_upgrade.svg" type="Texture" id=1]
 [ext_resource path="res://UI/Menus/Upgrades/Icons/cargo_upgrade.svg" type="Texture" id=2]
@@ -8,17 +8,12 @@
 [ext_resource path="res://UI/Menus/Upgrades/UpgradeButton.tscn" type="PackedScene" id=6]
 [ext_resource path="res://UI/Menus/Upgrades/Icons/mining_upgrade.svg" type="Texture" id=7]
 [ext_resource path="res://UI/Menus/Sounds/MenuSoundPlayer.tscn" type="PackedScene" id=8]
-
-
-
+[ext_resource path="res://UI/Menus/Upgrades/hover.svg" type="Texture" id=9]
 
 [node name="UpgradeMenu" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
 script = ExtResource( 4 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="HBoxContainer" type="HBoxContainer" parent="."]
 pause_mode = 2
@@ -35,30 +30,35 @@ __meta__ = {
 }
 
 [node name="HealthUpgrade" parent="HBoxContainer" instance=ExtResource( 6 )]
+texture_focused = ExtResource( 9 )
 texture = ExtResource( 1 )
 text = "Health"
 
 [node name="SpeedUpgrade" parent="HBoxContainer" instance=ExtResource( 6 )]
 margin_left = 132.0
 margin_right = 260.0
+texture_focused = ExtResource( 9 )
 texture = ExtResource( 3 )
 text = "Speed"
 
 [node name="CargoUpgrade" parent="HBoxContainer" instance=ExtResource( 6 )]
 margin_left = 264.0
 margin_right = 392.0
+texture_focused = ExtResource( 9 )
 texture = ExtResource( 2 )
 text = "Cargo"
 
 [node name="MiningUpgrade" parent="HBoxContainer" instance=ExtResource( 6 )]
 margin_left = 396.0
 margin_right = 524.0
+texture_focused = ExtResource( 9 )
 texture = ExtResource( 7 )
 text = "Mining"
 
 [node name="WeaponUpgrade" parent="HBoxContainer" instance=ExtResource( 6 )]
 margin_left = 528.0
 margin_right = 656.0
+texture_focused = ExtResource( 9 )
 texture = ExtResource( 5 )
 text = "Weapon"
 

diff --git a/project/UI/Menus/Upgrades/hover.svg.import b/project/UI/Menus/Upgrades/hover.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/Menus/Upgrades/normal.svg.import b/project/UI/Menus/Upgrades/normal.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/UI/Menus/Upgrades/pressed.svg.import b/project/UI/Menus/Upgrades/pressed.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/VFX/dust.svg.import b/project/VFX/dust.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/World/DockingPoint/asteroid-round.svg.import b/project/World/DockingPoint/asteroid-round.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/World/DockingPoint/coin.svg.import b/project/World/DockingPoint/coin.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/World/DockingPoint/dock-aura.svg.import b/project/World/DockingPoint/dock-aura.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/World/DockingPoint/signal.svg.import b/project/World/DockingPoint/signal.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/World/DockingPoint/space-station.svg.import b/project/World/DockingPoint/space-station.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/World/DockingPoint/topdown-portal-blue.svg.import b/project/World/DockingPoint/topdown-portal-blue.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/project/World/Ores/iron_ore.svg.import b/project/World/Ores/iron_ore.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true