Merge branch 'master' of https://gitlab.hexaquo.at/mga/retrace

# Conflicts:
#	Level/OutsideWorld.tscn

Level/Labyrinth.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=15 format=2]
 
 [ext_resource path="res://Level/Labyrinth/LabyrinthCorridorTrue.tscn" type="PackedScene" id=1]
 [ext_resource path="res://Level/Labyrinth/LabyrinthCrossing.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Level/Labyrinth/LabyrinthCorridorMasked.tscn" type="PackedScene" id=3]
 [ext_resource path="res://Characters/Player/Player.tscn" type="PackedScene" id=4]
+[ext_resource path="res://Resources/Audio/LabyrinthMusic/labyrinth.wav" type="AudioStream" id=5]
 
 [sub_resource type="PlaneMesh" id=1]
 size = Vector2( 130, 8 )
@@ -270,3 +271,7 @@ shape = SubResource( 8 )
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource( 9 )
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 5 )
+autoplay = true

Level/World.tscn

@@ -57,15 +57,12 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, 7 )
 
 [node name="Meldewesen2" parent="Enemies" instance=ExtResource( 2 )]
 transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -3.88156, 0, 14.5424 )
-_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility")
 
 [node name="Meldewesen3" parent="Enemies" instance=ExtResource( 2 )]
 transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 58.4396, 0, -200.412 )
-_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility")
 
 [node name="Meldewesen4" parent="Enemies" instance=ExtResource( 2 )]
 transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -13.0581, 0, -67.0506 )
-_visibility_path = NodePath("../../Enemies/Meldewesen2/Visibility")
 
 [node name="Collectibles" type="Spatial" parent="."]
 transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 15.0831, 1.63203, 13.0809 )
@@ -124,7 +121,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.127018, 0, 0.00287628 )
 curve = SubResource( 2 )
 
 [node name="PathFollow" type="PathFollow" parent="WorkerSpawner/Path"]
-transform = Transform( -0.998276, 0.00481672, 0.0584792, 0.0049628, 0.999985, 0.00235273, -0.0584669, 0.0026389, -0.998284, -15.7672, 0.284373, -190.888 )
+transform = Transform( 0.996943, 0.00214803, 0.0780964, -0.00218668, 0.999998, 0.000409653, -0.0780961, -0.000579182, 0.996945, -15.7672, 0.284373, -190.888 )
 offset = 380.29
 
 [node name="Worker" parent="WorkerSpawner/Path/PathFollow" instance=ExtResource( 5 )]
@@ -144,7 +141,6 @@ transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 13, 0
 transform = Transform( 0.8, 0, 0, 0, 1, 0, 0, 0, 1, 14.9197, 0, 89.983 )
 
 [node name="BuildingBlocks" type="Spatial" parent="NavigationMeshInstance"]
-editor/display_folded = true
 
 [node name="BuildingBlock" parent="NavigationMeshInstance/BuildingBlocks" instance=ExtResource( 8 )]
 transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -13, 0, -13 )

Resources/Audio/LabyrinthMusic/labyrinth.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/labyrinth.wav-d24c5bfa36f10e3712debbaef67c2185.sample"
+
+[deps]
+
+source_file="res://Resources/Audio/LabyrinthMusic/labyrinth.wav"
+dest_files=[ "res://.import/labyrinth.wav-d24c5bfa36f10e3712debbaef67c2185.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=true
+edit/normalize=true
+edit/loop=true
+compress/mode=0