Merge branch 'dev' into feature/save-state-scene

2021-05-15 16:42:32 +02:00
parent 9d9ca0a283 3428b0b980
commit 3d37ec00a6
22 changed files with 400 additions and 3 deletions
@@ -59,5 +59,6 @@ $RECYCLE.BIN/
 # End of https://www.toptal.com/developers/gitignore/api/godot,linux,windows


-# Ignore files releases
+# Ignore folders releases and build Android
 releases
+android
@@ -3,7 +3,7 @@
 [ext_resource path="res://assets/fonts/kirsty/kirsty rg.otf" type="DynamicFontData" id=1]

 [resource]
-size = 38
+size = 24
 outline_color = Color( 0.894118, 0.788235, 0.0901961, 1 )
 use_mipmaps = true
 use_filter = true
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/UI-Button-Back-Overlay.png-6c35ee278b0e9e1a2061a13952a9a134.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/ui/themes/UI-Button-Back-Overlay.png"
+dest_files=[ "res://.import/UI-Button-Back-Overlay.png-6c35ee278b0e9e1a2061a13952a9a134.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/UI-Button-Back.png-af1847fde99c0278349d8f6e32b8dd66.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/ui/themes/UI-Button-Back.png"
+dest_files=[ "res://.import/UI-Button-Back.png-af1847fde99c0278349d8f6e32b8dd66.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/UI-Button-ItemsList-first-hover.png-a0304c733bfe802e9c12392242a7b2c3.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/ui/themes/UI-Button-ItemsList-first-hover.png"
+dest_files=[ "res://.import/UI-Button-ItemsList-first-hover.png-a0304c733bfe802e9c12392242a7b2c3.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/UI-Button-ItemsList-first.png-4ad1decc2a091cc61331864ce645871a.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/ui/themes/UI-Button-ItemsList-first.png"
+dest_files=[ "res://.import/UI-Button-ItemsList-first.png-4ad1decc2a091cc61331864ce645871a.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/UI-Button-ItemsList-hover.png-c2c9eaf2ec207358d68f8f238ef303e8.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/ui/themes/UI-Button-ItemsList-hover.png"
+dest_files=[ "res://.import/UI-Button-ItemsList-hover.png-c2c9eaf2ec207358d68f8f238ef303e8.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/UI-Button-ItemsList-last-hover.png-129b3ca362919593b4dd5569f798c5a9.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/ui/themes/UI-Button-ItemsList-last-hover.png"
+dest_files=[ "res://.import/UI-Button-ItemsList-last-hover.png-129b3ca362919593b4dd5569f798c5a9.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/UI-Button-ItemsList-last.png-e43aff8d2503d910a32ca8afc31cf602.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/ui/themes/UI-Button-ItemsList-last.png"
+dest_files=[ "res://.import/UI-Button-ItemsList-last.png-e43aff8d2503d910a32ca8afc31cf602.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/UI-Button-ItemsList.png-d30a7081abd049be07061b6b8905bff1.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/ui/themes/UI-Button-ItemsList.png"
+dest_files=[ "res://.import/UI-Button-ItemsList.png-d30a7081abd049be07061b6b8905bff1.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
@@ -0,0 +1,21 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://assets/ui/themes/UI-Button-Back.png" type="Texture" id=1]
+[ext_resource path="res://assets/ui/themes/UI-Button-Back-Overlay.png" type="Texture" id=2]
+
+[node name="Control" type="Control"]
+margin_right = 1440.0
+margin_bottom = 900.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="TextureButton" type="TextureButton" parent="."]
+margin_right = 40.0
+margin_bottom = 40.0
+texture_normal = ExtResource( 1 )
+texture_hover = ExtResource( 2 )
+texture_focused = ExtResource( 2 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
@@ -0,0 +1,97 @@
+[gd_scene load_steps=10 format=2]
+
+[ext_resource path="res://assets/ui/icones/skull.png" type="Texture" id=1]
+[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-first.png" type="Texture" id=2]
+[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-last.png" type="Texture" id=3]
+[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList.png" type="Texture" id=4]
+[ext_resource path="res://assets/ui/themes/leather.theme" type="Theme" id=5]
+[ext_resource path="res://assets/fonts/kirsty/kirsty.tres" type="DynamicFont" id=6]
+[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-hover.png" type="Texture" id=7]
+[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-first-hover.png" type="Texture" id=8]
+[ext_resource path="res://assets/ui/themes/UI-Button-ItemsList-last-hover.png" type="Texture" id=9]
+
+[node name="Control" type="MarginContainer"]
+anchor_left = 1.0
+anchor_top = 0.5
+anchor_right = 1.0
+anchor_bottom = 0.5
+grow_horizontal = 0
+grow_vertical = 2
+size_flags_vertical = 4
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="ListContainer" type="VBoxContainer" parent="."]
+margin_right = 196.0
+margin_bottom = 341.0
+custom_constants/separation = -10
+
+[node name="TextureButtonFirst" type="TextureButton" parent="ListContainer"]
+margin_right = 196.0
+margin_bottom = 81.0
+texture_normal = ExtResource( 2 )
+texture_hover = ExtResource( 8 )
+texture_focused = ExtResource( 8 )
+
+[node name="Label" type="Label" parent="ListContainer/TextureButtonFirst"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+custom_fonts/font = ExtResource( 6 )
+text = "First Entry"
+align = 1
+valign = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="TextureButtonMiddle" type="TextureButton" parent="ListContainer"]
+margin_top = 71.0
+margin_right = 196.0
+margin_bottom = 152.0
+texture_normal = ExtResource( 4 )
+texture_hover = ExtResource( 7 )
+texture_focused = ExtResource( 7 )
+
+[node name="Label" type="Label" parent="ListContainer/TextureButtonMiddle"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+custom_fonts/font = ExtResource( 6 )
+text = "Middle"
+align = 1
+valign = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="TextureButtonLast" type="TextureButton" parent="ListContainer"]
+margin_top = 142.0
+margin_right = 196.0
+margin_bottom = 223.0
+texture_normal = ExtResource( 3 )
+texture_hover = ExtResource( 9 )
+texture_focused = ExtResource( 9 )
+
+[node name="Label" type="Label" parent="ListContainer/TextureButtonLast"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+theme = ExtResource( 5 )
+custom_fonts/font = ExtResource( 6 )
+text = "Last"
+align = 1
+valign = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="HBoxContainer" type="HBoxContainer" parent="ListContainer"]
+margin_top = 213.0
+margin_right = 196.0
+margin_bottom = 341.0
+alignment = 1
+
+[node name="TextureButtonIndice" type="TextureButton" parent="ListContainer/HBoxContainer"]
+margin_left = 34.0
+margin_right = 162.0
+margin_bottom = 128.0
+texture_normal = ExtResource( 1 )
@@ -1,4 +1,4 @@
-[gd_scene load_steps=62 format=2]
+[gd_scene load_steps=64 format=2]

 [ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=1]
 [ext_resource path="res://scenes/levels/warcraft/WarCraft.gd" type="Script" id=2]
@@ -43,6 +43,8 @@
 [ext_resource path="res://assets/props/misc/plane.mesh" type="ArrayMesh" id=41]
 [ext_resource path="res://assets/props/spyglass/sm_spyglass.mesh" type="ArrayMesh" id=42]
 [ext_resource path="res://assets/props/spyglass/materials/MA_spyglass.material" type="Material" id=43]
+[ext_resource path="res://scenes/UI/list_ho/UI_list_ho.tscn" type="PackedScene" id=44]
+[ext_resource path="res://scenes/UI/UI_back.tscn" type="PackedScene" id=45]

 [sub_resource type="PanoramaSky" id=1]
 panorama = ExtResource( 11 )
@@ -752,4 +754,8 @@ collision_mask = 2
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0358186, 0, 0.0109152 )
 shape = SubResource( 18 )

+[node name="Control" parent="." instance=ExtResource( 44 )]
+
+[node name="Control2" parent="." instance=ExtResource( 45 )]
+
 [connection signal="confirmed" from="Dialog/ConfirmEscape" to="." method="_on_ConfirmEscape_confirmed"]