Merge branch 'master' of https://git.sjkillen.ca/sjkillen/hurrmmm

godot/Objects/domino/domino2.tscn

@@ -1,5 +1,8 @@
-[gd_scene load_steps=2 format=3 uid="uid://dk6en0h46sxd"]
+[gd_scene load_steps=2 format=3 uid="uid://b7qky0n2ea40e"]
 
 [ext_resource type="PackedScene" uid="uid://dmttoc025f26x" path="res://Domino.glb" id="1_n2u88"]
 
 [node name="Domino" instance=ExtResource("1_n2u88")]
+
+[node name="CollisionShape3D" parent="." index="3"]
+transform = Transform3D(0.999984, 0, 0, 0, 0.999984, 0, 0, 0, 0.999984, 0, 0, 0)

godot/audio/TricksterGhostNew.mp3.import

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

godot/tests/TAS_system/TAS_test_003.tscn

@@ -7,7 +7,7 @@
 [ext_resource type="PackedScene" uid="uid://cfpiau12q3fut" path="res://Objects/child/child.tscn" id="5_jytdk"]
 [ext_resource type="PackedScene" uid="uid://dfkyytk42ecwk" path="res://Objects/igloo/igloo.tscn" id="6_wha2i"]
 [ext_resource type="PackedScene" uid="uid://dd35nmr3swub6" path="res://Objects/balloon/balloon.tscn" id="7_ln6xh"]
-[ext_resource type="PackedScene" uid="uid://d2tfjlli61nps" path="res://Objects/domino/domino.tscn" id="8_idsaa"]
+[ext_resource type="PackedScene" uid="uid://b7qky0n2ea40e" path="res://Objects/domino/domino2.tscn" id="8_2krw6"]
 
 [sub_resource type="Sky" id="Sky_u0y8n"]
 
@@ -49,5 +49,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0205169, 0.381115, -0.02601
 [node name="balloon" parent="." index="10" instance=ExtResource("7_ln6xh")]
 transform = Transform3D(0.358936, -0.000516907, -0.141382, 0.000873357, 0.385775, 0.00080681, 0.14138, -0.00107074, 0.358935, -1.91181, 1.97725, -0.189681)
 
-[node name="Domino" parent="." index="11" instance=ExtResource("8_idsaa")]
+[node name="Domino" parent="." index="11" instance=ExtResource("8_2krw6")]
-transform = Transform3D(0.238161, 0, 0, 0, 0.260504, 0, 0, 0, 0.284782, 0.121308, 1.46886, -0.498064)
+transform = Transform3D(0.999994, -0.00349065, 0, -1.52581e-10, -4.37111e-08, 1, -0.00349065, -0.999994, -4.37114e-08, 0.087864, 1.48733, -0.193974)
+continuous_cd = false

godot/tests/control_scheme/test_basic_controls.tscn

@@ -4,12 +4,12 @@
 [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"]
+[ext_resource type="AudioStream" uid="uid://dw06bektw4j8m" path="res://audio/TricksterGhostNew.mp3" id="10_4mw33"]
 
 [sub_resource type="Gradient" id="Gradient_iyif7"]
 offsets = PackedFloat32Array(0.333333, 0.635088, 1)
@@ -86,5 +86,5 @@ transform = Transform3D(0.495368, 0.868683, -1.47631e-08, -0.635304, 0.362283, 0
 [node name="TAS UI" parent="." index="10" instance=ExtResource("4_8yatx")]
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." index="11"]
-stream = ExtResource("10_58hft")
+stream = ExtResource("10_4mw33")
 autoplay = true