From 9f1777f0a8805fc76ff434feddf95723dbd8fdcf Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Mon, 14 Apr 2025 16:36:46 -0700 Subject: [PATCH] other fixes --- Scenes/Node Types/Advanced Spotlight.tscn | 20 ------------- Scenes/Node Types/Animatronic.tscn | 20 ------------- Scenes/Node Types/Keystrokes.tscn | 2 +- Scripts/GL_Search.gd | 8 ++++-- UI/Fonts/OpenMoji-black-glyf.ttf.import | 35 +++++++++++++++++++++++ project.godot | 2 +- 6 files changed, 43 insertions(+), 44 deletions(-) delete mode 100644 Scenes/Node Types/Advanced Spotlight.tscn delete mode 100644 Scenes/Node Types/Animatronic.tscn create mode 100644 UI/Fonts/OpenMoji-black-glyf.ttf.import diff --git a/Scenes/Node Types/Advanced Spotlight.tscn b/Scenes/Node Types/Advanced Spotlight.tscn deleted file mode 100644 index abdc742..0000000 --- a/Scenes/Node Types/Advanced Spotlight.tscn +++ /dev/null @@ -1,20 +0,0 @@ -[gd_scene load_steps=3 format=3 uid="uid://dxay21t1j6ha1"] - -[ext_resource type="PackedScene" uid="uid://b0arjg8r75f8y" path="res://Scenes/Nodes/Node.tscn" id="1_vck43"] -[ext_resource type="Script" uid="uid://t8bsiegtsiwo" path="res://Scripts/GL_Output.gd" id="2_1p1hk"] - -[node name="Node" type="Control"] -layout_mode = 3 -anchors_preset = 0 -mouse_filter = 1 - -[node name="Node" parent="." groups=["GL Node"] instance=ExtResource("1_vck43")] -layout_mode = 0 -tooltip_text = "Controls a spotlight." -script = ExtResource("2_1p1hk") -identification = "L_SPOT_CHICA" -names = PackedStringArray("intensity", "color", "size") -types = PackedStringArray("float", "color", "float") - -[connection signal="mouse_entered" from="Node" to="Node" method="mouse_enter"] -[connection signal="mouse_exited" from="Node" to="Node" method="mouse_exit"] diff --git a/Scenes/Node Types/Animatronic.tscn b/Scenes/Node Types/Animatronic.tscn deleted file mode 100644 index b85d350..0000000 --- a/Scenes/Node Types/Animatronic.tscn +++ /dev/null @@ -1,20 +0,0 @@ -[gd_scene load_steps=3 format=3 uid="uid://d4gx38pme7hnp"] - -[ext_resource type="PackedScene" uid="uid://b0arjg8r75f8y" path="res://Scenes/Nodes/Node.tscn" id="1_6fnvm"] -[ext_resource type="Script" uid="uid://t8bsiegtsiwo" path="res://Scripts/GL_Output.gd" id="2_6fnvm"] - -[node name="Node" type="Control"] -layout_mode = 3 -anchors_preset = 0 -mouse_filter = 1 - -[node name="Node" parent="." groups=["GL Node"] instance=ExtResource("1_6fnvm")] -layout_mode = 0 -tooltip_text = "Controls Chica's movements. All eyelid movements can be set to a particular position using values of 0.0 to 1.0." -script = ExtResource("2_6fnvm") -identification = "AA_CHICA" -names = PackedStringArray("Armature_001|Eyebrow L Down", "Armature_001|Eyebrow L Up", "Armature_001|Eyebrow R Down", "Armature_001|Eyebrow R Up", "Armature_001|Eyelid L", "Armature_001|Eyelid R", "Armature_001|Eyes Down", "Armature_001|Eyes Left", "Armature_001|Eyes Right", "Armature_001|Eyes Up", "Armature_001|Head Down", "Armature_001|Head L", "Armature_001|Head R", "Armature_001|Head Tilt L", "Armature_001|Head Tilt R", "Armature_001|Head Up", "Armature_001|Jaw", "Armature_001|Underlid L", "Armature_001|Underlid R") -types = PackedStringArray("float", "float", "float", "float", "float", "float", "float", "float", "float", "float", "float", "float", "float", "float", "float", "float", "float", "float", "float") - -[connection signal="mouse_entered" from="Node" to="Node" method="mouse_enter"] -[connection signal="mouse_exited" from="Node" to="Node" method="mouse_exit"] diff --git a/Scenes/Node Types/Keystrokes.tscn b/Scenes/Node Types/Keystrokes.tscn index f8471af..8b96cc9 100644 --- a/Scenes/Node Types/Keystrokes.tscn +++ b/Scenes/Node Types/Keystrokes.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://jmwqwspljwjc"] +[gd_scene load_steps=3 format=3 uid="uid://i553pel70wdq"] [ext_resource type="PackedScene" uid="uid://b0arjg8r75f8y" path="res://Scenes/Nodes/Node.tscn" id="1_ua37n"] [ext_resource type="Script" uid="uid://e6v6exlrhtaq" path="res://Scripts/GL_Keystrokes.gd" id="2_ua37n"] diff --git a/Scripts/GL_Search.gd b/Scripts/GL_Search.gd index fab7b5e..8b63a5b 100644 --- a/Scripts/GL_Search.gd +++ b/Scripts/GL_Search.gd @@ -7,22 +7,26 @@ var rows : Dictionary = { "ChuckSpot":1, "HelenSpot":1, "MunchSpot":1, + "Add":1, "Audio":1, "Bool":1, "Color":1, "Direct Output":1, "Float":1, "Invert":1, - "MiscKeys":1, "NumberKeys":1, + "MiscKeys":1, "Keystroke Ramp":1, "Lerp":1, - "Mix Floats":1, "Mix Colors":1, + "Mix Floats":1, "Mouse Wheel":1, + "Multiply":1, "Random":1, "Record":1, "Sine":1, + "Subtract":1, + "Switch Audio":1, "Timeline":1, } var searching : bool diff --git a/UI/Fonts/OpenMoji-black-glyf.ttf.import b/UI/Fonts/OpenMoji-black-glyf.ttf.import new file mode 100644 index 0000000..4002028 --- /dev/null +++ b/UI/Fonts/OpenMoji-black-glyf.ttf.import @@ -0,0 +1,35 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://cwi1cw2prs7gs" +path="res://.godot/imported/OpenMoji-black-glyf.ttf-b3b15226db2462de95c39dd9b23d3764.fontdata" + +[deps] + +source_file="res://UI/Fonts/OpenMoji-black-glyf.ttf" +dest_files=["res://.godot/imported/OpenMoji-black-glyf.ttf-b3b15226db2462de95c39dd9b23d3764.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/project.godot b/project.godot index 5a78db8..8bd9540 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Give LIFE Cybers" config/description="Cyberamics Simulator and programmer using Give LIFE's engine" -config/version="0.1-base0.4" +config/version="0.1-base0.4.1" run/main_scene="uid://qvo7vlvac8o5" config/features=PackedStringArray("4.4", "Forward Plus") config/icon="uid://c3hmtf0h6vtnr"