diff --git a/Scenes/Build/Level1.tscn b/Scenes/Build/Level1.tscn index 1fc13c0..c4c09ae 100644 --- a/Scenes/Build/Level1.tscn +++ b/Scenes/Build/Level1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://cpmjt7h6bh6yb"] +[gd_scene load_steps=23 format=3 uid="uid://cpmjt7h6bh6yb"] [ext_resource type="Texture2D" uid="uid://p4cq0akituxu" path="res://Assets/skybox.png" id="1_miutx"] [ext_resource type="PackedScene" uid="uid://bq7jj8c7sqndr" path="res://Prefabs/Player.tscn" id="2_bpe4b"] @@ -11,6 +11,8 @@ [ext_resource type="PackedScene" uid="uid://bpeptod0bu0b" path="res://Scenes/Models/Keyhole.tscn" id="7_wqp84"] [ext_resource type="PackedScene" uid="uid://b6b7y8x4wuqx" path="res://Scenes/Models/Button.tscn" id="8_lkgv2"] [ext_resource type="Script" path="res://Scripts/SwitchLevelButton.cs" id="9_sh175"] +[ext_resource type="BankAsset" uid="uid://d22gkr47rbgk0" path="res://addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres" id="12_y6b1m"] +[ext_resource type="BankAsset" uid="uid://dmm333fcp5vlw" path="res://addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres" id="13_g04l8"] [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_1iwyd"] panorama = ExtResource("1_miutx") @@ -42,6 +44,14 @@ size = Vector3(100, 20, 100) [sub_resource type="BoxShape3D" id="BoxShape3D_rmrxc"] size = Vector3(100, 20, 100) +[sub_resource type="EventAsset" id="EventAsset_xjejs"] +is_oneshot = true +min_distance = 1.0 +max_distance = 20.0 +path = "event:/Level" +guid = "{aeb67668-fa9d-4d10-8ded-31b9a391c15e}" +name = "Level" + [node name="Level1" type="Node3D"] [node name="WorldEnvironment" type="WorldEnvironment" parent="."] @@ -202,6 +212,21 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 35.482 text = "SANDBOX HERE" font_size = 128 +[node name="StudioBankLoader" type="StudioBankLoader" parent="."] +load_on = 1 +unload_on = 3 +preload_sample_data = true +num_banks = 2 +bank_0 = ExtResource("12_y6b1m") +bank_1 = ExtResource("13_g04l8") + +[node name="StudioEventEmitter3D" type="StudioEventEmitter3D" parent="."] +play_event = 1 +stop_event = 3 +event = SubResource("EventAsset_xjejs") +preload_samples = true +allow_fadeout = false + [connection signal="body_entered" from="Elements/Button" to="Elements/Button" method="OnSwitchLevelButtonActivated"] [connection signal="body_entered" from="Elements/Button/Area3D" to="Elements/Button/Area3D" method="OnSwitchLevelButtonActivated"] diff --git a/Scenes/Build/Level2.tscn b/Scenes/Build/Level2.tscn index 27be9b0..8ca2db6 100644 --- a/Scenes/Build/Level2.tscn +++ b/Scenes/Build/Level2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=3 uid="uid://bofdbddgtahl4"] +[gd_scene load_steps=26 format=3 uid="uid://bofdbddgtahl4"] [ext_resource type="Texture2D" uid="uid://p4cq0akituxu" path="res://Assets/skybox.png" id="1_kyvo3"] [ext_resource type="PackedScene" uid="uid://bq7jj8c7sqndr" path="res://Prefabs/Player.tscn" id="2_fprf6"] @@ -14,6 +14,8 @@ [ext_resource type="PackedScene" uid="uid://dthp8c3eggmju" path="res://Prefabs/Laser/PlasmaBolt.tscn" id="10_vvl8g"] [ext_resource type="Script" path="res://Scripts/PlasmaBolt.cs" id="11_y4011"] [ext_resource type="AudioStream" uid="uid://c1fsn0od7m1n2" path="res://Sounds/77087__defunct3__laser-short.wav" id="12_vn1xh"] +[ext_resource type="BankAsset" uid="uid://d22gkr47rbgk0" path="res://addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres" id="15_rh1ka"] +[ext_resource type="BankAsset" uid="uid://dmm333fcp5vlw" path="res://addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres" id="16_b11p2"] [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_1iwyd"] panorama = ExtResource("1_kyvo3") @@ -45,6 +47,14 @@ size = Vector3(100, 20, 100) [sub_resource type="BoxShape3D" id="BoxShape3D_rmrxc"] size = Vector3(100, 20, 100) +[sub_resource type="EventAsset" id="EventAsset_6c25x"] +is_oneshot = true +min_distance = 1.0 +max_distance = 20.0 +path = "event:/Level" +guid = "{aeb67668-fa9d-4d10-8ded-31b9a391c15e}" +name = "Level" + [node name="Level2" type="Node3D"] [node name="WorldEnvironment" type="WorldEnvironment" parent="."] @@ -225,6 +235,21 @@ script = ExtResource("8_w2kfi") [node name="CollisionShape3D" type="CollisionShape3D" parent="DeathPlane/Area3D"] shape = SubResource("BoxShape3D_rmrxc") +[node name="StudioBankLoader" type="StudioBankLoader" parent="."] +load_on = 1 +unload_on = 3 +preload_sample_data = true +num_banks = 2 +bank_0 = ExtResource("15_rh1ka") +bank_1 = ExtResource("16_b11p2") + +[node name="StudioEventEmitter3D" type="StudioEventEmitter3D" parent="."] +play_event = 1 +stop_event = 3 +event = SubResource("EventAsset_6c25x") +preload_samples = true +allow_fadeout = false + [connection signal="body_entered" from="Elements/LaserBlaster/PlasmaBolt" to="Elements/LaserBlaster/PlasmaBolt" method="OnPlayerEntered"] [editable path="Elements/Keyhole"] diff --git a/Scenes/DebugScenes/StartScene.tscn b/Scenes/DebugScenes/StartScene.tscn index a2de9fe..8a437ce 100644 --- a/Scenes/DebugScenes/StartScene.tscn +++ b/Scenes/DebugScenes/StartScene.tscn @@ -1,7 +1,16 @@ -[gd_scene load_steps=3 format=3 uid="uid://dkbywpu12oe2c"] +[gd_scene load_steps=6 format=3 uid="uid://dkbywpu12oe2c"] [ext_resource type="Script" path="res://Scripts/StartGame.cs" id="1_4rdpe"] +[ext_resource type="BankAsset" uid="uid://d22gkr47rbgk0" path="res://addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres" id="2_34up4"] [ext_resource type="Texture2D" uid="uid://c1iadtlo28ile" path="res://icon.png" id="2_vrcsc"] +[ext_resource type="BankAsset" uid="uid://dmm333fcp5vlw" path="res://addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres" id="3_fufmf"] + +[sub_resource type="EventAsset" id="EventAsset_iguhq"] +min_distance = 1.0 +max_distance = 20.0 +path = "event:/Title" +guid = "{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}" +name = "Title" [node name="StartScene" type="Control"] layout_mode = 3 @@ -12,6 +21,22 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_4rdpe") +[node name="StudioBankLoader" type="StudioBankLoader" parent="."] +load_on = 1 +unload_on = 3 +preload_sample_data = true +num_banks = 2 +bank_0 = ExtResource("2_34up4") +bank_1 = ExtResource("3_fufmf") + +[node name="StudioEventEmitter2D" type="StudioEventEmitter2D" parent="."] +play_event = 2 +stop_event = 3 +event = SubResource("EventAsset_iguhq") +preload_samples = true + +[node name="StudioListener2D" type="StudioListener2D" parent="."] + [node name="Menu" type="VBoxContainer" parent="."] layout_mode = 1 anchors_preset = -1 diff --git a/Scenes/DebugScenes/Title_Theme_Player.gd b/Scenes/DebugScenes/Title_Theme_Player.gd new file mode 100644 index 0000000..b5b1813 --- /dev/null +++ b/Scenes/DebugScenes/Title_Theme_Player.gd @@ -0,0 +1,6 @@ +extends Node2D + +@export var event: EventAsset + +# Called when the node enters the scene tree for the first time. +func _ready(): diff --git a/Scripts/LoadingScene.cs b/Scripts/LoadingScene.cs index b8f119c..366588c 100644 --- a/Scripts/LoadingScene.cs +++ b/Scripts/LoadingScene.cs @@ -9,13 +9,13 @@ public partial class LoadingScene : Control //Set as path to intended target scene private string targetScenePath; public static int currLevel = 1; - public override void _Ready() - { + public override void _Ready() + { targetScenePath = "res://Scenes/Build/Level" + currLevel + ".tscn"; ResourceLoader.LoadThreadedRequest(targetScenePath); - TimedSceneSwap(); - } + TimedSceneSwap(); + } private async void TimedSceneSwap() { await Task.Delay(TimeSpan.FromMilliseconds(1500)); diff --git a/addons/FMOD/banks/Desktop/Master.bank b/addons/FMOD/banks/Desktop/Master.bank index 02c56af..6fd183d 100644 Binary files a/addons/FMOD/banks/Desktop/Master.bank and b/addons/FMOD/banks/Desktop/Master.bank differ diff --git a/addons/FMOD/banks/Desktop/Master.strings.bank b/addons/FMOD/banks/Desktop/Master.strings.bank index e524b99..ff96383 100644 Binary files a/addons/FMOD/banks/Desktop/Master.strings.bank and b/addons/FMOD/banks/Desktop/Master.strings.bank differ diff --git a/addons/FMOD/editor/cache/fmod_project_cache.tres b/addons/FMOD/editor/cache/fmod_project_cache.tres index b85a7fe..250c228 100644 --- a/addons/FMOD/editor/cache/fmod_project_cache.tres +++ b/addons/FMOD/editor/cache/fmod_project_cache.tres @@ -1,68 +1,58 @@ -[gd_resource type="ProjectCache" load_steps=6 format=3 uid="uid://b2ka56j3u141v"] +[gd_resource type="ProjectCache" load_steps=8 format=3 uid="uid://btyguqvq7mhgd"] -[sub_resource type="BankAsset" id="BankAsset_633rn"] -file_path = "res://addons/FMOD/banks/Desktop/Master.bank" -modified_time = 1699599297 -path = "bank:/Master" -guid = "{e02a8011-03ec-4637-8ec4-9da710c89757}" -name = "Master" - -[sub_resource type="BankAsset" id="BankAsset_m552l"] -file_path = "res://addons/FMOD/banks/Desktop/Master.strings.bank" -modified_time = 1699599297 -path = "bank:/Master.strings" -guid = "{7837a0c5-7297-0a75-088d-1759e13b91cf}" -name = "Master.strings" - -[sub_resource type="BusAsset" id="BusAsset_sdi5l"] -path = "bus:/Reverb" -guid = "{cc9589d3-1926-4912-82a9-29aca17eb8ae}" -name = "Reverb" - -[sub_resource type="BusAsset" id="BusAsset_rc8w5"] -path = "bus:/" -guid = "{a4c296f8-f077-452b-8546-ea7f7bfb8858}" -name = "Master" - -[sub_resource type="EventAsset" id="EventAsset_44wlx"] -is_oneshot = true -min_distance = 1.0 -max_distance = 20.0 -path = "event:/Test" -guid = "{2ab79860-442a-42b0-b956-380fa1dc9a89}" -name = "Test" +[ext_resource type="BankAsset" uid="uid://dmm333fcp5vlw" path="res://addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres" id="1_dksv3"] +[ext_resource type="BankAsset" uid="uid://d22gkr47rbgk0" path="res://addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres" id="2_qis8k"] +[ext_resource type="BusAsset" uid="uid://bpiekrg483d80" path="res://addons/FMOD/editor/resources/busses/{a4c296f8-f077-452b-8546-ea7f7bfb8858}.tres" id="3_cs203"] +[ext_resource type="BusAsset" uid="uid://gvokqkhuthmt" path="res://addons/FMOD/editor/resources/busses/{cc9589d3-1926-4912-82a9-29aca17eb8ae}.tres" id="4_6wfm7"] +[ext_resource type="EventAsset" uid="uid://d3foryxvp0j0e" path="res://addons/FMOD/editor/resources/events/{aeb67668-fa9d-4d10-8ded-31b9a391c15e}.tres" id="5_741pi"] +[ext_resource type="EventAsset" uid="uid://dgq3vinfxngpt" path="res://addons/FMOD/editor/resources/events/{2ab79860-442a-42b0-b956-380fa1dc9a89}.tres" id="5_l8eew"] +[ext_resource type="EventAsset" uid="uid://b1ecmybpopxfm" path="res://addons/FMOD/editor/resources/events/{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}.tres" id="6_sh1gj"] [resource] banks = { -"{7837a0c5-7297-0a75-088d-1759e13b91cf}": SubResource("BankAsset_m552l"), -"{e02a8011-03ec-4637-8ec4-9da710c89757}": SubResource("BankAsset_633rn") +"{7837a0c5-7297-0a75-088d-1759e13b91cf}": ExtResource("2_qis8k"), +"{e02a8011-03ec-4637-8ec4-9da710c89757}": ExtResource("1_dksv3") } events = { -"{2ab79860-442a-42b0-b956-380fa1dc9a89}": SubResource("EventAsset_44wlx") +"{2ab79860-442a-42b0-b956-380fa1dc9a89}": ExtResource("5_l8eew"), +"{aeb67668-fa9d-4d10-8ded-31b9a391c15e}": ExtResource("5_741pi"), +"{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}": ExtResource("6_sh1gj") } busses = { -"{a4c296f8-f077-452b-8546-ea7f7bfb8858}": SubResource("BusAsset_rc8w5"), -"{cc9589d3-1926-4912-82a9-29aca17eb8ae}": SubResource("BusAsset_sdi5l") +"{a4c296f8-f077-452b-8546-ea7f7bfb8858}": ExtResource("3_cs203"), +"{cc9589d3-1926-4912-82a9-29aca17eb8ae}": ExtResource("4_6wfm7") } bank_tree = [{ "children": [], "item_type": 3, "node_name": "Master", "path": "bank:/Master", -"resource": SubResource("BankAsset_633rn") +"resource": ExtResource("1_dksv3") }, { "children": [], "item_type": 3, "node_name": "Master.strings", "path": "bank:/Master.strings", -"resource": SubResource("BankAsset_m552l") +"resource": ExtResource("2_qis8k") }] event_tree = [{ "children": [], "item_type": 1, +"node_name": "Level", +"path": "event:/Level", +"resource": ExtResource("5_741pi") +}, { +"children": [], +"item_type": 1, "node_name": "Test", "path": "event:/Test", -"resource": SubResource("EventAsset_44wlx") +"resource": ExtResource("5_l8eew") +}, { +"children": [], +"item_type": 1, +"node_name": "Title", +"path": "event:/Title", +"resource": ExtResource("6_sh1gj") }] bus_tree = [{ "children": [{ @@ -70,10 +60,10 @@ bus_tree = [{ "item_type": 4, "node_name": "Reverb", "path": "bus:/Reverb", -"resource": SubResource("BusAsset_sdi5l") +"resource": ExtResource("4_6wfm7") }], "item_type": 4, "node_name": "bus:", "path": "bus:/", -"resource": SubResource("BusAsset_rc8w5") +"resource": ExtResource("3_cs203") }] diff --git a/addons/FMOD/editor/fmod_guids.gd b/addons/FMOD/editor/fmod_guids.gd index d4b8bab..602cf8f 100644 --- a/addons/FMOD/editor/fmod_guids.gd +++ b/addons/FMOD/editor/fmod_guids.gd @@ -8,6 +8,7 @@ class_name FMODGuids class Events: const TEST = "{2ab79860-442a-42b0-b956-380fa1dc9a89}" + const TITLE = "{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}" class Busses: const MASTER_BUS = "{a4c296f8-f077-452b-8546-ea7f7bfb8858}" diff --git a/addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres b/addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres index 7cc41c9..7c0b4f5 100644 --- a/addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres +++ b/addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres @@ -2,7 +2,7 @@ [resource] file_path = "res://addons/FMOD/banks/Desktop/Master.strings.bank" -modified_time = 1699599297 +modified_time = 1713509527 path = "bank:/Master.strings" guid = "{7837a0c5-7297-0a75-088d-1759e13b91cf}" name = "Master.strings" diff --git a/addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres b/addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres index 6ad15b3..b84b6e5 100644 --- a/addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres +++ b/addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres @@ -2,7 +2,7 @@ [resource] file_path = "res://addons/FMOD/banks/Desktop/Master.bank" -modified_time = 1699599297 +modified_time = 1713509527 path = "bank:/Master" guid = "{e02a8011-03ec-4637-8ec4-9da710c89757}" name = "Master" diff --git a/addons/FMOD/editor/resources/events/{aeb67668-fa9d-4d10-8ded-31b9a391c15e}.tres b/addons/FMOD/editor/resources/events/{aeb67668-fa9d-4d10-8ded-31b9a391c15e}.tres new file mode 100644 index 0000000..d77b514 --- /dev/null +++ b/addons/FMOD/editor/resources/events/{aeb67668-fa9d-4d10-8ded-31b9a391c15e}.tres @@ -0,0 +1,8 @@ +[gd_resource type="EventAsset" format=3 uid="uid://d3foryxvp0j0e"] + +[resource] +min_distance = 1.0 +max_distance = 20.0 +path = "event:/Level" +guid = "{aeb67668-fa9d-4d10-8ded-31b9a391c15e}" +name = "Level" diff --git a/addons/FMOD/editor/resources/events/{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}.tres b/addons/FMOD/editor/resources/events/{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}.tres new file mode 100644 index 0000000..ac69417 --- /dev/null +++ b/addons/FMOD/editor/resources/events/{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}.tres @@ -0,0 +1,8 @@ +[gd_resource type="EventAsset" format=3 uid="uid://b1ecmybpopxfm"] + +[resource] +min_distance = 1.0 +max_distance = 20.0 +path = "event:/Title" +guid = "{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}" +name = "Title" diff --git a/addons/FMOD/fmod.gd b/addons/FMOD/fmod.gd index 96ce68b..5af87f6 100644 --- a/addons/FMOD/fmod.gd +++ b/addons/FMOD/fmod.gd @@ -1,2 +1,2 @@ @tool -extends EditorPlugin \ No newline at end of file +extends EditorPlugin diff --git a/addons/FMOD/test/.cache/buildrecords/Desktop/Master.br b/addons/FMOD/test/.cache/buildrecords/Desktop/Master.br index 3ff8658..038c159 100644 Binary files a/addons/FMOD/test/.cache/buildrecords/Desktop/Master.br and b/addons/FMOD/test/.cache/buildrecords/Desktop/Master.br differ diff --git a/addons/FMOD/test/.cache/fsbcache/Desktop/2582E3FA.fobj b/addons/FMOD/test/.cache/fsbcache/Desktop/23B76F15.fobj similarity index 99% rename from addons/FMOD/test/.cache/fsbcache/Desktop/2582E3FA.fobj rename to addons/FMOD/test/.cache/fsbcache/Desktop/23B76F15.fobj index 69a0fbb..d44e14f 100644 Binary files a/addons/FMOD/test/.cache/fsbcache/Desktop/2582E3FA.fobj and b/addons/FMOD/test/.cache/fsbcache/Desktop/23B76F15.fobj differ diff --git a/addons/FMOD/test/.cache/fsbcache/Desktop/6920610A.fobj b/addons/FMOD/test/.cache/fsbcache/Desktop/6920610A.fobj new file mode 100644 index 0000000..ace49bb Binary files /dev/null and b/addons/FMOD/test/.cache/fsbcache/Desktop/6920610A.fobj differ diff --git a/addons/FMOD/test/.cache/fsbcache/Desktop/7201344B.fobj b/addons/FMOD/test/.cache/fsbcache/Desktop/7201344B.fobj new file mode 100644 index 0000000..368d953 Binary files /dev/null and b/addons/FMOD/test/.cache/fsbcache/Desktop/7201344B.fobj differ diff --git a/addons/FMOD/test/.cache/{2b033c88-767c-4094-b181-2be2386e96c0}.pdc b/addons/FMOD/test/.cache/{2b033c88-767c-4094-b181-2be2386e96c0}.pdc deleted file mode 100644 index 12c922d..0000000 Binary files a/addons/FMOD/test/.cache/{2b033c88-767c-4094-b181-2be2386e96c0}.pdc and /dev/null differ diff --git a/addons/FMOD/test/.unsaved/.user/Metadata/Asset/{4432432a-f97a-49a4-8a78-faa1d37b1cc2}.user.xml b/addons/FMOD/test/.unsaved/.user/Metadata/Asset/{4432432a-f97a-49a4-8a78-faa1d37b1cc2}.user.xml deleted file mode 100644 index b90a48c..0000000 --- a/addons/FMOD/test/.unsaved/.user/Metadata/Asset/{4432432a-f97a-49a4-8a78-faa1d37b1cc2}.user.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/addons/FMOD/test/.unsaved/.user/Metadata/Mixer.user.xml b/addons/FMOD/test/.unsaved/.user/Metadata/Mixer.user.xml deleted file mode 100644 index 52c7093..0000000 --- a/addons/FMOD/test/.unsaved/.user/Metadata/Mixer.user.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/addons/FMOD/test/.unsaved/.user/Metadata/Workspace.user.xml b/addons/FMOD/test/.unsaved/.user/Metadata/Workspace.user.xml deleted file mode 100644 index b23b3e0..0000000 --- a/addons/FMOD/test/.unsaved/.user/Metadata/Workspace.user.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - {4e134e64-d867-4bce-8d4a-8dd470e089be} - - - - - AAAAAQAAABYAQQB1AGQAaQBvACAAQgBpAG4AIAAxAAAAQgHZ0MsAAwAAAAAC9wAAAIEAAASIAAADcAAAAvgAAACgAAAEhwAAA28AAAAAAAAAAAeAAAAC+AAAAKAAAASHAAADbw== - - - {29cd3426-e730-466e-a5c3-fddf27a2e065} - - - diff --git a/addons/FMOD/test/.user/Metadata/Workspace.user.xml b/addons/FMOD/test/.user/Metadata/Workspace.user.xml index b23b3e0..686359c 100644 --- a/addons/FMOD/test/.user/Metadata/Workspace.user.xml +++ b/addons/FMOD/test/.user/Metadata/Workspace.user.xml @@ -4,13 +4,20 @@ {4e134e64-d867-4bce-8d4a-8dd470e089be} + + {94bffe4b-b542-45f9-8fec-6abe7fff7aff} + + + Event Editor 1 + - AAAAAQAAABYAQQB1AGQAaQBvACAAQgBpAG4AIAAxAAAAQgHZ0MsAAwAAAAAC9wAAAIEAAASIAAADcAAAAvgAAACgAAAEhwAAA28AAAAAAAAAAAeAAAAC+AAAAKAAAASHAAADbw== + AAAAAgAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAoAAAAEYAAAGnwAAArsAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABYAQQB1AGQAaQBvACAAQgBpAG4AIAAxAAAAQgHZ0MsAAwAAAAAC9wAAAIEAAASIAAADcAAAAvgAAACgAAAEhwAAA28AAAAAAAAAAAeAAAAC+AAAAKAAAASHAAADbw== {29cd3426-e730-466e-a5c3-fddf27a2e065} + diff --git a/addons/FMOD/test/Assets/Tip_ical_419.wav b/addons/FMOD/test/Assets/Tip_ical_419.wav new file mode 100644 index 0000000..23dc30f Binary files /dev/null and b/addons/FMOD/test/Assets/Tip_ical_419.wav differ diff --git a/addons/FMOD/test/Assets/Tip_ical_419.wav.import b/addons/FMOD/test/Assets/Tip_ical_419.wav.import new file mode 100644 index 0000000..9ffa032 --- /dev/null +++ b/addons/FMOD/test/Assets/Tip_ical_419.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://7tiwaea8640a" +path="res://.godot/imported/Tip_ical_419.wav-fac7db92292998fd05d8bfe12728a8c7.sample" + +[deps] + +source_file="res://addons/FMOD/test/Assets/Tip_ical_419.wav" +dest_files=["res://.godot/imported/Tip_ical_419.wav-fac7db92292998fd05d8bfe12728a8c7.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/addons/FMOD/test/Assets/Tipical_416.wav b/addons/FMOD/test/Assets/Tipical_416.wav new file mode 100644 index 0000000..f3366c2 Binary files /dev/null and b/addons/FMOD/test/Assets/Tipical_416.wav differ diff --git a/addons/FMOD/test/Assets/Tipical_416.wav.import b/addons/FMOD/test/Assets/Tipical_416.wav.import new file mode 100644 index 0000000..c317611 --- /dev/null +++ b/addons/FMOD/test/Assets/Tipical_416.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://dlbi81wqgea1y" +path="res://.godot/imported/Tipical_416.wav-e5f5777ea987887e60005e3b9cd5671a.sample" + +[deps] + +source_file="res://addons/FMOD/test/Assets/Tipical_416.wav" +dest_files=["res://.godot/imported/Tipical_416.wav-e5f5777ea987887e60005e3b9cd5671a.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/addons/FMOD/test/Assets/Tipical_LV.wav b/addons/FMOD/test/Assets/Tipical_LV.wav new file mode 100644 index 0000000..6f8b5ad Binary files /dev/null and b/addons/FMOD/test/Assets/Tipical_LV.wav differ diff --git a/addons/FMOD/test/Assets/Tipical_LV.wav.import b/addons/FMOD/test/Assets/Tipical_LV.wav.import new file mode 100644 index 0000000..ce0ddd2 --- /dev/null +++ b/addons/FMOD/test/Assets/Tipical_LV.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bfncu15jammqw" +path="res://.godot/imported/Tipical_LV.wav-0f75d6b235188096c14058f618053a3f.sample" + +[deps] + +source_file="res://addons/FMOD/test/Assets/Tipical_LV.wav" +dest_files=["res://.godot/imported/Tipical_LV.wav-0f75d6b235188096c14058f618053a3f.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/addons/FMOD/test/Metadata/AudioFile/{d209b6c5-2257-48ad-b4f2-1cb45ba1cc19}.xml b/addons/FMOD/test/Metadata/AudioFile/{d209b6c5-2257-48ad-b4f2-1cb45ba1cc19}.xml new file mode 100644 index 0000000..6750563 --- /dev/null +++ b/addons/FMOD/test/Metadata/AudioFile/{d209b6c5-2257-48ad-b4f2-1cb45ba1cc19}.xml @@ -0,0 +1,23 @@ + + + + + Tip_ical_419.wav + + + true + + + 44.0999985 + + + 2 + + + 112.5 + + + {4432432a-f97a-49a4-8a78-faa1d37b1cc2} + + + diff --git a/addons/FMOD/test/Metadata/AudioFile/{e8368db7-d2ee-4c39-a3a1-abea9d05ad2e}.xml b/addons/FMOD/test/Metadata/AudioFile/{e8368db7-d2ee-4c39-a3a1-abea9d05ad2e}.xml new file mode 100644 index 0000000..15b2bc6 --- /dev/null +++ b/addons/FMOD/test/Metadata/AudioFile/{e8368db7-d2ee-4c39-a3a1-abea9d05ad2e}.xml @@ -0,0 +1,23 @@ + + + + + Tipical_LV.wav + + + true + + + 44.0999985 + + + 2 + + + 76.666666666666671 + + + {4432432a-f97a-49a4-8a78-faa1d37b1cc2} + + + diff --git a/addons/FMOD/test/Metadata/AudioFile/{fc4e158b-d865-477c-8b94-f0f8185720f4}.xml b/addons/FMOD/test/Metadata/AudioFile/{fc4e158b-d865-477c-8b94-f0f8185720f4}.xml new file mode 100644 index 0000000..6f0d678 --- /dev/null +++ b/addons/FMOD/test/Metadata/AudioFile/{fc4e158b-d865-477c-8b94-f0f8185720f4}.xml @@ -0,0 +1,23 @@ + + + + + Tipical_416.wav + + + true + + + 44.0999985 + + + 2 + + + 112.5 + + + {4432432a-f97a-49a4-8a78-faa1d37b1cc2} + + + diff --git a/addons/FMOD/test/Metadata/Event/{aeb67668-fa9d-4d10-8ded-31b9a391c15e}.xml b/addons/FMOD/test/Metadata/Event/{aeb67668-fa9d-4d10-8ded-31b9a391c15e}.xml new file mode 100644 index 0000000..31bc9cd --- /dev/null +++ b/addons/FMOD/test/Metadata/Event/{aeb67668-fa9d-4d10-8ded-31b9a391c15e}.xml @@ -0,0 +1,116 @@ + + + + + Level + + + 1 + + + {b2601ed4-d6ca-4696-b4b9-f28cd6384db5} + + + {e1586750-ac34-4751-97e0-d5fd1364e84c} + + + {2f30cf8e-007b-4e0d-ad8c-318f0cb5162c} + + + {cb1084ee-7e55-4847-be07-f41f3d4cc871} + + + {6454e604-1d4e-47ea-849f-d1ef913b145e} + + + {89aa4a24-ed7e-48c4-ab98-6a2ec6aba779} + + + {bf2bf8a2-2f5a-4559-8be6-37cf4b12d746} + + + {e02a8011-03ec-4637-8ec4-9da710c89757} + + + + + {d6175191-4da7-4cfa-9fef-8fec81793620} + + + + + {5ff6ceae-9560-49f2-a573-d52adde0e07c} + + + {d6175191-4da7-4cfa-9fef-8fec81793620} + + + + + {55f4f1d0-cc41-4bfd-b0a6-ee4b3438566d} + + + {6576c5cc-332a-4e3b-be04-6ad972447636} + + + {a4c296f8-f077-452b-8546-ea7f7bfb8858} + + + + + + + {5ff6ceae-9560-49f2-a573-d52adde0e07c} + + + {9b15055b-abe7-430f-90c9-211102b0155a} + + + + + {c944741e-2f53-4e9f-9634-83047e669c2b} + + + {9c462096-d89a-437e-98ac-b713ccdd2f24} + + + {e1586750-ac34-4751-97e0-d5fd1364e84c} + + + + + 76.666666666666671 + + + {e8368db7-d2ee-4c39-a3a1-abea9d05ad2e} + + + + + {a1ce949a-70df-4654-9263-0d29735533d4} + + + + + + 19.977159703504046 + + + 56.675302111410772 + + + {bf2bf8a2-2f5a-4559-8be6-37cf4b12d746} + + + {89aa4a24-ed7e-48c4-ab98-6a2ec6aba779} + + + + + {7f416a38-223f-403e-b51a-0fa138ee9f06} + + + + + + diff --git a/addons/FMOD/test/Metadata/Event/{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}.xml b/addons/FMOD/test/Metadata/Event/{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}.xml new file mode 100644 index 0000000..aa6a917 --- /dev/null +++ b/addons/FMOD/test/Metadata/Event/{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}.xml @@ -0,0 +1,116 @@ + + + + + Title + + + 1 + + + {b2601ed4-d6ca-4696-b4b9-f28cd6384db5} + + + {2218ffca-25ed-4111-87c8-2ccfdafa9271} + + + {b0ce820a-8708-4c7f-9145-48789c4516d7} + + + {408015a2-d77d-43b9-91d5-4e9fb0e8ae76} + + + {dbfa6108-c26a-4dd7-a8f3-38310021b51b} + + + {9754142f-d3c9-4f82-aeed-2aac6837d734} + + + {135c6ee8-74ee-4926-ae57-230b3b61b5ec} + + + {e02a8011-03ec-4637-8ec4-9da710c89757} + + + + + {b3853cd2-231b-4c12-8cdb-d2ddb8f9ee0c} + + + + + {b0e7cabd-de46-4483-9f00-2a1065de19e7} + + + {b3853cd2-231b-4c12-8cdb-d2ddb8f9ee0c} + + + + + {cd0fcf60-40ec-49ae-957a-8c69dd483b66} + + + {8cd59627-cb57-4eea-90fc-1bbf70bc64bb} + + + {a4c296f8-f077-452b-8546-ea7f7bfb8858} + + + + + + + {b0e7cabd-de46-4483-9f00-2a1065de19e7} + + + {ed5b8dbb-9785-43fc-b90f-52d9fa5d81f4} + + + + + {a718c315-4266-4272-8df5-fb8ada5245c9} + + + {f95fb74b-7fe7-41a0-8a7b-4b7608d52447} + + + {2218ffca-25ed-4111-87c8-2ccfdafa9271} + + + + + 112.5 + + + {d209b6c5-2257-48ad-b4f2-1cb45ba1cc19} + + + + + {3e752779-fedf-4f04-8448-e6aea644e507} + + + + + + 40.5 + + + 72.000000000000028 + + + {135c6ee8-74ee-4926-ae57-230b3b61b5ec} + + + {9754142f-d3c9-4f82-aeed-2aac6837d734} + + + + + {8627ea2d-fc25-49a1-964f-1290b0cb8942} + + + + + + diff --git a/addons/FMOD/test/Metadata/Workspace.xml b/addons/FMOD/test/Metadata/Workspace.xml index 4697c39..a470ff9 100644 --- a/addons/FMOD/test/Metadata/Workspace.xml +++ b/addons/FMOD/test/Metadata/Workspace.xml @@ -2,7 +2,7 @@ - ../../../../../repos/tip/addons/FMOD/banks + ../banks {b2601ed4-d6ca-4696-b4b9-f28cd6384db5} diff --git a/addons/phantom_camera/examples/textures/2D/PhantomCamera2DSprite.png.import b/addons/phantom_camera/examples/textures/2D/PhantomCamera2DSprite.png.import index 3d0faa4..dfa938a 100644 --- a/addons/phantom_camera/examples/textures/2D/PhantomCamera2DSprite.png.import +++ b/addons/phantom_camera/examples/textures/2D/PhantomCamera2DSprite.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/PhantomCamera2DSprite.png-6bf2b757da36375026c [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/phantom_camera/examples/textures/2D/inventory_container.png.import b/addons/phantom_camera/examples/textures/2D/inventory_container.png.import index ac39935..72be1e5 100644 --- a/addons/phantom_camera/examples/textures/2D/inventory_container.png.import +++ b/addons/phantom_camera/examples/textures/2D/inventory_container.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/inventory_container.png-12241277f279bfc4bf7d5 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/phantom_camera/examples/textures/2D/level_spritesheet.png.import b/addons/phantom_camera/examples/textures/2D/level_spritesheet.png.import index 532792f..520372a 100644 --- a/addons/phantom_camera/examples/textures/2D/level_spritesheet.png.import +++ b/addons/phantom_camera/examples/textures/2D/level_spritesheet.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/level_spritesheet.png-26a44dd21a040a5480d5ccb [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/phantom_camera/examples/textures/2D/sign_prompt.png.import b/addons/phantom_camera/examples/textures/2D/sign_prompt.png.import index 3eeda2b..a5799d3 100644 --- a/addons/phantom_camera/examples/textures/2D/sign_prompt.png.import +++ b/addons/phantom_camera/examples/textures/2D/sign_prompt.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/sign_prompt.png-18d451127e1cd1a16367acd23cec4 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false