Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main

gymkhana/characters/mark/mark.tscn

@@ -551,9 +551,6 @@ shape = SubResource( 32 )
 [node name="debug" type="Label" parent="."]
 margin_right = 40.0
 margin_bottom = 14.0
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="dialog_position" type="Position2D" parent="."]
 position = Vector2( 0, -320 )

gymkhana/characters/mark/mark_think.tscn

@@ -4,34 +4,42 @@
 [ext_resource path="res://gymkhana/characters/mark/png/mark_thinking.png" type="Texture" id=2]
 
 [sub_resource type="AtlasTexture" id=1]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=2]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 189, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=3]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 162, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=4]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 135, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=5]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 108, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=6]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 81, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=7]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 54, 0, 27, 27 )
 
 [sub_resource type="AtlasTexture" id=8]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 27, 0, 27, 27 )
 
@@ -54,5 +62,5 @@ texture = ExtResource( 2 )
 position = Vector2( 54, 0 )
 scale = Vector2( 4, 4 )
 frames = SubResource( 9 )
-frame = 6
+frame = 7
 playing = true