Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022

Assets/Model/Objects/Trashcan.glb.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dtur8jn3vpeuv"
+path="res://.godot/imported/Trashcan.glb-e56c10fe18c841e89ba098a6906f8072.scn"
+
+[deps]
+
+source_file="res://Assets/Model/Objects/Trashcan.glb"
+dest_files=["res://.godot/imported/Trashcan.glb-e56c10fe18c841e89ba098a6906f8072.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+import_script/path=""
+_subresources={
+"materials": {
+"Metall": {
+"use_external/enabled": true,
+"use_external/path": "res://Assets/Textures/CopperNew/CleanCopper.tres"
+}
+}
+}

menu/MainMenu.gd

@@ -1,10 +1,12 @@
 extends Control
 
+var master_bus
 
 # Called when the node enters the scene tree for the first time.
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	$VBoxContainer/Start.grab_focus() # Replace with function body.
+	master_bus = AudioServer.get_bus_index("Master")
 
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
@@ -33,3 +35,12 @@ func _on_full_screen_pressed():
 			if DisplayServer.window_get_mode() != DisplayServer.WINDOW_MODE_WINDOWED:
 				DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
 		
+
+
+func _on_vol_slider_value_changed(value):
+	AudioServer.set_bus_volume_db(master_bus, value)
+	
+	if value == -30:
+		AudioServer.set_bus_mute(master_bus,true)
+	else:
+		AudioServer.set_bus_mute(master_bus, false)

menu/main_menu.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=4 format=3 uid="uid://bsmsdlf5jiukx"]
+[gd_scene load_steps=3 format=3 uid="uid://bsmsdlf5jiukx"]
 
 [ext_resource type="Script" path="res://menu/MainMenu.gd" id="1_hyw8p"]
-[ext_resource type="Script" path="res://menu/VolSlider.gd" id="2_h85ei"]
 [ext_resource type="AudioStream" uid="uid://bmawra1dgi812" path="res://Assets/Sounds/_MUSIC_/MenuGameJamLoop.wav" id="3_ktf88"]
 
 [node name="MainMenu" type="Control"]
@@ -14,6 +13,7 @@ grow_vertical = 2
 script = ExtResource("1_hyw8p")
 
 [node name="ColorRect" type="ColorRect" parent="."]
+layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -22,6 +22,7 @@ grow_vertical = 2
 color = Color(0.513726, 0.403922, 0.27451, 1)
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 1
 anchors_preset = 8
 anchor_left = 0.5
 anchor_top = 0.5
@@ -35,42 +36,30 @@ grow_horizontal = 2
 grow_vertical = 2
 
 [node name="Start" type="Button" parent="VBoxContainer"]
-offset_right = 87.0
+layout_mode = 2
-offset_bottom = 31.0
 text = "Start
 "
 
 [node name="Tutorial" type="Button" parent="VBoxContainer"]
-offset_top = 35.0
+layout_mode = 2
-offset_right = 87.0
-offset_bottom = 66.0
 text = "Tutorial
 "
 
 [node name="Settings" type="Button" parent="VBoxContainer"]
-offset_top = 70.0
+layout_mode = 2
-offset_right = 87.0
-offset_bottom = 101.0
 text = "Volume:"
 
 [node name="VolSlider" type="HSlider" parent="VBoxContainer"]
-offset_top = 105.0
+layout_mode = 2
-offset_right = 87.0
-offset_bottom = 121.0
 min_value = -30.0
 max_value = 0.0
-script = ExtResource("2_h85ei")
 
 [node name="Quit" type="Button" parent="VBoxContainer"]
-offset_top = 125.0
+layout_mode = 2
-offset_right = 87.0
-offset_bottom = 156.0
 text = "Quit"
 
 [node name="FullScreen" type="Button" parent="VBoxContainer"]
-offset_top = 160.0
+layout_mode = 2
-offset_right = 87.0
-offset_bottom = 191.0
 text = "Fullscreen"
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
@@ -80,6 +69,6 @@ autoplay = true
 [connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_start_pressed"]
 [connection signal="pressed" from="VBoxContainer/Tutorial" to="." method="_on_tutorial_pressed"]
 [connection signal="pressed" from="VBoxContainer/Settings" to="." method="_on_settings_pressed"]
-[connection signal="value_changed" from="VBoxContainer/VolSlider" to="VBoxContainer/VolSlider" method="_on_value_changed"]
+[connection signal="value_changed" from="VBoxContainer/VolSlider" to="." method="_on_vol_slider_value_changed"]
 [connection signal="pressed" from="VBoxContainer/Quit" to="." method="_on_quit_pressed"]
 [connection signal="pressed" from="VBoxContainer/FullScreen" to="." method="_on_full_screen_pressed"]