Ogre addeed

Title/Death Screen'.tscn

@@ -42,7 +42,7 @@ texture = ExtResource( 3 )
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 8 )
-volume_db = -25.274
+volume_db = -35.388
 autoplay = true
 [connection signal="pressed" from="TextureButton" to="." method="_on_TextureButton_pressed"]
 [connection signal="pressed" from="TextureButton2" to="." method="_on_TextureButton2_pressed"]

ai/Hell.tscn

@@ -25,7 +25,7 @@ tracks/0/keys = {
 
 [node name="KinematicBody2D" type="KinematicBody2D"]
 collision_layer = 4
-collision_mask = 3
+collision_mask = 11
 script = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
@@ -61,7 +61,7 @@ position = Vector2( -7.56425, -7.87261 )
 texture = ExtResource( 1 )
 centered = false
 hframes = 8
-frame = 3
+frame = 4
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 autoplay = "Devil"

ai/Skeleton Enemy.tscn

@@ -25,7 +25,7 @@ tracks/0/keys = {
 
 [node name="Skeleton Enemy" type="KinematicBody2D"]
 collision_layer = 4
-collision_mask = 3
+collision_mask = 11
 script = ExtResource( 1 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]

characters/Player.tscn

@@ -13,7 +13,7 @@ polygon = PoolVector2Array( -7, 0, -7, -2, -6, -2, -6, -3, -5, -3, -5, -5, -6, -
 
 [sub_resource type="CapsuleShape2D" id=2]
 radius = 6.0
-height = 2.0
+height = 4.0
 
 [sub_resource type="Animation" id=3]
 resource_name = "Idle"
@@ -100,8 +100,7 @@ position = Vector2( 0, 12 )
 occluder = SubResource( 1 )
 
 [node name="WorldCollision" type="CollisionShape2D" parent="."]
-visible = false
-position = Vector2( 0, -7 )
+position = Vector2( 0, -8 )
 shape = SubResource( 2 )
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
@@ -120,6 +119,8 @@ one_shot = true
 [node name="Hitbox" type="Area2D" parent="."]
 visible = false
 position = Vector2( 0, -7 )
+collision_layer = 0
+collision_mask = 0
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hitbox"]
 visible = false

magic/Projectiles/EcoProjectile.tscn

@@ -8,7 +8,11 @@ radius = 5.0
 
 [node name="EcoProjectile" type="KinematicBody2D"]
 collision_layer = 8
+<<<<<<< Updated upstream
 collision_mask = 2
+=======
+collision_mask = 6
+>>>>>>> Stashed changes
 script = ExtResource( 2 )
 
 [node name="Sprite" type="Sprite" parent="."]

magic/Projectiles/PhantomProjectile.tscn

@@ -8,7 +8,11 @@ radius = 5.0
 height = 2.0
 
 [node name="PhantomProjectile" type="KinematicBody2D"]
+<<<<<<< Updated upstream
 collision_layer = 8
+=======
+collision_layer = 2147483656
+>>>>>>> Stashed changes
 collision_mask = 6
 script = ExtResource( 2 )
 

project.godot

@@ -45,7 +45,7 @@ _global_script_class_icons={
 [application]
 
 config/name="Gamejam"
-run/main_scene="res://levels/test.tscn"
+run/main_scene="res://Title/Tilte.tscn"
 config/icon="res://icon.png"
 
 [autoload]
@@ -55,10 +55,6 @@ IconLoaderGithub="*res://addons/github-integration/scripts/IconLoaderGithub.gd"
 RestHandler="*res://addons/github-integration/scripts/RestHandler.gd"
 Globals="*res://script/globals.gd"
 
-[debug]
-
-settings/fps/force_fps=60
-
 [display]
 
 window/size/width=320
@@ -94,32 +90,47 @@ texture={
 "stream": false,
 "svg/scale": 1.0
 }
+wav={
+"compress/mode": 0,
+"edit/loop": true,
+"edit/normalize": false,
+"edit/trim": false,
+"force/8_bit": false,
+"force/max_rate": false,
+"force/max_rate_hz": 44100,
+"force/mono": false
+}
 
 [input]
 
 up={
 "deadzone": 0.5,
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
  ]
 }
 down={
 "deadzone": 0.5,
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
  ]
 }
 left={
 "deadzone": 0.5,
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
  ]
 }
 right={
 "deadzone": 0.5,
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
  ]
 }
 shoot={
 "deadzone": 0.5,
-"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
+"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
  ]
 }
 inventory={
@@ -130,14 +141,11 @@ inventory={
 
 [layer_names]
 
-2d_render/layer_1="Player"
 2d_physics/layer_1="Player"
-2d_render/layer_2="World"
 2d_physics/layer_2="World"
 2d_physics/layer_3="Enemy"
 2d_physics/layer_4="Projectiles"
 
 [rendering]
 
-quality/driver/fallback_to_gles2=true
 environment/default_environment="res://default_env.tres"