diff --git a/project.godot b/project.godot
index e659a5e0c768127f7110868b2db6fdb362b0b4a0..c7c63e8f2e0c42cc606ff80727638973aed3c6f5 100644
--- a/project.godot
+++ b/project.godot
@@ -41,54 +41,54 @@ fps=false
move_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":87,"unicode":0,"echo":false,"script":null)
+"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":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
move_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)
+"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,"physical_scancode":0,"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
move_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)
+"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,"physical_scancode":0,"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
jump={
"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)
+"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,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
quit={
"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":16777217,"unicode":0,"echo":false,"script":null)
+"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":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
change_fps={
"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":80,"unicode":0,"echo":false,"script":null)
+"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":80,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
attack={
"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":16777221,"unicode":0,"echo":false,"script":null)
+"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":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
menu_pause={
"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":16777217,"unicode":0,"echo":false,"script":null)
+"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":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
hit_self={
"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":79,"unicode":0,"echo":false,"script":null)
+"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":79,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
melee={
"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":47,"unicode":0,"echo":false,"script":null)
+"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":47,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
]
}
diff --git a/src/scenes/Fader.tscn b/src/scenes/Fader.tscn
index d7fc3082f1d30254e29098f66f6d8ea239a04d49..37d4e8498b3d2c9f06bab88272683c1d8b02456f 100644
--- a/src/scenes/Fader.tscn
+++ b/src/scenes/Fader.tscn
@@ -19,7 +19,6 @@ tracks/0/keys = {
[sub_resource type="Animation" id=2]
resource_name = "fade_in"
-length = 0.5
tracks/0/type = "value"
tracks/0/path = NodePath(".:color")
tracks/0/interp = 1
@@ -27,7 +26,7 @@ tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
-"times": PoolRealArray( 0, 0.5 ),
+"times": PoolRealArray( 0, 1 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ Color( 0, 0, 0, 1 ), Color( 0, 0, 0, 0 ) ]
@@ -35,7 +34,6 @@ tracks/0/keys = {
[sub_resource type="Animation" id=3]
resource_name = "fade_out"
-length = 0.5
tracks/0/type = "value"
tracks/0/path = NodePath(".:color")
tracks/0/interp = 1
@@ -43,7 +41,7 @@ tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
-"times": PoolRealArray( 0, 0.5 ),
+"times": PoolRealArray( 0, 1 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ Color( 0, 0, 0, 0 ), Color( 0, 0, 0, 1 ) ]
diff --git a/src/scenes/Game.tscn b/src/scenes/Game.tscn
index 8966e60028b796f25d54f0937fc4514b6e69f881..90d8faa22876f4b7ab4beff0ef721fd5e572c8a6 100644
--- a/src/scenes/Game.tscn
+++ b/src/scenes/Game.tscn
@@ -1,12 +1,14 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
[ext_resource path="res://src/assets/sounds/maintheme.wav" type="AudioStream" id=1]
+[ext_resource path="res://src/scenes/Fader.tscn" type="PackedScene" id=2]
[sub_resource type="GDScript" id=1]
script/source = "extends Node2D
onready var in_game = $InGame
onready var camera = $Camera2D
+onready var fader = $CanvasLayer/Fader
var player = null
var level = null
@@ -16,7 +18,8 @@ func _ready():
connect_to_doors()
check_for_door()
put_camera_on_player()
- pass
+ fader.fade_in()
+
func add_level():
print(\"loading: \" + str(\"res://src/scenes/levels/Level\" , G.next_level_number , \".tscn\"))
@@ -35,6 +38,7 @@ func connect_to_doors():
child.connect(\"enter_door\", self, \"_on_enter_door\")
func _on_enter_door():
+ var animation_player = fader.fade_out()
get_tree().reload_current_scene()
func check_for_door():
@@ -50,11 +54,11 @@ script = SubResource( 1 )
[node name="InGame" type="Node2D" parent="."]
-[node name="Camera2D" type="Camera2D" parent="."]
-offset = Vector2( 0, -200 )
-current = true
-
[node name="musik" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 1 )
volume_db = -15.0
autoplay = true
+
+[node name="CanvasLayer" type="CanvasLayer" parent="."]
+
+[node name="Fader" parent="CanvasLayer" instance=ExtResource( 2 )]
diff --git a/src/scenes/Menu.tscn b/src/scenes/Menu.tscn
index cf633269b60fb80ef82d533a3488bcf2a87b308e..4c0108370d53ce8c0f0e2700b1834c10fc1c659a 100644
--- a/src/scenes/Menu.tscn
+++ b/src/scenes/Menu.tscn
@@ -17,6 +17,13 @@ font_data = ExtResource( 2 )
[sub_resource type="Theme" id=2]
+[sub_resource type="DynamicFont" id=6]
+size = 32
+outline_size = 4
+outline_color = Color( 0, 0, 0, 1 )
+extra_spacing_bottom = 6
+font_data = ExtResource( 2 )
+
[sub_resource type="StyleBoxTexture" id=3]
texture = ExtResource( 5 )
region_rect = Rect2( 0, 0, 361, 101 )
@@ -29,11 +36,12 @@ region_rect = Rect2( 0, 0, 361, 101 )
texture = ExtResource( 3 )
region_rect = Rect2( 0, 0, 361, 101 )
-[sub_resource type="DynamicFont" id=6]
-size = 32
+[sub_resource type="DynamicFont" id=10]
+size = 22
outline_size = 4
outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_bottom = 6
+extra_spacing_bottom = 3
+extra_spacing_char = 2
font_data = ExtResource( 2 )
[sub_resource type="StyleBoxTexture" id=7]
@@ -48,12 +56,12 @@ region_rect = Rect2( 0, 0, 361, 101 )
texture = ExtResource( 3 )
region_rect = Rect2( 0, 0, 361, 101 )
-[sub_resource type="DynamicFont" id=10]
-size = 22
+[sub_resource type="DynamicFont" id=14]
+size = 32
outline_size = 4
outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_bottom = 3
-extra_spacing_char = 2
+extra_spacing_bottom = 5
+extra_spacing_char = 5
font_data = ExtResource( 2 )
[sub_resource type="StyleBoxTexture" id=11]
@@ -68,14 +76,6 @@ region_rect = Rect2( 0, 0, 361, 101 )
texture = ExtResource( 3 )
region_rect = Rect2( 0, 0, 361, 101 )
-[sub_resource type="DynamicFont" id=14]
-size = 32
-outline_size = 4
-outline_color = Color( 0, 0, 0, 1 )
-extra_spacing_bottom = 5
-extra_spacing_char = 5
-font_data = ExtResource( 2 )
-
[sub_resource type="AtlasTexture" id=15]
flags = 4
atlas = ExtResource( 4 )
@@ -139,10 +139,10 @@ margin_top = -108.0
margin_right = 449.0
margin_bottom = -40.0
theme = SubResource( 2 )
+custom_fonts/font = SubResource( 6 )
custom_styles/hover = SubResource( 3 )
custom_styles/pressed = SubResource( 4 )
custom_styles/normal = SubResource( 5 )
-custom_fonts/font = SubResource( 6 )
text = "START"
__meta__ = {
"_edit_use_anchors_": false
@@ -153,10 +153,10 @@ margin_left = 130.0
margin_top = 384.0
margin_right = 450.0
margin_bottom = 448.0
+custom_fonts/font = SubResource( 10 )
custom_styles/hover = SubResource( 7 )
custom_styles/pressed = SubResource( 8 )
custom_styles/normal = SubResource( 9 )
-custom_fonts/font = SubResource( 10 )
text = "EINSTELLUNGEN"
__meta__ = {
"_edit_use_anchors_": false
@@ -167,10 +167,10 @@ margin_left = 128.0
margin_top = 512.0
margin_right = 448.0
margin_bottom = 576.0
+custom_fonts/font = SubResource( 14 )
custom_styles/hover = SubResource( 11 )
custom_styles/pressed = SubResource( 12 )
custom_styles/normal = SubResource( 13 )
-custom_fonts/font = SubResource( 14 )
text = "ENDE"
__meta__ = {
"_edit_use_anchors_": false