diff --git a/Assets/Temp Music/awesomeness.wav b/Assets/Temp Music/awesomeness.wav new file mode 100644 index 0000000..0ea8332 Binary files /dev/null and b/Assets/Temp Music/awesomeness.wav differ diff --git a/Assets/Temp Music/awesomeness.wav.import b/Assets/Temp Music/awesomeness.wav.import new file mode 100644 index 0000000..ef0f2c9 --- /dev/null +++ b/Assets/Temp Music/awesomeness.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dpbyjnyg765r7" +path="res://.godot/imported/awesomeness.wav-59f1c1423f54ec46cf96ddbcf1a5f126.sample" + +[deps] + +source_file="res://Assets/Temp Music/awesomeness.wav" +dest_files=["res://.godot/imported/awesomeness.wav-59f1c1423f54ec46cf96ddbcf1a5f126.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/default_bus_layout.tres b/Assets/Temp Music/default_bus_layout.tres similarity index 100% rename from default_bus_layout.tres rename to Assets/Temp Music/default_bus_layout.tres diff --git a/Assets/omw-to-beat-the-big-bad.wav b/Assets/Temp Music/omw-to-beat-the-big-bad.wav similarity index 100% rename from Assets/omw-to-beat-the-big-bad.wav rename to Assets/Temp Music/omw-to-beat-the-big-bad.wav diff --git a/Assets/omw-to-beat-the-big-bad.wav.import b/Assets/Temp Music/omw-to-beat-the-big-bad.wav.import similarity index 50% rename from Assets/omw-to-beat-the-big-bad.wav.import rename to Assets/Temp Music/omw-to-beat-the-big-bad.wav.import index efd86c2..87f4127 100644 --- a/Assets/omw-to-beat-the-big-bad.wav.import +++ b/Assets/Temp Music/omw-to-beat-the-big-bad.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://c6nf5s6xy2uii" -path="res://.godot/imported/omw-to-beat-the-big-bad.wav-359f208789c1ed46a5219c26c1ea8933.sample" +path="res://.godot/imported/omw-to-beat-the-big-bad.wav-7f8a9a2e19afe1786d6b9f29ff762163.sample" [deps] -source_file="res://Assets/omw-to-beat-the-big-bad.wav" -dest_files=["res://.godot/imported/omw-to-beat-the-big-bad.wav-359f208789c1ed46a5219c26c1ea8933.sample"] +source_file="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" +dest_files=["res://.godot/imported/omw-to-beat-the-big-bad.wav-7f8a9a2e19afe1786d6b9f29ff762163.sample"] [params] diff --git a/Scenes/MainMenu.tscn b/Scenes/MainMenu.tscn index d621bbf..c0dcbb3 100644 --- a/Scenes/MainMenu.tscn +++ b/Scenes/MainMenu.tscn @@ -11,7 +11,7 @@ [ext_resource type="Texture2D" uid="uid://y532moy2ihmn" path="res://Assets/Sprites/Good Bunny/good bunny.png" id="8_j5v2i"] [ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Easter Egg/Egg 1.png" id="9_ujgvg"] [ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/Theme.tres" id="10_dmxwi"] -[ext_resource type="PackedScene" uid="uid://blyqjiguff0lp" path="res://Scenes/MusicPlayer.tscn" id="12_x3k6e"] +[ext_resource type="PackedScene" path="res://Scenes/MusicPlayer.tscn" id="12_x3k6e"] [node name="MainMenu" type="Node" node_paths=PackedStringArray("button_to_focus_on_start")] script = ExtResource("1_0vcve") diff --git a/Scenes/MusicPlayer.tscn b/Scenes/MusicPlayer.tscn index 6981fee..65db538 100644 --- a/Scenes/MusicPlayer.tscn +++ b/Scenes/MusicPlayer.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=2 format=3 uid="uid://blyqjiguff0lp"] +[gd_scene load_steps=2 format=3] -[ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/omw-to-beat-the-big-bad.wav" id="1_wb1gf"] +[ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" id="1_wb1gf"] [node name="MusicPlayer" type="AudioStreamPlayer"] stream = ExtResource("1_wb1gf") diff --git a/Scenes/PlayerMovement.tscn b/Scenes/PlayerMovement.tscn index ce78c09..125749b 100644 --- a/Scenes/PlayerMovement.tscn +++ b/Scenes/PlayerMovement.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=5 format=3 uid="uid://ccgpsim5nfxd6"] +[gd_scene load_steps=7 format=3 uid="uid://ccgpsim5nfxd6"] [ext_resource type="Script" path="res://Scripts/PlayerController.gd" id="1_x3102"] [ext_resource type="TileSet" uid="uid://b7cqbf6xdbeal" path="res://Assets/Test_Tileset.tres" id="3_0at2g"] [ext_resource type="Script" path="res://Scripts/MapGenerator.gd" id="4_8st0q"] [ext_resource type="Texture2D" uid="uid://cnrja43wk2mmd" path="res://Assets/Sprites/Jesus.png" id="4_lpajj"] +[ext_resource type="PackedScene" path="res://Scenes/MusicPlayer.tscn" id="5_4vnv3"] +[ext_resource type="AudioStream" uid="uid://dpbyjnyg765r7" path="res://Assets/Temp Music/awesomeness.wav" id="6_2do7l"] [node name="Node2D" type="Node2D"] @@ -35,3 +37,6 @@ drag_horizontal_enabled = true drag_vertical_enabled = true editor_draw_limits = true editor_draw_drag_margin = true + +[node name="MusicPlayer" parent="." instance=ExtResource("5_4vnv3")] +stream = ExtResource("6_2do7l") diff --git a/project.godot b/project.godot index e73055b..e1a6348 100644 --- a/project.godot +++ b/project.godot @@ -15,6 +15,10 @@ run/main_scene="res://Scenes/MainMenu.tscn" config/features=PackedStringArray("4.0", "GL Compatibility") config/icon="res://icon.svg" +[audio] + +buses/default_bus_layout="res://Assets/Temp Music/default_bus_layout.tres" + [autoload] GlobalSettings="*res://Scripts/GlobalSettings.gd"