diff options
Diffstat (limited to 'scenes')
| -rw-r--r-- | scenes/attach_point.tscn | 4 | ||||
| -rw-r--r-- | scenes/enemy.tscn | 2 | ||||
| -rw-r--r-- | scenes/gui.tscn | 4 | ||||
| -rw-r--r-- | scenes/path.tscn | 2 | ||||
| -rw-r--r-- | scenes/projectiles/bullet.tscn | 2 | ||||
| -rw-r--r-- | scenes/turret.tscn | 2 |
6 files changed, 12 insertions, 4 deletions
diff --git a/scenes/attach_point.tscn b/scenes/attach_point.tscn index ef5434e..51e224c 100644 --- a/scenes/attach_point.tscn +++ b/scenes/attach_point.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://models/attach.obj" type="ArrayMesh" id=1] +[ext_resource path="res://assets/models/attach.obj" type="ArrayMesh" id=1] [sub_resource type="ConvexPolygonShape" id=10] points = PoolVector3Array( 0, 0, -0.2, -0.0390368, 0, -0.196163, 0, 0.022124, -0.2, 0.0389977, 0, -0.196163, -0.0390368, 0.022124, -0.196163, -0.0765466, 0, -0.184808, 0.0389977, 0.022124, -0.196163, 0.0765074, 0, -0.184808, -0.0765466, 0.022124, -0.184808, -0.11112, 0, -0.166327, 0.0765074, 0.022124, -0.184808, 0.111081, 0, -0.166327, -0.11112, 0.022124, -0.166327, -0.141425, 0, -0.141425, 0.111081, 0.022124, -0.166327, 0.141386, 0, -0.141425, -0.141425, 0.022124, -0.141425, -0.166327, 0, -0.11112, 0.141386, 0.022124, -0.141425, 0.166288, 0, -0.11112, -0.166327, 0.022124, -0.11112, -0.184808, 0, -0.0765466, 0.166288, 0.022124, -0.11112, 0.184769, 0, -0.0765466, -0.184808, 0.022124, -0.0765466, -0.196163, 0, -0.0390368, 0.184769, 0.022124, -0.0765466, 0.196124, 0, -0.0390368, -0.196163, 0.022124, -0.0390368, -0.2, 0, 0, 0.196124, 0.022124, -0.0390368, 0.2, 0, 0, -0.2, 0.022124, 0, -0.196163, 0, 0.0389977, 0.2, 0.022124, 0, 0.196124, 0, 0.0389977, -0.196163, 0.022124, 0.0389977, -0.184808, 0, 0.0765074, 0.196124, 0.022124, 0.0389977, 0.184769, 0, 0.0765074, -0.184808, 0.022124, 0.0765074, -0.166327, 0, 0.111081, 0.184769, 0.022124, 0.0765074, 0.166288, 0, 0.111081, -0.166327, 0.022124, 0.111081, -0.141425, 0, 0.141386, 0.166288, 0.022124, 0.111081, 0.141386, 0, 0.141386, -0.141425, 0.022124, 0.141386, -0.11112, 0, 0.166288, 0.141386, 0.022124, 0.141386, 0.111081, 0, 0.166288, -0.11112, 0.022124, 0.166288, -0.0765466, 0, 0.184769, 0.111081, 0.022124, 0.166288, 0.0765074, 0, 0.184769, -0.0765466, 0.022124, 0.184769, -0.0390368, 0, 0.196124, 0.0765074, 0.022124, 0.184769, 0.0389977, 0, 0.196124, -0.0390368, 0.022124, 0.196124, 0, 0, 0.2, 0.0389977, 0.022124, 0.196124, 0, 0.022124, 0.2 ) @@ -12,6 +12,8 @@ skeleton = NodePath("") material/0 = null [node name="StaticBody" type="StaticBody" parent="."] +collision_layer = 4 +collision_mask = 4 [node name="CollisionShape2" type="CollisionShape" parent="StaticBody"] shape = SubResource( 10 ) diff --git a/scenes/enemy.tscn b/scenes/enemy.tscn index ea40f17..f19aab9 100644 --- a/scenes/enemy.tscn +++ b/scenes/enemy.tscn @@ -5,6 +5,8 @@ [node name="enemy" type="Spatial" groups=["enemies"]] [node name="KinematicBody" type="KinematicBody" parent="."] +collision_layer = 8 +collision_mask = 8 [node name="CollisionShape" type="CollisionShape" parent="KinematicBody"] transform = Transform( 0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0, 0, 0 ) diff --git a/scenes/gui.tscn b/scenes/gui.tscn index 1ca7631..03383b0 100644 --- a/scenes/gui.tscn +++ b/scenes/gui.tscn @@ -125,7 +125,7 @@ margin_left = 139.0 margin_top = 7.0 margin_right = 159.4 margin_bottom = 31.4 -custom_colors/font_color = Color( 0, 0.203922, 1, 1 ) +custom_colors/font_color = Color( 1, 0, 0, 1 ) text = "0a" valign = 1 __meta__ = { @@ -137,7 +137,7 @@ margin_left = 162.0 margin_top = 7.0 margin_right = 182.4 margin_bottom = 31.4 -custom_colors/font_color = Color( 1, 0, 0, 1 ) +custom_colors/font_color = Color( 0, 0.619608, 1, 1 ) text = "0d" valign = 1 __meta__ = { diff --git a/scenes/path.tscn b/scenes/path.tscn index cd46718..4c3a028 100644 --- a/scenes/path.tscn +++ b/scenes/path.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://models/pointer.obj" type="ArrayMesh" id=1] +[ext_resource path="res://assets/models/pointer.obj" type="ArrayMesh" id=1] [sub_resource type="SpatialMaterial" id=16] albedo_color = Color( 1, 0, 0, 1 ) diff --git a/scenes/projectiles/bullet.tscn b/scenes/projectiles/bullet.tscn index bb49525..7338992 100644 --- a/scenes/projectiles/bullet.tscn +++ b/scenes/projectiles/bullet.tscn @@ -10,6 +10,8 @@ script = ExtResource( 1 ) [node name="Area" type="Area" parent="."] +collision_layer = 13 +collision_mask = 13 [node name="CollisionShape" type="CollisionShape" parent="Area"] transform = Transform( 0.03, 0, 0, 0, 0.03, 0, 0, 0, 0.03, 0, 0, 0 ) diff --git a/scenes/turret.tscn b/scenes/turret.tscn index c71f69f..f4837af 100644 --- a/scenes/turret.tscn +++ b/scenes/turret.tscn @@ -11,6 +11,8 @@ radius = 0.95 script = ExtResource( 1 ) [node name="turret" type="StaticBody" parent="." groups=["turrets"]] +collision_layer = 4 +collision_mask = 4 [node name="CollisionShapeBox" type="CollisionShape" parent="turret"] transform = Transform( 0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0, 0.25, 0 ) |