From eea642395bb0ef706c7241d4a749f3e0ac4cc460 Mon Sep 17 00:00:00 2001 From: jacopograndi Date: Tue, 8 Feb 2022 11:24:51 +0100 Subject: revised wave generation --- scenes/gui.tscn | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) (limited to 'scenes') diff --git a/scenes/gui.tscn b/scenes/gui.tscn index bd364c9..4db65b2 100644 --- a/scenes/gui.tscn +++ b/scenes/gui.tscn @@ -344,15 +344,6 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="palette" type="Button" parent="bottom_bar/editor_bar/hbox_tools"] -margin_left = 197.0 -margin_right = 250.0 -margin_bottom = 25.0 -text = "Palette" -__meta__ = { -"_edit_use_anchors_": false -} - [node name="hbox_map" type="HBoxContainer" parent="bottom_bar/editor_bar"] anchor_left = 0.5 anchor_right = 1.0 @@ -518,16 +509,44 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="edit_palette" type="AcceptDialog" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -191.5 +margin_top = -253.5 +margin_right = 191.5 +margin_bottom = 253.5 +grow_horizontal = 2 +grow_vertical = 2 +rect_min_size = Vector2( 200, 30 ) +popup_exclusive = true +window_title = "Edit Voxel" +dialog_text = "Select color:" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="ColorPicker" type="ColorPicker" parent="edit_palette"] +margin_left = 16.0 +margin_top = 40.4 +margin_right = 367.0 +margin_bottom = 477.4 +__meta__ = { +"_edit_use_anchors_": false +} + [connection signal="button_down" from="top_bar/panel/editor_button" to="top_bar" method="_on_editor_button_down"] [connection signal="pressed" from="top_bar/panel/wave_button" to="top_bar" method="_on_wave_button_pressed"] [connection signal="button_up" from="bottom_bar/editor_bar/hbox_tools/turrets" to="bottom_bar" method="_on_turrets_button_up"] [connection signal="button_up" from="bottom_bar/editor_bar/hbox_tools/path" to="bottom_bar" method="_on_path_button_up"] [connection signal="button_up" from="bottom_bar/editor_bar/hbox_tools/attach" to="bottom_bar" method="_on_attach_button_up"] [connection signal="button_up" from="bottom_bar/editor_bar/hbox_tools/voxel" to="bottom_bar" method="_on_voxel_button_up"] -[connection signal="button_up" from="bottom_bar/editor_bar/hbox_tools/palette" to="bottom_bar" method="_on_palette_button_up"] [connection signal="button_up" from="bottom_bar/editor_bar/hbox_map/save" to="bottom_bar" method="_on_save_button_up"] [connection signal="button_up" from="bottom_bar/editor_bar/hbox_map/save_as" to="bottom_bar" method="_on_save_as_button_up"] [connection signal="button_up" from="bottom_bar/editor_bar/hbox_map/load" to="bottom_bar" method="_on_load_button_up"] [connection signal="button_up" from="gui_load_map/vbox/close" to="." method="_on_close_load_map"] [connection signal="confirmed" from="save_as" to="." method="_on_save_as_confirmed"] [connection signal="confirmed" from="delete_confirm" to="." method="_on_delete_confirmed"] +[connection signal="confirmed" from="edit_palette" to="." method="_on_edit_palette_confirmed"] -- cgit v1.2.3-54-g00ecf