Skip to content

Commit 7bda942

Browse files
committed
making the last 0.8 update
1 parent 1d3c405 commit 7bda942

File tree

3 files changed

+30
-37
lines changed

3 files changed

+30
-37
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.tmp
2+
project-icon.png
23
project.godot
34
test-scenes
45
/dialogic

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Yes, you can use Dialogic to make any kind of game (even commercial ones). The p
2929
- Better default support for unchanged styles
3030
- Timeline Editor:
3131
- Moved the event buttons to a new column
32-
- When creating a `Question` event a `End Branch` event will be added automatically
32+
- When creating a `Question` two `Choice` events and a `End Branch` event will be added automatically
3333
- Added a warning for `Choice` events on the root level of indentation
3434
- Disabled unfinished events
3535
- The Change Timeline event tells you your current timeline (this is for going back to the start)

addons/dialogic/Editor/EditorView.tscn

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ expand = true
196196
stretch_mode = 5
197197

198198
[node name="EditorTimeline" type="HSplitContainer" parent="."]
199+
visible = false
199200
anchor_right = 1.0
200201
anchor_bottom = 1.0
201202
margin_left = 6.0
@@ -772,7 +773,6 @@ __meta__ = {
772773
}
773774

774775
[node name="EditorTheme" type="ScrollContainer" parent="."]
775-
visible = false
776776
anchor_right = 1.0
777777
anchor_bottom = 1.0
778778
margin_left = 6.0
@@ -785,19 +785,19 @@ __meta__ = {
785785
}
786786

787787
[node name="VBoxContainer" type="VBoxContainer" parent="EditorTheme"]
788-
margin_right = 997.0
789-
margin_bottom = 604.0
788+
margin_right = 985.0
789+
margin_bottom = 568.0
790790
size_flags_horizontal = 3
791791
size_flags_vertical = 3
792792
custom_constants/separation = 15
793793

794794
[node name="HBoxContainer2" type="HBoxContainer" parent="EditorTheme/VBoxContainer"]
795795
margin_right = 985.0
796-
margin_bottom = 214.0
796+
margin_bottom = 178.0
797797

798798
[node name="Text" type="VBoxContainer" parent="EditorTheme/VBoxContainer/HBoxContainer2"]
799799
margin_right = 347.0
800-
margin_bottom = 214.0
800+
margin_bottom = 178.0
801801
size_flags_horizontal = 3
802802
size_flags_vertical = 3
803803
__meta__ = {
@@ -925,7 +925,7 @@ prefix = "Y"
925925
[node name="DialogBox" type="VBoxContainer" parent="EditorTheme/VBoxContainer/HBoxContainer2"]
926926
margin_left = 351.0
927927
margin_right = 666.0
928-
margin_bottom = 214.0
928+
margin_bottom = 178.0
929929
size_flags_horizontal = 3
930930
size_flags_vertical = 3
931931
__meta__ = {
@@ -948,20 +948,20 @@ __meta__ = {
948948
[node name="GridContainer" type="GridContainer" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox"]
949949
margin_top = 34.0
950950
margin_right = 315.0
951-
margin_bottom = 214.0
951+
margin_bottom = 162.0
952952
size_flags_horizontal = 3
953953
custom_constants/hseparation = 10
954954
columns = 2
955955

956956
[node name="Label5" type="Label" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
957957
margin_top = 5.0
958-
margin_right = 153.0
958+
margin_right = 132.0
959959
margin_bottom = 19.0
960960
text = "Background Color"
961961

962962
[node name="HBoxContainer2" type="HBoxContainer" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
963-
margin_left = 163.0
964-
margin_right = 315.0
963+
margin_left = 142.0
964+
margin_right = 294.0
965965
margin_bottom = 24.0
966966

967967
[node name="CheckBox" type="CheckBox" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer2"]
@@ -976,14 +976,14 @@ size_flags_horizontal = 3
976976

977977
[node name="Label" type="Label" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
978978
margin_top = 33.0
979-
margin_right = 153.0
979+
margin_right = 132.0
980980
margin_bottom = 47.0
981981
text = "Background Texture"
982982

983983
[node name="HBoxContainer3" type="HBoxContainer" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
984-
margin_left = 163.0
984+
margin_left = 142.0
985985
margin_top = 28.0
986-
margin_right = 315.0
986+
margin_right = 294.0
987987
margin_bottom = 52.0
988988

989989
[node name="CheckBox" type="CheckBox" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer3"]
@@ -1000,27 +1000,27 @@ text = "background-2"
10001000

10011001
[node name="Label2" type="Label" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
10021002
margin_top = 59.0
1003-
margin_right = 153.0
1003+
margin_right = 132.0
10041004
margin_bottom = 73.0
10051005
text = "Next dialog indicator"
10061006

10071007
[node name="NextIndicatorButton" type="Button" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
1008-
margin_left = 163.0
1008+
margin_left = 142.0
10091009
margin_top = 56.0
1010-
margin_right = 315.0
1010+
margin_right = 294.0
10111011
margin_bottom = 76.0
10121012
text = "next-indicator"
10131013

10141014
[node name="Label6" type="Label" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
10151015
margin_top = 85.0
1016-
margin_right = 153.0
1016+
margin_right = 132.0
10171017
margin_bottom = 99.0
10181018
text = "Box padding"
10191019

10201020
[node name="HBoxContainer" type="HBoxContainer" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
1021-
margin_left = 163.0
1021+
margin_left = 142.0
10221022
margin_top = 80.0
1023-
margin_right = 315.0
1023+
margin_right = 294.0
10241024
margin_bottom = 104.0
10251025

10261026
[node name="TextOffsetV" type="SpinBox" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer/HBoxContainer"]
@@ -1042,38 +1042,30 @@ prefix = "H"
10421042

10431043
[node name="Label3" type="Label" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
10441044
margin_top = 108.0
1045-
margin_right = 153.0
1045+
margin_right = 132.0
10461046
margin_bottom = 128.0
10471047
size_flags_vertical = 5
10481048
text = "Action key"
10491049

10501050
[node name="BoxContainer" type="HBoxContainer" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
1051-
margin_left = 163.0
1051+
margin_left = 142.0
10521052
margin_top = 108.0
1053-
margin_right = 315.0
1053+
margin_right = 294.0
10541054
margin_bottom = 128.0
10551055

10561056
[node name="ActionOptionButton" type="OptionButton" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer/BoxContainer"]
10571057
margin_right = 152.0
10581058
margin_bottom = 20.0
1059+
hint_tooltip = "To add/remove actions go to Project > Project Settings > Input Map"
10591060
size_flags_horizontal = 3
10601061
text = "ui_accept"
10611062
items = [ "[Select Action]", null, false, 0, null, "ui_accept", null, false, 1, null, "ui_select", null, false, 2, null, "ui_cancel", null, false, 3, null, "ui_focus_next", null, false, 4, null, "ui_focus_prev", null, false, 5, null, "ui_left", null, false, 6, null, "ui_right", null, false, 7, null, "ui_up", null, false, 8, null, "ui_down", null, false, 9, null, "ui_page_up", null, false, 10, null, "ui_page_down", null, false, 11, null, "ui_home", null, false, 12, null, "ui_end", null, false, 13, null ]
10621063
selected = 0
10631064

1064-
[node name="Label4" type="Label" parent="EditorTheme/VBoxContainer/HBoxContainer2/DialogBox/GridContainer"]
1065-
self_modulate = Color( 1, 1, 1, 0.607843 )
1066-
margin_top = 132.0
1067-
margin_right = 153.0
1068-
margin_bottom = 180.0
1069-
size_flags_horizontal = 3
1070-
text = "To add/remove actions go to Project > Project Settings > Input Map"
1071-
autowrap = true
1072-
10731065
[node name="ButtonStyle" type="VBoxContainer" parent="EditorTheme/VBoxContainer/HBoxContainer2"]
10741066
margin_left = 670.0
10751067
margin_right = 985.0
1076-
margin_bottom = 214.0
1068+
margin_bottom = 178.0
10771069
size_flags_horizontal = 3
10781070
size_flags_vertical = 3
10791071
__meta__ = {
@@ -1218,9 +1210,9 @@ rounded = true
12181210
allow_lesser = true
12191211

12201212
[node name="HBoxContainer3" type="HBoxContainer" parent="EditorTheme/VBoxContainer"]
1221-
margin_top = 229.0
1213+
margin_top = 193.0
12221214
margin_right = 985.0
1223-
margin_bottom = 289.0
1215+
margin_bottom = 253.0
12241216
custom_constants/separation = 10
12251217

12261218
[node name="TextEdit" type="TextEdit" parent="EditorTheme/VBoxContainer/HBoxContainer3"]
@@ -1240,9 +1232,9 @@ text = " Preview changes "
12401232
icon = ExtResource( 24 )
12411233

12421234
[node name="Panel" type="Panel" parent="EditorTheme/VBoxContainer"]
1243-
margin_top = 304.0
1235+
margin_top = 268.0
12441236
margin_right = 985.0
1245-
margin_bottom = 604.0
1237+
margin_bottom = 568.0
12461238
rect_min_size = Vector2( 0, 300 )
12471239

12481240
[node name="TimelinePopupMenu" type="PopupMenu" parent="."]

0 commit comments

Comments
 (0)