kookroach/SemesterGameJam2022
1
0
Fork 0
mirror of https://github.com/PfandBoss/SemesterGameJam2022.git synced 2025-11-12 04:16:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Lukas Moungos
2022-12-10 23:31:25 +01:00
parent 7c96139422 cd6cd181d2
commit 8ab2f8d3ba
11 changed files with 92 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Nodes/game.tscn
View File

@@ -1,12 +1,22 @@
<<<<<<< HEAD
[gd_scene load_steps=8 format=3 uid="uid://db0pxwq1hvs45"]
=======
[gd_scene load_steps=10 format=3 uid="uid://db0pxwq1hvs45"]
>>>>>>> cd6cd181d2f12c2b4200ebdaf38efa2858e2802d
[ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_iox18"]
[ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="2_61aog"]
[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_v8535"]
[ext_resource type="PackedScene" path="res://Nodes/light_setup.tscn" id="2_v8535"]
[ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="3_0be5n"]
[ext_resource type="PackedScene" uid="uid://cys06pnxfjl2m" path="res://Nodes/UI.tscn" id="4_kxuy0"]
[ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="4_lmu0s"]
<<<<<<< HEAD
[ext_resource type="PackedScene" uid="uid://bw3yluhr72n2t" path="res://Nodes/InfiniteScroller.tscn" id="7_yyvws"]
=======
[ext_resource type="AudioStream" uid="uid://c5jhukuk8r3mf" path="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav" id="7_0yxka"]
[ext_resource type="AudioStream" uid="uid://n4ynf7hg2pcl" path="res://Assets/Sounds/_SOUNDFX_/GleiseLoop.wav" id="8_4y7wx"]
[ext_resource type="AudioStream" uid="uid://dovvnflvxtqpi" path="res://Assets/Sounds/_SOUNDFX_/WindLoop.wav" id="9_ip7lg"]
>>>>>>> cd6cd181d2f12c2b4200ebdaf38efa2858e2802d
[node name="Game" type="Node"]
script = ExtResource("1_iox18")
@@ -34,4 +44,21 @@ visible = false
[node name="Control" parent="." instance=ExtResource("4_kxuy0")]
<<<<<<< HEAD
[node name="InfiniteScroller" parent="." instance=ExtResource("7_yyvws")]
=======
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource("7_0yxka")
volume_db = -27.238
autoplay = true
[node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="."]
stream = ExtResource("8_4y7wx")
volume_db = -10.0
autoplay = true
[node name="AudioStreamPlayer3" type="AudioStreamPlayer" parent="."]
stream = ExtResource("9_ip7lg")
volume_db = -2.476
autoplay = true
>>>>>>> cd6cd181d2f12c2b4200ebdaf38efa2858e2802d