Merge branch 'main' of http://meowo.cc:3000/meowo/ld54

src/scenes/game/Game.tscn

@@ -1,14 +1,11 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://src/scenes/menu/background/background.png" type="Texture" id=1]
 [ext_resource path="res://src/scenes/game/sprites/background_houses.png" type="Texture" id=2]
 [ext_resource path="res://src/scenes/game/spell_holder.gd" type="Script" id=3]
 [ext_resource path="res://res/fonts/silkscreen/Silkscreen-Regular.ttf" type="DynamicFontData" id=4]
 [ext_resource path="res://src/models/player/Player.tscn" type="PackedScene" id=5]
-[ext_resource path="res://src/scenes/game/sprites/health/3.png" type="Texture" id=6]
-[ext_resource path="res://src/scenes/game/sprites/health/1.png" type="Texture" id=7]
-[ext_resource path="res://src/scenes/game/sprites/health/2.png" type="Texture" id=8]
-[ext_resource path="res://src/scenes/game/sprites/health/0.png" type="Texture" id=9]
+[ext_resource path="res://src/scenes/game/sprites/ui_background.png" type="Texture" id=6]
 
 [sub_resource type="RectangleShape2D" id=2]
 extents = Vector2( 10, 60 )
@@ -69,6 +66,13 @@ position = Vector2( 46, 42 )
 margin_right = 40.0
 margin_bottom = 40.0
 
+[node name="UIBackground" type="TextureRect" parent="UI"]
+margin_top = 120.0
+margin_right = 320.0
+margin_bottom = 180.0
+texture = ExtResource( 6 )
+expand = true
+
 [node name="SpellHolder" type="Control" parent="UI"]
 margin_left = 120.0
 margin_top = 145.0

src/scenes/game/sprites/ui_background.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/ui_background.png-030d1f5334fbad3eaea2cac1b65bbd0c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://src/scenes/game/sprites/ui_background.png"
+dest_files=[ "res://.import/ui_background.png-030d1f5334fbad3eaea2cac1b65bbd0c.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
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0