From 6693fed2bf4488a76a2837903520dc9d5f1c21a8 Mon Sep 17 00:00:00 2001 From: alex-kumpula Date: Sun, 12 Nov 2023 12:35:41 -0700 Subject: [PATCH] Added music from Jawdat --- godot/audio/TricksterGhost.mp3 | 3 +++ godot/audio/TricksterGhost.mp3.import | 19 +++++++++++++++++++ .../control_scheme/test_basic_controls.tscn | 9 +++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 godot/audio/TricksterGhost.mp3 create mode 100644 godot/audio/TricksterGhost.mp3.import diff --git a/godot/audio/TricksterGhost.mp3 b/godot/audio/TricksterGhost.mp3 new file mode 100644 index 0000000..8bab368 --- /dev/null +++ b/godot/audio/TricksterGhost.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4f9d2d37ba0cc7b6702cb56826880f338095df51f0d50b5f78a0bde73998242 +size 560900 diff --git a/godot/audio/TricksterGhost.mp3.import b/godot/audio/TricksterGhost.mp3.import new file mode 100644 index 0000000..3b40f7c --- /dev/null +++ b/godot/audio/TricksterGhost.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://b88pn0htpxvo3" +path="res://.godot/imported/TricksterGhost.mp3-9e9257851e7178f1dea40efb12b41b62.mp3str" + +[deps] + +source_file="res://audio/TricksterGhost.mp3" +dest_files=["res://.godot/imported/TricksterGhost.mp3-9e9257851e7178f1dea40efb12b41b62.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/godot/tests/control_scheme/test_basic_controls.tscn b/godot/tests/control_scheme/test_basic_controls.tscn index 93c2a65..58e443d 100644 --- a/godot/tests/control_scheme/test_basic_controls.tscn +++ b/godot/tests/control_scheme/test_basic_controls.tscn @@ -1,14 +1,15 @@ -[gd_scene load_steps=14 format=3 uid="uid://70bb2yncbl"] +[gd_scene load_steps=15 format=3 uid="uid://70bb2yncbl"] [ext_resource type="PackedScene" uid="uid://bua7f25rpewkp" path="res://small_room.glb" id="1_2ticn"] [ext_resource type="PackedScene" uid="uid://drmb4sitb74fx" path="res://control_scheme/controller.tscn" id="2_dcvuq"] [ext_resource type="PackedScene" uid="uid://c43pr474qofhl" path="res://physics/grape.tscn" id="3_gijly"] [ext_resource type="PackedScene" uid="uid://b1uf31ed6h0ir" path="res://UI/TAS UI/TAS UI.tscn" id="4_8yatx"] -[ext_resource type="PackedScene" uid="uid://cx4ohbn84hmc3" path="res://cake.tscn" id="5_udc7s"] +[ext_resource type="PackedScene" path="res://cake.tscn" id="5_udc7s"] [ext_resource type="PackedScene" uid="uid://cfpiau12q3fut" path="res://Objects/child/child.tscn" id="6_52mue"] [ext_resource type="PackedScene" uid="uid://dfkyytk42ecwk" path="res://Objects/igloo/igloo.tscn" id="7_ifsxo"] [ext_resource type="Script" path="res://tests/control_scheme/screen_shader.gd" id="8_crgih"] [ext_resource type="Shader" path="res://tests/control_scheme/screen_shader.gdshader" id="8_w6ylu"] +[ext_resource type="AudioStream" uid="uid://b88pn0htpxvo3" path="res://audio/TricksterGhost.mp3" id="10_58hft"] [sub_resource type="Gradient" id="Gradient_iyif7"] offsets = PackedFloat32Array(0.333333, 0.635088, 1) @@ -83,3 +84,7 @@ environment = SubResource("Environment_nytpg") transform = Transform3D(0.495368, 0.868683, -1.47631e-08, -0.635304, 0.362283, 0.682011, 0.592452, -0.337846, 0.731342, 0, 2.28, 1.03672) [node name="TAS UI" parent="." index="10" instance=ExtResource("4_8yatx")] + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." index="11"] +stream = ExtResource("10_58hft") +autoplay = true