1
0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2025-02-04 12:28:35 +00:00

Merge branch 'main' into game-logic

This commit is contained in:
JohnBreaux
2021-11-12 02:10:34 -06:00
committed by GitHub
7 changed files with 178 additions and 224 deletions

View File

@@ -8,6 +8,7 @@ extents = Vector2( 16, 32 )
[node name="2Ship" type="RigidBody2D"]
input_pickable = true
gravity_scale = 0.0
custom_integrator = true
script = ExtResource( 1 )
@@ -16,5 +17,11 @@ position = Vector2( 0, 16 )
texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 16.25 )
position = Vector2( 0.125, 16 )
shape = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
position = Vector2( 0.125, 16 )
shape = SubResource( 1 )

View File

@@ -8,6 +8,7 @@ extents = Vector2( 16, 48 )
[node name="3ShipB" type="RigidBody2D"]
input_pickable = true
gravity_scale = 0.0
custom_integrator = true
script = ExtResource( 1 )
@@ -16,3 +17,8 @@ texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
shape = SubResource( 1 )

View File

@@ -8,6 +8,7 @@ extents = Vector2( 16, 48 )
[node name="3ShipA" type="RigidBody2D"]
input_pickable = true
gravity_scale = 0.0
custom_integrator = true
script = ExtResource( 1 )
@@ -16,3 +17,8 @@ texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
shape = SubResource( 1 )

View File

@@ -8,6 +8,7 @@ extents = Vector2( 16, 64 )
[node name="4Ship" type="RigidBody2D"]
input_pickable = true
gravity_scale = 0.0
custom_integrator = true
script = ExtResource( 1 )
@@ -18,3 +19,9 @@ texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 1, 15 )
shape = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
position = Vector2( 1, 15 )
shape = SubResource( 1 )

View File

@@ -15,4 +15,10 @@ script = ExtResource( 1 )
texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
visible = false
shape = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
shape = SubResource( 1 )