diff options
| author | Malfurious <m@lfurio.us> | 2022-07-17 21:11:44 -0400 |
|---|---|---|
| committer | Malfurious <m@lfurio.us> | 2022-07-17 21:11:44 -0400 |
| commit | 4a9ff23bb13bfe5c182222fdb4314afc4f5c1fa8 (patch) | |
| tree | 78c01d91420317c472afc9111b8d3e1d9ed8e085 /assets/maps/misc/dev_plane | |
| parent | 8c70036b4396fc909f0acf22e76d6f4da185a0b7 (diff) | |
| parent | d9f1c33887761b8bcbc143e6d4582d634a9fd6ce (diff) | |
| download | project-s-4a9ff23bb13bfe5c182222fdb4314afc4f5c1fa8.tar.gz project-s-4a9ff23bb13bfe5c182222fdb4314afc4f5c1fa8.zip | |
Merge branch 'initial-character-behavior'
* initial-character-behavior:
Add view model implementing character movement
Define basic key bindings
Add placeholder character object
Add generic weapon
Diffstat (limited to '')
| -rw-r--r-- | assets/maps/misc/dev_plane/DevPlane.tscn | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/assets/maps/misc/dev_plane/DevPlane.tscn b/assets/maps/misc/dev_plane/DevPlane.tscn index 228e30b..a17a112 100644 --- a/assets/maps/misc/dev_plane/DevPlane.tscn +++ b/assets/maps/misc/dev_plane/DevPlane.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://assets/maps/misc/dev_plane/tile_color.png" type="Texture" id=1] +[ext_resource path="res://assets/view_model/ViewModel.tscn" type="PackedScene" id=2] [sub_resource type="SpatialMaterial" id=6] albedo_texture = ExtResource( 1 ) @@ -29,8 +30,8 @@ transform = Transform( -4.37114e-08, -0.292372, 0.956305, 0, 0.956305, 0.292372, shadow_enabled = true directional_shadow_blend_splits = true -[node name="Camera" type="Camera" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.70758, 7.29223 ) +[node name="ViewModel" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 12 ) [node name="Geometry" type="Spatial" parent="."] |