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

godot/Objects/balloon/balloon.tscn

@@ -35,13 +35,13 @@ _surfaces = [{
 blend_shape_mode = 0
 shadow_mesh = SubResource("ArrayMesh_vsncq")
 
-[node name="balloon" instance=ExtResource("1_y0aai")]
+[node name="balloon2" instance=ExtResource("1_y0aai")]
-
-[node name="Balloon" parent="." index="0"]
-transform = Transform3D(0.999997, 0.00247732, 0.000781408, -0.002478, 0.999997, 0.000871272, -0.000779246, -0.000873206, 0.999999, 0, 0, 0)
-surface_material_override/0 = ExtResource("2_5kbog")
 
 [node name="Balloon_String" type="MeshInstance3D" parent="." index="1"]
 transform = Transform3D(-0.00735031, 1.59288e-05, -5.56369e-06, 1.21871e-07, 1, -6.21002e-06, 5.56359e-06, -0.000844878, -0.00735031, 0, -1.5621, 0)
 mesh = SubResource("ArrayMesh_0v50y")
 skeleton = NodePath("")
+
+[node name="Balloon" parent="." index="3"]
+transform = Transform3D(0.299999, 0.000743196, 0.000234422, -0.0007434, 0.299999, 0.000261382, -0.000233774, -0.000261962, 0.3, 0, 0, 0)
+surface_material_override/0 = ExtResource("2_5kbog")

godot/Objects/balloon/balloon2.tscn

@@ -0,0 +1,15 @@
+[gd_scene load_steps=4 format=3 uid="uid://db3h7pscfif84"]
+
+[ext_resource type="PackedScene" uid="uid://dl005e2rvn86b" path="res://balloon.glb" id="1_sa42c"]
+[ext_resource type="Material" uid="uid://cqhehgwersrkl" path="res://Objects/balloon/balloon_material_standard.tres" id="2_uagtf"]
+[ext_resource type="PackedScene" uid="uid://dkoiku0t4b0o7" path="res://Objects/balloon/string.tscn" id="3_7kjah"]
+
+[node name="balloon" instance=ExtResource("1_sa42c")]
+gravity_scale = 0.0
+
+[node name="Balloon" parent="." index="2"]
+transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0)
+material_override = ExtResource("2_uagtf")
+
+[node name="string" parent="." index="4" instance=ExtResource("3_7kjah")]
+transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0)

godot/balloon.glb.import

@@ -27,6 +27,14 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
-import_script/path=""
+import_script/path="res://physics/import_billiard.gd"
-_subresources={}
+_subresources={
+"nodes": {
+"PATH:Balloon": {
+"generate/physics": true,
+"physics/body_type": 1,
+"physics/shape_type": 3
+}
+}
+}
 gltf/embedded_image_handling=1

godot/tests/control_scheme/test_basic_controls.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=3 uid="uid://70bb2yncbl"]
+[gd_scene load_steps=17 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"]
@@ -11,6 +11,7 @@
 [ext_resource type="Shader" path="res://tests/control_scheme/screen_shader.gdshader" id="8_w6ylu"]
 [ext_resource type="AudioStream" uid="uid://dw06bektw4j8m" path="res://audio/TricksterGhostNew.mp3" id="10_4mw33"]
 [ext_resource type="PackedScene" uid="uid://b7qky0n2ea40e" path="res://Objects/domino/domino2.tscn" id="11_2c1js"]
+[ext_resource type="PackedScene" uid="uid://db3h7pscfif84" path="res://Objects/balloon/balloon2.tscn" id="12_f4vmr"]
 
 [sub_resource type="Gradient" id="Gradient_iyif7"]
 offsets = PackedFloat32Array(0.333333, 0.635088, 1)
@@ -92,3 +93,12 @@ autoplay = true
 
 [node name="Domino" parent="." index="12" instance=ExtResource("11_2c1js")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.50107, 1.40023, 0)
+
+[node name="balloon" parent="." index="13" instance=ExtResource("12_f4vmr")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 2, 0)
+
+[node name="balloon2" parent="." index="14" instance=ExtResource("12_f4vmr")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 2, 1)
+
+[node name="balloon3" parent="." index="15" instance=ExtResource("12_f4vmr")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 2)