Merge branch 'bos_testing' into devRefactor

This commit is contained in:
Jan Schuffenhauer
2020-04-19 18:01:14 +02:00
26 changed files with 638 additions and 246 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=62 format=2]
[gd_scene load_steps=57 format=2]
[ext_resource path="res://Player/Player.gd" type="Script" id=1]
[ext_resource path="res://Player/player.png" type="Texture" id=2]
@@ -12,6 +12,7 @@
[ext_resource path="res://Player/States/Attack.gd" type="Script" id=14]
[ext_resource path="res://Player/PlayerStateMachine.gd" type="Script" id=15]
[ext_resource path="res://Player/States/Roll.gd" type="Script" id=16]
[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=7]
[sub_resource type="CapsuleShape2D" id=1]
radius = 2.15976
@@ -625,8 +626,14 @@ font_data = ExtResource( 6 )
[node name="Player" type="KinematicBody2D"]
script = ExtResource( 1 )
debug = null
ROLL_SPEED = null
FRICTION = 270
title_scene = "res://Menus/TitleScreen/TitleScreen.tscn"
ACCELERATION = null
[node name="Kind" parent="." instance=ExtResource( 7 )]
kind = 1
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.273621, 3.88423 )
@@ -688,7 +695,7 @@ shape = SubResource( 47 )
[node name="Pivot" type="Position2D" parent="."]
position = Vector2( 0, -4.16248 )
rotation = 1.5708
rotation = 3.14159
__meta__ = {
"_gizmo_extents_": 20.0
}