Proyecto-Titulo/alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge branch 'develop' into feature/enemies

Browse Source 
# Conflicts:
#	godot/characters/player/Player.tscn
This commit is contained in:
Chris Cromer
2022-07-27 00:08:25 -04:00
parent 18a7cac068 8cfa1d5cce
commit f8f1210e61
17 changed files with 198 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
godot/characters/player/Player.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=2]
[gd_scene load_steps=10 format=2]
[ext_resource path="res://characters/player/sprites/green.tres" type="SpriteFrames" id=1]
[ext_resource path="res://characters/player/states/Idle.gdns" type="Script" id=2]
@@ -7,6 +7,7 @@
[ext_resource path="res://characters/player/Player.gdns" type="Script" id=5]
[ext_resource path="res://characters/player/states/Jump.gdns" type="Script" id=6]
[ext_resource path="res://characters/player/states/Fall.gdns" type="Script" id=7]
[ext_resource path="res://assets/sounds/jump.wav" type="AudioStream" id=8]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 7, 12 )
@@ -22,7 +23,7 @@ centered = false
flip_h = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 12.5, 12.5 )
position = Vector2( 12, 12 )
shape = SubResource( 1 )
[node name="StateMachine" type="Node" parent="."]
@@ -46,3 +47,8 @@ position = Vector2( 12, 0 )
enabled = true
cast_to = Vector2( 0, 32 )
collision_mask = 24
[node name="Sounds" type="Node" parent="."]
[node name="Jump" type="AudioStreamPlayer" parent="Sounds"]
stream = ExtResource( 8 )