Merge branch 'master' into master

This commit is contained in:
Manolis Papadeas 2020-01-08 17:01:59 +02:00 committed by GitHub
commit 77a55f2495
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 879 additions and 131 deletions

View file

@ -39,11 +39,17 @@ margin_right = 556.0
margin_bottom = 462.0
size_flags_horizontal = 3
[node name="EditPaletteGridContainer" type="GridContainer" parent="VBoxContainer/HBoxContainer/Panel"]
[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer/HBoxContainer/Panel"]
anchor_right = 1.0
anchor_bottom = 1.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="EditPaletteGridContainer" type="GridContainer" parent="VBoxContainer/HBoxContainer/Panel/ScrollContainer"]
margin_right = 262.0
margin_bottom = 462.0
size_flags_horizontal = 3
size_flags_vertical = 3
columns = 8
[node name="ColorButtons" type="VBoxContainer" parent="VBoxContainer/HBoxContainer"]