Tricks for merging without hard conflicts

Chimpenseurs · Apr 29, 2020 · a37cacc · a37cacc
1 parent 6c0a514
commit a37cacc
Show file tree

Hide file tree

Showing 8 changed files with 1,483 additions and 1,443 deletions.
diff --git a/AnimationPlayerDoggo.tscn b/AnimationPlayerDoggo.tscn
diff --git a/AnimationPlayerGuy.tscn b/AnimationPlayerGuy.tscn
diff --git a/CollisionShape2DDoggo.tscn b/CollisionShape2DDoggo.tscn
@@ -0,0 +1,8 @@
+[gd_scene load_steps=2 format=2]
+
+[sub_resource type="CapsuleShape2D" id=1]
+
+[node name="CollisionShape2D" type="CollisionShape2D"]
+position = Vector2( 3.25269, 13.7827 )
+rotation = 1.5708
+shape = SubResource( 1 )
diff --git a/CollisionShape2DGuy.tscn b/CollisionShape2DGuy.tscn
@@ -0,0 +1,7 @@
+[gd_scene load_steps=2 format=2]
+
+[sub_resource type="CircleShape2D" id=1]
+
+[node name="CollisionShape2D" type="CollisionShape2D"]
+position = Vector2( 0.718838, 24.6683 )
+shape = SubResource( 1 )