Compare commits

...

3 Commits

Author SHA1 Message Date
Spencer Killen 0c1439c4f3
a 2023-11-12 14:38:27 -07:00
Spencer Killen 03ec6a2651
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/hurrmmm 2023-11-12 14:29:58 -07:00
Spencer Killen cb2e0b6c5e
menu 2023-11-12 14:29:55 -07:00
5 changed files with 41 additions and 6 deletions

8
godot/Button.gd Normal file
View File

@ -0,0 +1,8 @@
extends Button
func _on_pressed():
get_tree().change_scene_to_file("res://tests/control_scheme/test_basic_controls.tscn")
func _input(event):
if event.is_action("charge"):
_on_pressed()

View File

@ -1,8 +1,18 @@
[gd_scene load_steps=2 format=3 uid="uid://b7qky0n2ea40e"] [gd_scene load_steps=3 format=3 uid="uid://b7qky0n2ea40e"]
[ext_resource type="PackedScene" uid="uid://dmttoc025f26x" path="res://Domino.glb" id="1_n2u88"] [ext_resource type="PackedScene" uid="uid://dmttoc025f26x" path="res://Domino.glb" id="1_n2u88"]
[sub_resource type="BoxShape3D" id="BoxShape3D_ckxw5"]
size = Vector3(0.050583, 0.0932653, 0.0171852)
[node name="Domino" instance=ExtResource("1_n2u88")] [node name="Domino" instance=ExtResource("1_n2u88")]
[node name="Domino2" parent="." index="2"]
transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0)
[node name="CollisionShape3D" parent="." index="3"] [node name="CollisionShape3D" parent="." index="3"]
transform = Transform3D(0.999984, 0, 0, 0, 0.999984, 0, 0, 0, 0.999984, 0, 0, 0) transform = Transform3D(0.999984, 0, 0, 0, 0.999984, 0, 0, 0, 0.999984, 0, 0, 0)
[node name="CollisionShape3D2" type="CollisionShape3D" parent="." index="4"]
transform = Transform3D(0.999984, 0, 0, 0, 0.999984, 0, 0, 0, 0.999984, 0, 0, 0)
shape = SubResource("BoxShape3D_ckxw5")

View File

@ -1,4 +1,6 @@
[gd_scene format=3 uid="uid://bh44tdo8xfqde"] [gd_scene load_steps=2 format=3 uid="uid://bh44tdo8xfqde"]
[ext_resource type="Script" path="res://Button.gd" id="1_qv1e3"]
[node name="Menu" type="Control"] [node name="Menu" type="Control"]
layout_mode = 3 layout_mode = 3
@ -28,7 +30,15 @@ offset_right = -152.0
offset_bottom = -122.0 offset_bottom = -122.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
text = "As you gaze upon an old photograph, you recall an old birthday ruined by a series of rube goldbergian events." text = "As you gaze upon an old photograph, you recall an old birthday. An otherwise perfect birthday ruined by a series of rube goldbergian events.
You wonder how different your life could have been if you had to power to stop them. After closing your eyes, you find yourself in that photograph.
Use a gamepad or keyboard and mouse to play.
Space bar to start/stop time
A/D to rewind or fast forward time.
Flashing objects can be launched towards other objects, transferring your spirit between them."
wrap_mode = 1
[node name="Button" type="Button" parent="ColorRect/TextEdit"] [node name="Button" type="Button" parent="ColorRect/TextEdit"]
layout_mode = 0 layout_mode = 0
@ -37,3 +47,6 @@ offset_top = 361.0
offset_right = 562.0 offset_right = 562.0
offset_bottom = 392.0 offset_bottom = 392.0
text = "Click here to start" text = "Click here to start"
script = ExtResource("1_qv1e3")
[connection signal="pressed" from="ColorRect/TextEdit/Button" to="ColorRect/TextEdit/Button" method="_on_pressed"]

View File

@ -11,7 +11,7 @@ config_version=5
[application] [application]
config/name="Hurrmmm" config/name="Hurrmmm"
run/main_scene="res://tests/TAS_system/TAS_test_001.tscn" run/main_scene="res://menu.tscn"
config/features=PackedStringArray("4.1", "C#", "Forward Plus") config/features=PackedStringArray("4.1", "C#", "Forward Plus")
config/icon="res://icon.svg" config/icon="res://icon.svg"

View File

@ -1,15 +1,16 @@
[gd_scene load_steps=15 format=3 uid="uid://70bb2yncbl"] [gd_scene load_steps=16 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://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://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://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://b1uf31ed6h0ir" path="res://UI/TAS UI/TAS UI.tscn" id="4_8yatx"]
[ext_resource type="PackedScene" path="res://cake.tscn" id="5_udc7s"] [ext_resource type="PackedScene" uid="uid://cx4ohbn84hmc3" 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://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="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="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="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="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"]
[sub_resource type="Gradient" id="Gradient_iyif7"] [sub_resource type="Gradient" id="Gradient_iyif7"]
offsets = PackedFloat32Array(0.333333, 0.635088, 1) offsets = PackedFloat32Array(0.333333, 0.635088, 1)
@ -88,3 +89,6 @@ transform = Transform3D(0.495368, 0.868683, -1.47631e-08, -0.635304, 0.362283, 0
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." index="11"] [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." index="11"]
stream = ExtResource("10_4mw33") stream = ExtResource("10_4mw33")
autoplay = true 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)