diff options
| author | Malfurious <m@lfurio.us> | 2022-09-12 03:37:12 -0400 |
|---|---|---|
| committer | Malfurious <m@lfurio.us> | 2022-09-12 03:37:12 -0400 |
| commit | 31bc7653eb89688b9890523e1f2b39cc867837fc (patch) | |
| tree | e5f25d2bfcf1205732707c0d89335f5d35d9904c /assets/view_model/ViewModel.tscn | |
| parent | e9baf6602be3efbf5ea566b4e0c80a12c38f475e (diff) | |
| parent | 355dcc29148461dd79815e76fa1a5a887a44ecc3 (diff) | |
| download | project-s-31bc7653eb89688b9890523e1f2b39cc867837fc.tar.gz project-s-31bc7653eb89688b9890523e1f2b39cc867837fc.zip | |
Merge branch 'dynamic-viewmodel'
* dynamic-viewmodel:
ViewModel cycles characters on interact/ping
Decouple ViewModel and the BaseCharacter
Allow dynamic character material
Diffstat (limited to 'assets/view_model/ViewModel.tscn')
| -rw-r--r-- | assets/view_model/ViewModel.tscn | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/assets/view_model/ViewModel.tscn b/assets/view_model/ViewModel.tscn index 3412e91..f6390af 100644 --- a/assets/view_model/ViewModel.tscn +++ b/assets/view_model/ViewModel.tscn @@ -1,13 +1,10 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=2 format=2] -[ext_resource path="res://assets/characters/base_character/BaseCharacter.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/view_model/ViewModel.gd" type="Script" id=2] [node name="ViewModel" type="Spatial"] script = ExtResource( 2 ) -[node name="BaseCharacter" parent="." instance=ExtResource( 1 )] - [node name="Anchor" type="Spatial" parent="."] [node name="SpringArm" type="SpringArm" parent="Anchor"] |