Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3ab857d
Disconnect all to_node of picker_from_node before adding new node fro…
RailKill Jul 27, 2024
c9a1b94
Merge pull request #4 from RailKill/bugfix/multiple-next
RailKill Jul 27, 2024
d9fcc9e
Fix to only disconnect picker_from_port
RailKill Jul 27, 2024
8e3202e
Merge pull request #5 from RailKill/bugfix/multiple-next
RailKill Jul 27, 2024
4fbf466
Fix ChoiceNode graph connection when options are updated
RailKill Jul 27, 2024
51338bc
Fix mouse passthrough for ActionNode
RailKill Jul 27, 2024
db209b7
Fix mouse event problems for SentenceNode and OptionReference
RailKill Jul 27, 2024
bf9a5ca
Correctly set mouse filter of ActionNode containers to Ignore
RailKill Jul 27, 2024
f844c81
Fix ActionVariable not updating UI
RailKill Jul 27, 2024
9d3974b
Add ability to close WelcomeWindow if there are other tabs
RailKill Jul 27, 2024
3b62694
Remain focus on WelcomeWindow
RailKill Jul 27, 2024
6943ad9
Fix non-showing of second tab's GraphEdit if first tab is closed
RailKill Jul 27, 2024
3ce0f00
Add new option if last option is deleted
RailKill Jul 27, 2024
45a1f8a
Add height to WelcomeWindow to prevent version number overlap
RailKill Jul 27, 2024
9870222
Left-truncate long filenames
RailKill Jul 27, 2024
20cd315
Fix FileDialog signal await issue
RailKill Jul 27, 2024
c404971
Merge pull request #8 from RailKill/bugfix/option-link
RailKill Jul 27, 2024
feffb16
Merge pull request #10 from RailKill/bugfix/label-blocking
RailKill Jul 27, 2024
f30e4c5
Merge pull request #12 from RailKill/bugfix/close-new-tab
RailKill Jul 27, 2024
c40eade
Merge pull request #14 from RailKill/bugfix/zero-option
RailKill Jul 27, 2024
b511083
Merge branch 'dev' into bugfix/panel-spacing
RailKill Jul 27, 2024
70c6667
Merge pull request #17 from RailKill/bugfix/panel-spacing
RailKill Jul 27, 2024
0e8c1f3
Allow option ID to be editable
RailKill Jul 27, 2024
9fcbb7f
Add ID copy button in SidePanelNodeDetails
RailKill Jul 27, 2024
f2f6f75
Add copied notification ribbon
RailKill Jul 27, 2024
0ab830b
Merge pull request #18 from RailKill/feature/edit-option-id
RailKill Jul 27, 2024
6e4d5ca
Rebuild ChoiceNode options fully
RailKill Jul 27, 2024
4c80b7c
Bump version to 2.2.3
RailKill Jul 27, 2024
dfe48ef
Fix duplicate ID and RootNodePanel critical bug
RailKill Jul 28, 2024
a36d5ad
Allow RootNode ID to be changed
RailKill Jul 28, 2024
0074625
Fix side panel update during tab switching
RailKill Jul 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Assets/Icons/copy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Icons/copy.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://dm2u0xqmmcorj"
path="res://.godot/imported/copy.png-0e9e4610337c18e7d6f1c2a6ba468c12.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Icons/copy.png"
dest_files=["res://.godot/imported/copy.png-0e9e4610337c18e7d6f1c2a6ba468c12.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
20 changes: 20 additions & 0 deletions Objects/GraphNodes/ActionNode.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -184,16 +184,19 @@ script = ExtResource("3_fftd2")

[node name="ActionTypeMarginContainer" type="MarginContainer" parent="."]
layout_mode = 2
mouse_filter = 2

[node name="ActionTypeContainer" type="HBoxContainer" parent="ActionTypeMarginContainer"]
layout_mode = 2
mouse_filter = 2

[node name="ActionTypeLabel" type="Label" parent="ActionTypeMarginContainer/ActionTypeContainer"]
layout_mode = 2
text = "Action"

[node name="ActionTypeContainer" type="PanelContainer" parent="ActionTypeMarginContainer/ActionTypeContainer"]
layout_mode = 2
mouse_filter = 2

[node name="ActionTypeLabel" type="Label" parent="ActionTypeMarginContainer/ActionTypeContainer/ActionTypeContainer"]
layout_mode = 2
Expand All @@ -204,16 +207,19 @@ label_settings = SubResource("LabelSettings_v4ya3")
[node name="OptionMarginContainer" type="MarginContainer" parent="."]
visible = false
layout_mode = 2
mouse_filter = 2

[node name="OptionContainer" type="HBoxContainer" parent="OptionMarginContainer"]
layout_mode = 2
mouse_filter = 2

[node name="OptionLabel" type="Label" parent="OptionMarginContainer/OptionContainer"]
layout_mode = 2
text = "Enable Option"

[node name="OptionIdContainer" type="PanelContainer" parent="OptionMarginContainer/OptionContainer"]
layout_mode = 2
mouse_filter = 2

[node name="OptionIdLabel" type="Label" parent="OptionMarginContainer/OptionContainer/OptionIdContainer"]
layout_mode = 2
Expand All @@ -227,6 +233,7 @@ text = "?"

[node name="ValueContainer" type="PanelContainer" parent="OptionMarginContainer/OptionContainer"]
layout_mode = 2
mouse_filter = 2

[node name="ValueLabel" type="Label" parent="OptionMarginContainer/OptionContainer/ValueContainer"]
layout_mode = 2
Expand All @@ -237,16 +244,19 @@ label_settings = SubResource("LabelSettings_v4ya3")
[node name="VariableMarginContainer" type="MarginContainer" parent="."]
visible = false
layout_mode = 2
mouse_filter = 2

[node name="VariableContainer" type="HBoxContainer" parent="VariableMarginContainer"]
layout_mode = 2
mouse_filter = 2

[node name="DoLabel" type="Label" parent="VariableMarginContainer/VariableContainer"]
layout_mode = 2
text = "Do"

[node name="VariableNameContainer" type="PanelContainer" parent="VariableMarginContainer/VariableContainer"]
layout_mode = 2
mouse_filter = 2

[node name="VariableNameLabel" type="Label" parent="VariableMarginContainer/VariableContainer/VariableNameContainer"]
layout_mode = 2
Expand All @@ -256,6 +266,7 @@ label_settings = SubResource("LabelSettings_v4ya3")

[node name="OperatorContainer" type="PanelContainer" parent="VariableMarginContainer/VariableContainer"]
layout_mode = 2
mouse_filter = 2

[node name="OperatorLabel" type="Label" parent="VariableMarginContainer/VariableContainer/OperatorContainer"]
layout_mode = 2
Expand All @@ -265,6 +276,7 @@ label_settings = SubResource("LabelSettings_v4ya3")

[node name="ValueContainer" type="PanelContainer" parent="VariableMarginContainer/VariableContainer"]
layout_mode = 2
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxFlat_ldvoo")

[node name="ValueLabel" type="Label" parent="VariableMarginContainer/VariableContainer/ValueContainer"]
Expand All @@ -276,16 +288,19 @@ label_settings = SubResource("LabelSettings_v4ya3")
[node name="TimerMarginContainer" type="MarginContainer" parent="."]
visible = false
layout_mode = 2
mouse_filter = 2

[node name="CustomContainer" type="HBoxContainer" parent="TimerMarginContainer"]
layout_mode = 2
mouse_filter = 2

[node name="DoLabel" type="Label" parent="TimerMarginContainer/CustomContainer"]
layout_mode = 2
text = "Wait"

[node name="TimerValueContainer" type="PanelContainer" parent="TimerMarginContainer/CustomContainer"]
layout_mode = 2
mouse_filter = 2

[node name="TimerValueLabel" type="Label" parent="TimerMarginContainer/CustomContainer/TimerValueContainer"]
layout_mode = 2
Expand All @@ -299,16 +314,19 @@ text = "seconds"

[node name="CustomMarginContainer" type="MarginContainer" parent="."]
layout_mode = 2
mouse_filter = 2

[node name="CustomContainer" type="HBoxContainer" parent="CustomMarginContainer"]
layout_mode = 2
mouse_filter = 2

[node name="DoLabel" type="Label" parent="CustomMarginContainer/CustomContainer"]
layout_mode = 2
text = "Do"

[node name="CustomTypeContainer" type="PanelContainer" parent="CustomMarginContainer/CustomContainer"]
layout_mode = 2
mouse_filter = 2

[node name="CustomTypeLabel" type="Label" parent="CustomMarginContainer/CustomContainer/CustomTypeContainer"]
layout_mode = 2
Expand All @@ -318,6 +336,7 @@ label_settings = SubResource("LabelSettings_v4ya3")

[node name="CustomValueContainer" type="PanelContainer" parent="CustomMarginContainer/CustomContainer"]
layout_mode = 2
mouse_filter = 2

[node name="CustomValueLabel" type="Label" parent="CustomMarginContainer/CustomContainer/CustomValueContainer"]
layout_mode = 2
Expand All @@ -327,6 +346,7 @@ label_settings = SubResource("LabelSettings_v4ya3")

[node name="LoopValueContainer" type="PanelContainer" parent="CustomMarginContainer/CustomContainer"]
layout_mode = 2
mouse_filter = 2

[node name="LoopValueLabel" type="Label" parent="CustomMarginContainer/CustomContainer/LoopValueContainer"]
layout_mode = 2
Expand Down
3 changes: 0 additions & 3 deletions Objects/GraphNodes/ChoiceNode.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,3 @@ theme_override_styles/panel = SubResource("StyleBoxFlat_qg36p")
theme_override_styles/titlebar = SubResource("StyleBoxFlat_t5fox")
title = "ChoiceNode"
script = ExtResource("1_nn3v2")

[connection signal="resize_request" from="." to="." method="_on_OptionNode_resize_request"]
[connection signal="slot_updated" from="." to="." method="_on_slot_updated"]
1 change: 1 addition & 0 deletions Objects/GraphNodes/SentenceNode.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ theme_override_constants/margin_bottom = 10

[node name="TextLabelPreview" type="RichTextLabel" parent="MainContainer"]
layout_mode = 2
mouse_filter = 2
theme_override_colors/default_color = Color(0.72549, 0.72549, 0.72549, 1)
bbcode_enabled = true
fit_content = true
Expand Down
31 changes: 22 additions & 9 deletions Objects/SubComponents/OptionNode.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://3k3dukisluyn"]

[ext_resource type="Texture2D" uid="uid://cupclxlgjwjmg" path="res://Assets/Icons/trash_icon.png" id="2_du61s"]
[ext_resource type="Texture2D" uid="uid://dm2u0xqmmcorj" path="res://Assets/Icons/copy.png" id="3_6pvm8"]
[ext_resource type="Script" path="res://Scripts/GraphNodes/OptionNode.gd" id="4_5yoga"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_803ep"]
Expand All @@ -9,10 +10,6 @@ border_width_bottom = 2
border_color = Color(0.0862745, 0.101961, 0.12549, 1)
expand_margin_bottom = 5.0

[sub_resource type="LabelSettings" id="LabelSettings_52w5v"]
font_size = 11
font_color = Color(0.556863, 0.556863, 0.556863, 1)

[node name="OptionNode" type="PanelContainer"]
offset_right = 349.0
offset_bottom = 165.0
Expand Down Expand Up @@ -71,15 +68,31 @@ text = "Enable by default"
layout_mode = 2
text = "One Shot"

[node name="IDLabel" type="Label" parent="MarginContainer/MainContainer"]
[node name="IDContainer" type="HBoxContainer" parent="MarginContainer/MainContainer"]
layout_mode = 2

[node name="IDLineEdit" type="LineEdit" parent="MarginContainer/MainContainer/IDContainer"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_font_sizes/font_size = 11
placeholder_text = "id"

[node name="CopyContainer" type="MarginContainer" parent="MarginContainer/MainContainer/IDContainer"]
layout_mode = 2
size_flags_vertical = 0
theme_override_constants/margin_left = 10
theme_override_constants/margin_top = 1
theme_override_constants/margin_right = 5

[node name="CopyBtn" type="TextureButton" parent="MarginContainer/MainContainer/IDContainer/CopyContainer"]
layout_mode = 2
mouse_filter = 0
mouse_default_cursor_shape = 2
text = "id"
label_settings = SubResource("LabelSettings_52w5v")
texture_normal = ExtResource("3_6pvm8")
stretch_mode = 3

[connection signal="text_changed" from="MarginContainer/MainContainer/SentenceContainer/TextEdit" to="." method="update_ref"]
[connection signal="pressed" from="MarginContainer/MainContainer/SentenceContainer/DeleteBtnContainer/Delete" to="." method="_on_delete_pressed"]
[connection signal="pressed" from="MarginContainer/MainContainer/EnableBtn" to="." method="update_ref"]
[connection signal="pressed" from="MarginContainer/MainContainer/OneShotBtn" to="." method="update_ref"]
[connection signal="gui_input" from="MarginContainer/MainContainer/IDLabel" to="." method="_on_id_label_gui_input"]
[connection signal="text_changed" from="MarginContainer/MainContainer/IDContainer/IDLineEdit" to="." method="_on_id_text_changed"]
[connection signal="pressed" from="MarginContainer/MainContainer/IDContainer/CopyContainer/CopyBtn" to="." method="_on_id_copy_pressed"]
3 changes: 3 additions & 0 deletions Objects/SubComponents/OptionReference.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,21 @@ font_color = Color(0.686275, 0.686275, 0.686275, 1)
[node name="OptionReference" type="PanelContainer"]
offset_right = 320.0
offset_bottom = 72.0
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxEmpty_jqboc")
script = ExtResource("1_me3e4")

[node name="MainContainer" type="MarginContainer" parent="."]
layout_mode = 2
mouse_filter = 2
theme_override_constants/margin_left = 5
theme_override_constants/margin_top = 5
theme_override_constants/margin_right = 5
theme_override_constants/margin_bottom = 5

[node name="VBoxContainer" type="VBoxContainer" parent="MainContainer"]
layout_mode = 2
mouse_filter = 2

[node name="Option" type="Label" parent="MainContainer/VBoxContainer"]
custom_minimum_size = Vector2(300, 0)
Expand Down
91 changes: 91 additions & 0 deletions Objects/SubComponents/Ribbon.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
[gd_scene load_steps=7 format=3 uid="uid://jmhc22ufpdcg"]

[ext_resource type="Script" path="res://Scripts/SubComponents/Ribbon.gd" id="1_mtw2e"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_i71ea"]
content_margin_left = 8.0
content_margin_top = 4.0
content_margin_right = 8.0
content_margin_bottom = 4.0
bg_color = Color(0.0862745, 0.101961, 0.12549, 1)
corner_radius_top_left = 4
corner_radius_top_right = 4
corner_radius_bottom_right = 4
corner_radius_bottom_left = 4

[sub_resource type="LabelSettings" id="LabelSettings_egetl"]
font_size = 12

[sub_resource type="Animation" id="Animation_hkoa3"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath(".:modulate")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(1, 1, 1, 1)]
}

[sub_resource type="Animation" id="Animation_f6e3r"]
resource_name = "disappear"
length = 0.5
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath(".:modulate")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.5),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 0)]
}

[sub_resource type="AnimationLibrary" id="AnimationLibrary_t7v2m"]
_data = {
"RESET": SubResource("Animation_hkoa3"),
"disappear": SubResource("Animation_f6e3r")
}

[node name="Ribbon" type="Control"]
layout_mode = 3
anchors_preset = 0
script = ExtResource("1_mtw2e")

[node name="Label" type="Label" parent="."]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -29.0
offset_top = -40.0
offset_right = 29.0
offset_bottom = -15.0
grow_horizontal = 2
grow_vertical = 2
theme_override_styles/normal = SubResource("StyleBoxFlat_i71ea")
text = "Copied!"
label_settings = SubResource("LabelSettings_egetl")
horizontal_alignment = 1
vertical_alignment = 1

[node name="Timer" type="Timer" parent="."]
one_shot = true
autostart = true

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
root_node = NodePath("../Label")
libraries = {
"": SubResource("AnimationLibrary_t7v2m")
}

[connection signal="timeout" from="Timer" to="." method="_on_timeout"]
[connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_animation_finished"]
Loading