Merge remote-tracking branch 'origin/main'

outfrost · Apr 26, 2021 · 99027ac · 99027ac
2 parents 4251833 + 45c6e6d
commit 99027ac
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 11 deletions.
diff --git a/character/Heart_Empty.tres b/character/Heart_Empty.tres
@@ -0,0 +1,7 @@
+[gd_resource type="AtlasTexture" load_steps=2 format=2]
+
+[ext_resource path="res://character/orbhealthbar.png" type="Texture" id=1]
+
+[resource]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 31, 16, 16 )
diff --git a/character/Heart_Full.tres b/character/Heart_Full.tres
@@ -1,3 +1,7 @@
-[gd_resource type="AtlasTexture" format=2]
+[gd_resource type="AtlasTexture" load_steps=2 format=2]
+
+[ext_resource path="res://character/orbhealthbar.png" type="Texture" id=1]
 
 [resource]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 0, 16, 16 )
diff --git a/character/Heart_Half.tres b/character/Heart_Half.tres
@@ -0,0 +1,7 @@
+[gd_resource type="AtlasTexture" load_steps=2 format=2]
+
+[ext_resource path="res://character/orbhealthbar.png" type="Texture" id=1]
+
+[resource]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 16, 16, 16 )
diff --git a/character/PlayerCharacter.tscn b/character/PlayerCharacter.tscn
@@ -132,45 +132,45 @@ bus = "Effects"
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
 [node name="TextureRect" type="TextureRect" parent="CanvasLayer"]
-margin_left = 48.0
+margin_left = 16.0
 margin_top = 16.0
-margin_right = 80.0
+margin_right = 48.0
 margin_bottom = 48.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="TextureRect2" type="TextureRect" parent="CanvasLayer"]
-margin_left = 80.0
+margin_left = 48.0
 margin_top = 16.0
-margin_right = 112.0
+margin_right = 80.0
 margin_bottom = 48.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="TextureRect3" type="TextureRect" parent="CanvasLayer"]
-margin_left = 112.0
+margin_left = 80.0
 margin_top = 16.0
-margin_right = 144.0
+margin_right = 112.0
 margin_bottom = 48.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="TextureRect4" type="TextureRect" parent="CanvasLayer"]
-margin_left = 144.0
+margin_left = 112.0
 margin_top = 16.0
-margin_right = 176.0
+margin_right = 144.0
 margin_bottom = 48.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="TextureRect5" type="TextureRect" parent="CanvasLayer"]
-margin_left = 176.0
+margin_left = 144.0
 margin_top = 16.0
-margin_right = 208.0
+margin_right = 176.0
 margin_bottom = 48.0
 __meta__ = {
 "_edit_use_anchors_": false