Skip to content

Commit eef1154

Browse files
Update to Godot 4.2, Many bug fixes and Ui scaling
1 parent a8faee0 commit eef1154

37 files changed

+459
-163
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ mono_crash.*.json
1818
Export/
1919

2020
android/
21+
22+
.DS_Store
File renamed without changes.

Assets/icon-small.png.import renamed to Assets/Icon_small.png.import

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
importer="texture"
44
type="CompressedTexture2D"
55
uid="uid://bpscf4kcdkgev"
6-
path="res://.godot/imported/icon-small.png-3dcba41e80fca0b9adcba01cc6c90f0a.ctex"
6+
path="res://.godot/imported/Icon_small.png-537466c14c71af942b55659ead3336f6.ctex"
77
metadata={
88
"vram_texture": false
99
}
1010

1111
[deps]
1212

13-
source_file="res://Assets/icon-small.png"
14-
dest_files=["res://.godot/imported/icon-small.png-3dcba41e80fca0b9adcba01cc6c90f0a.ctex"]
13+
source_file="res://Assets/Icon_small.png"
14+
dest_files=["res://.godot/imported/Icon_small.png-537466c14c71af942b55659ead3336f6.ctex"]
1515

1616
[params]
1717

Assets/Icons/close.svg

Lines changed: 39 additions & 0 deletions
Loading

Assets/Icons/close.svg.import

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://bhl73t2e0jcwn"
6+
path="res://.godot/imported/close.svg-c407afd9401fe64d159b8d2860bf6eb3.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Assets/Icons/close.svg"
14+
dest_files=["res://.godot/imported/close.svg-c407afd9401fe64d159b8d2860bf6eb3.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
35+
svg/scale=1.0
36+
editor/scale_with_editor_scale=false
37+
editor/convert_colors_with_editor_theme=false
File renamed without changes.

Assets/Slider Handle.svg.import renamed to Assets/Slider_handle.svg.import

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
importer="texture"
44
type="CompressedTexture2D"
55
uid="uid://do3e2bue24bsp"
6-
path="res://.godot/imported/Slider Handle.svg-bc9950b3dcdc1b4838966564ab1b6d10.ctex"
6+
path="res://.godot/imported/Slider_handle.svg-66e9335363d5273fd080c0c4dec3bade.ctex"
77
metadata={
88
"vram_texture": false
99
}
1010

1111
[deps]
1212

13-
source_file="res://Assets/Slider Handle.svg"
14-
dest_files=["res://.godot/imported/Slider Handle.svg-bc9950b3dcdc1b4838966564ab1b6d10.ctex"]
13+
source_file="res://Assets/Slider_handle.svg"
14+
dest_files=["res://.godot/imported/Slider_handle.svg-66e9335363d5273fd080c0c4dec3bade.ctex"]
1515

1616
[params]
1717

Components/Close_button.tscn

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[gd_scene load_steps=2 format=3 uid="uid://d1umsuahhgmut"]
2+
3+
[ext_resource type="Texture2D" uid="uid://bhl73t2e0jcwn" path="res://Assets/Icons/close.svg" id="1_ygrao"]
4+
5+
[node name="TextureButton" type="TextureButton"]
6+
size_flags_horizontal = 8
7+
texture_normal = ExtResource("1_ygrao")

Main.tscn

Lines changed: 111 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
1-
[gd_scene load_steps=7 format=3 uid="uid://p3sohjs1pt37"]
1+
[gd_scene load_steps=10 format=3 uid="uid://p3sohjs1pt37"]
22

3-
[ext_resource type="Script" path="res://Main.gd" id="1"]
4-
[ext_resource type="Script" path="res://Scripts/NodeList.gd" id="2_8afhv"]
3+
[ext_resource type="Script" path="res://Scripts/System.gd" id="1_mbi58"]
4+
[ext_resource type="Script" path="res://Scripts/Node_list.gd" id="2_8afhv"]
55
[ext_resource type="Script" path="res://Scripts/Console.gd" id="2_qq2ap"]
6+
[ext_resource type="Script" path="res://Scripts/Node_system.gd" id="2_qxkpt"]
67
[ext_resource type="Script" path="res://Scripts/fps.gd" id="3_l3bnx"]
7-
[ext_resource type="Script" path="res://Scripts/ConsoleList.gd" id="3_xxoug"]
8+
[ext_resource type="Script" path="res://Scripts/Console_list.gd" id="3_xxoug"]
9+
[ext_resource type="Script" path="res://Scripts/Settings.gd" id="6_fan4u"]
810

911
[sub_resource type="Theme" id="Theme_0vxhv"]
1012

13+
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ktq0q"]
14+
bg_color = Color(0.117235, 0.117235, 0.117235, 1)
15+
corner_radius_top_left = 5
16+
corner_radius_top_right = 5
17+
corner_radius_bottom_right = 5
18+
corner_radius_bottom_left = 5
19+
expand_margin_left = 7.0
20+
expand_margin_right = 7.0
21+
1122
[node name="Main" type="Control"]
1223
layout_mode = 3
1324
anchors_preset = 15
@@ -27,27 +38,27 @@ grow_vertical = 2
2738
[node name="Node Editor" type="GraphEdit" parent="TabContainer"]
2839
layout_mode = 2
2940
theme = SubResource("Theme_0vxhv")
30-
right_disconnects = true
3141
scroll_offset = Vector2(0, -31)
32-
script = ExtResource("1")
42+
right_disconnects = true
43+
show_arrange_button = false
44+
script = ExtResource("2_qxkpt")
3345

34-
[node name="Console" type="GridContainer" parent="TabContainer"]
46+
[node name="Console" type="HSplitContainer" parent="TabContainer"]
3547
visible = false
3648
layout_mode = 2
37-
columns = 2
3849

3950
[node name="Console Editor" type="GraphEdit" parent="TabContainer/Console"]
4051
layout_mode = 2
4152
size_flags_horizontal = 3
4253
size_flags_vertical = 3
4354
theme_override_colors/grid_minor = Color(0.101961, 0.101961, 0.101961, 1)
4455
theme_override_colors/grid_major = Color(0.0784314, 0.0784314, 0.0784314, 1)
45-
snap_distance = 6
46-
arrange_nodes_button_hidden = true
56+
show_arrange_button = false
4757
script = ExtResource("2_qq2ap")
4858

4959
[node name="MarginContainer" type="MarginContainer" parent="TabContainer/Console"]
50-
custom_minimum_size = Vector2(350, 0)
60+
visible = false
61+
custom_minimum_size = Vector2(358.28, 0)
5162
layout_mode = 2
5263
size_flags_stretch_ratio = 0.0
5364
theme_override_constants/margin_left = 15
@@ -158,41 +169,113 @@ offset_right = 186.0
158169
offset_bottom = 8.0
159170
auto_height = true
160171

161-
[node name="Label" type="Label" parent="."]
162-
layout_mode = 0
163-
offset_left = 1725.0
164-
offset_top = 3.0
165-
offset_right = 1775.0
166-
offset_bottom = 26.0
167-
script = ExtResource("3_l3bnx")
168-
169172
[node name="HBoxContainer" type="HBoxContainer" parent="."]
170173
layout_mode = 1
171-
anchors_preset = -1
174+
anchors_preset = 1
172175
anchor_left = 1.0
173176
anchor_right = 1.0
174-
offset_left = -141.0
177+
offset_left = -223.0
175178
offset_bottom = 31.0
176179
grow_horizontal = 0
177180

181+
[node name="Label" type="Label" parent="HBoxContainer"]
182+
layout_mode = 2
183+
size_flags_horizontal = 10
184+
text = "FPS"
185+
script = ExtResource("3_l3bnx")
186+
178187
[node name="Save" type="Button" parent="HBoxContainer"]
188+
visible = false
179189
layout_mode = 2
190+
size_flags_horizontal = 3
180191
text = "Save"
181192

182193
[node name="Load" type="Button" parent="HBoxContainer"]
194+
visible = false
183195
layout_mode = 2
184-
size_flags_horizontal = 2
196+
size_flags_horizontal = 3
185197
text = "Load
186198
"
187199

188-
[node name="Load2" type="Button" parent="HBoxContainer"]
200+
[node name="New" type="Button" parent="HBoxContainer"]
201+
visible = false
189202
layout_mode = 2
190-
size_flags_horizontal = 2
203+
size_flags_horizontal = 3
191204
text = "New
192205
"
193206

207+
[node name="Settings" type="Button" parent="HBoxContainer"]
208+
layout_mode = 2
209+
text = "Settings"
210+
211+
[node name="Settings" type="Window" parent="."]
212+
title = "Settings"
213+
initial_position = 5
214+
size = Vector2i(500, 300)
215+
visible = false
216+
script = ExtResource("6_fan4u")
217+
218+
[node name="TabContainer" type="TabContainer" parent="Settings"]
219+
anchors_preset = 15
220+
anchor_right = 1.0
221+
anchor_bottom = 1.0
222+
grow_horizontal = 2
223+
grow_vertical = 2
224+
size_flags_horizontal = 3
225+
size_flags_vertical = 3
226+
227+
[node name="General" type="MarginContainer" parent="Settings/TabContainer"]
228+
layout_mode = 2
229+
theme_override_constants/margin_left = 20
230+
theme_override_constants/margin_top = 20
231+
theme_override_constants/margin_right = 20
232+
theme_override_constants/margin_bottom = 20
233+
234+
[node name="General" type="VBoxContainer" parent="Settings/TabContainer/General"]
235+
layout_mode = 2
236+
237+
[node name="HBoxContainer" type="HBoxContainer" parent="Settings/TabContainer/General/General"]
238+
layout_mode = 2
239+
size_flags_vertical = 3
240+
241+
[node name="Label" type="Label" parent="Settings/TabContainer/General/General/HBoxContainer"]
242+
layout_mode = 2
243+
size_flags_horizontal = 0
244+
size_flags_vertical = 0
245+
text = "UI Scale"
246+
247+
[node name="UI Scale" type="SpinBox" parent="Settings/TabContainer/General/General/HBoxContainer"]
248+
layout_mode = 2
249+
size_flags_horizontal = 10
250+
size_flags_vertical = 0
251+
min_value = 1.0
252+
max_value = 5.0
253+
value = 2.0
254+
rounded = true
255+
256+
[node name="Restart Warning" type="Label" parent="Settings/TabContainer/General"]
257+
visible = false
258+
layout_mode = 2
259+
size_flags_horizontal = 4
260+
size_flags_vertical = 8
261+
theme_override_colors/font_color = Color(1, 0, 0, 1)
262+
theme_override_font_sizes/font_size = 16
263+
theme_override_styles/normal = SubResource("StyleBoxFlat_ktq0q")
264+
text = "Restart editor to see effect"
265+
horizontal_alignment = 1
266+
267+
[node name="System" type="Control" parent="."]
268+
anchors_preset = 0
269+
offset_right = 40.0
270+
offset_bottom = 40.0
271+
script = ExtResource("1_mbi58")
272+
273+
[connection signal="tab_clicked" from="TabContainer" to="TabContainer/Console/Console Editor" method="_on_tab_container_tab_clicked"]
274+
[connection signal="child_exiting_tree" from="TabContainer/Node Editor" to="TabContainer/Node Editor" method="_on_child_exiting_tree"]
194275
[connection signal="connection_request" from="TabContainer/Node Editor" to="TabContainer/Node Editor" method="_on_GraphEdit_connection_request"]
195276
[connection signal="disconnection_request" from="TabContainer/Node Editor" to="TabContainer/Node Editor" method="_on_GraphEdit_disconnection_request"]
277+
[connection signal="node_deselected" from="TabContainer/Node Editor" to="TabContainer/Node Editor" method="_on_node_deselected"]
278+
[connection signal="node_selected" from="TabContainer/Node Editor" to="TabContainer/Node Editor" method="_on_node_selected"]
196279
[connection signal="node_deselected" from="TabContainer/Console/Console Editor" to="TabContainer/Console/Console Editor" method="_on_node_deselected"]
197280
[connection signal="node_selected" from="TabContainer/Console/Console Editor" to="TabContainer/Console/Console Editor" method="_on_node_selected"]
198281
[connection signal="text_submitted" from="TabContainer/Console/MarginContainer/VBoxContainer/name/LineEdit" to="TabContainer/Console/Console Editor" method="_on_line_edit_text_submitted"]
@@ -203,3 +286,7 @@ text = "New
203286
[connection signal="item_clicked" from="Node Editor List/NodeList" to="Node Editor List" method="_on_node_list_item_clicked"]
204287
[connection signal="item_clicked" from="Console List/WidgetList" to="TabContainer/Console/Console Editor" method="_on_widget_list_item_clicked"]
205288
[connection signal="item_clicked" from="Console List/WidgetList" to="Console List" method="_on_node_list_item_clicked"]
289+
[connection signal="pressed" from="HBoxContainer/Save" to="System" method="_on_save_pressed"]
290+
[connection signal="pressed" from="HBoxContainer/Settings" to="Settings" method="_on_settings_pressed"]
291+
[connection signal="close_requested" from="Settings" to="Settings" method="_on_close_requested"]
292+
[connection signal="value_changed" from="Settings/TabContainer/General/General/HBoxContainer/UI Scale" to="Settings" method="_on_ui_scale_value_changed"]

MenuBar.gd

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)