Merge branch 'master' of ssh://play.qtechofficial.com:9940/funnymemellama/funnymemellama

bomb-has-been-defused-csgo-sound-effect.mp3.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://7s6wb487kv2d"
-path="res://.godot/imported/bomb-has-been-defused-csgo-sound-effect.mp3-332b53da130915533f660c596948e2ca.mp3str"
-
-[deps]
-
-source_file="res://bomb-has-been-defused-csgo-sound-effect.mp3"
-dest_files=["res://.godot/imported/bomb-has-been-defused-csgo-sound-effect.mp3-332b53da130915533f660c596948e2ca.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

devworld.tscn

@@ -1,11 +1,12 @@
-[gd_scene load_steps=11 format=3 uid="uid://bp1fooevcl4lk"]
+[gd_scene load_steps=12 format=3 uid="uid://bp1fooevcl4lk"]
 
 [ext_resource type="ArrayMesh" uid="uid://cfm21e1rmsbvt" path="res://assets/maps/devworld.obj" id="1_67d5q"]
 [ext_resource type="PackedScene" uid="uid://wl1n3y8mcq0x" path="res://Commentary.tscn" id="2_3gk04"]
-[ext_resource type="AudioStream" uid="uid://d100ilqihkimr" path="res://whatareyouwatchingbro.mp3" id="3_qy4vp"]
+[ext_resource type="AudioStream" uid="uid://blhm5fmqxxyjb" path="res://assets/sounds/commentarynodes/this_is_an_other_commentary_node.ogg" id="3_57rk3"]
-[ext_resource type="AudioStream" uid="uid://7s6wb487kv2d" path="res://bomb-has-been-defused-csgo-sound-effect.mp3" id="3_sy6mw"]
+[ext_resource type="AudioStream" uid="uid://eycsn6ww81e3" path="res://assets/sounds/commentarynodes/thisisacommentarynode.ogg" id="4_qboc2"]
 [ext_resource type="PackedScene" uid="uid://ce7nfed54mwps" path="res://Button.tscn" id="5_57sxr"]
 [ext_resource type="PackedScene" uid="uid://cp4rwojl3c3y3" path="res://test.tscn" id="6_8wwor"]
+[ext_resource type="AudioStream" uid="uid://kbklqaa8yx0s" path="res://assets/sounds/button/buttonin01.ogg" id="6_dw4i0"]
 [ext_resource type="PackedScene" uid="uid://cjn7bvtws2uip" path="res://Door.tscn" id="7_0wker"]
 
 [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_fwixm"]
@@ -29,14 +30,14 @@ shape = SubResource("ConcavePolygonShape3D_fwixm")
 
 [node name="Commentary" parent="." instance=ExtResource("2_3gk04")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.125, -0.25, 0.496153)
-sound = ExtResource("3_sy6mw")
+sound = ExtResource("3_57rk3")
 volume = -20.0
 capture_radius = 5.0
 low_speed = 2.0
 
 [node name="Commentary2" parent="." instance=ExtResource("2_3gk04")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.06073, -0.25, 3.2)
-sound = ExtResource("3_qy4vp")
+sound = ExtResource("4_qboc2")
 volume = -30.0
 
 [node name="Button" parent="." instance=ExtResource("5_57sxr")]
@@ -44,7 +45,7 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -20.48
 momentary = true
 released_material = SubResource("StandardMaterial3D_pr3ys")
 pressed_material = SubResource("StandardMaterial3D_tselo")
-sound = ExtResource("3_sy6mw")
+sound = ExtResource("6_dw4i0")
 volume = -10.0
 
 [node name="CardboardKreb" parent="." instance=ExtResource("6_8wwor")]

whatareyouwatchingbro.mp3.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://d100ilqihkimr"
-path="res://.godot/imported/whatareyouwatchingbro.mp3-4ec59e2251ee0b7f5b891fae8fab835b.mp3str"
-
-[deps]
-
-source_file="res://whatareyouwatchingbro.mp3"
-dest_files=["res://.godot/imported/whatareyouwatchingbro.mp3-4ec59e2251ee0b7f5b891fae8fab835b.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4