mirror of
https://github.com/Orama-Interactive/Pixelorama.git
synced 2025-02-20 12:33:14 +00:00
Merge branch 'master' into palette_updates
This commit is contained in:
Overloaded
GitHub
commit
329099fed4
4 changed files with 62 additions and 63 deletions
115
Main.tscn
115
Main.tscn
|
|
@ -202,6 +202,7 @@ text = "[64×64]"
|
|||
align = 2
|
||||
|
||||
[node name="UI" type="HBoxContainer" parent="MenuAndUI"]
|
||||
editor/display_folded = true
|
||||
margin_top = 28.0
|
||||
margin_right = 1152.0
|
||||
margin_bottom = 648.0
|
||||
|
|
@ -232,6 +233,7 @@ margin_bottom = 127.0
|
|||
custom_constants/separation = 17
|
||||
|
||||
[node name="UtilityTools" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/MenusAndTools"]
|
||||
editor/display_folded = true
|
||||
margin_right = 208.0
|
||||
margin_bottom = 55.0
|
||||
|
||||
|
|
@ -337,6 +339,7 @@ button_mask = 3
|
|||
texture_normal = ExtResource( 8 )
|
||||
|
||||
[node name="ColorAndToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools"]
|
||||
editor/display_folded = true
|
||||
margin_top = 159.0
|
||||
margin_right = 208.0
|
||||
margin_bottom = 612.0
|
||||
|
|
@ -365,6 +368,7 @@ size_flags_vertical = 0
|
|||
flat = true
|
||||
|
||||
[node name="ColorButtonsCenter" type="CenterContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorPickersCenter/ColorPickersHorizontal"]
|
||||
editor/display_folded = true
|
||||
margin_left = 68.0
|
||||
margin_right = 85.0
|
||||
margin_bottom = 32.0
|
||||
|
|
@ -480,26 +484,24 @@ suffix = "px"
|
|||
[node name="LeftColorInterpolation" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
|
||||
editor/display_folded = true
|
||||
visible = false
|
||||
margin_top = 112.0
|
||||
margin_top = 96.0
|
||||
margin_right = 208.0
|
||||
margin_bottom = 137.0
|
||||
margin_bottom = 113.0
|
||||
|
||||
[node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftColorInterpolation"]
|
||||
margin_top = 5.0
|
||||
margin_top = 1.0
|
||||
margin_right = 90.0
|
||||
margin_bottom = 20.0
|
||||
margin_bottom = 16.0
|
||||
hint_tooltip = "COLORFROM_HT"
|
||||
text = "Brush color from"
|
||||
|
||||
[node name="LeftInterpolateFactor" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftColorInterpolation"]
|
||||
margin_left = 94.0
|
||||
margin_right = 208.0
|
||||
margin_bottom = 25.0
|
||||
margin_bottom = 17.0
|
||||
hint_tooltip = "COLORFROM_HT"
|
||||
size_flags_horizontal = 3
|
||||
max_value = 1.0
|
||||
step = 0.01
|
||||
value = 1.0
|
||||
value = 100.0
|
||||
|
||||
[node name="LeftFillArea" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
|
||||
editor/display_folded = true
|
||||
|
|
@ -524,36 +526,34 @@ selected = 0
|
|||
[node name="LeftLDOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
|
||||
editor/display_folded = true
|
||||
visible = false
|
||||
margin_top = 110.0
|
||||
margin_right = 244.0
|
||||
margin_bottom = 158.0
|
||||
margin_top = 96.0
|
||||
margin_right = 208.0
|
||||
margin_bottom = 140.0
|
||||
|
||||
[node name="LeftLightenDarken" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions"]
|
||||
margin_right = 244.0
|
||||
margin_bottom = 20.0
|
||||
margin_right = 208.0
|
||||
margin_bottom = 23.0
|
||||
text = "Lighten"
|
||||
items = [ "Lighten", null, false, 0, null, "Darken", null, false, 1, null ]
|
||||
selected = 0
|
||||
|
||||
[node name="LeftLDAmount" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions"]
|
||||
margin_top = 24.0
|
||||
margin_right = 244.0
|
||||
margin_bottom = 48.0
|
||||
margin_top = 27.0
|
||||
margin_right = 208.0
|
||||
margin_bottom = 44.0
|
||||
|
||||
[node name="LDAmountLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions/LeftLDAmount"]
|
||||
margin_top = 5.0
|
||||
margin_right = 55.0
|
||||
margin_bottom = 19.0
|
||||
margin_top = 1.0
|
||||
margin_right = 47.0
|
||||
margin_bottom = 16.0
|
||||
text = "Amount:"
|
||||
|
||||
[node name="LeftLDAmountSpinbox" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftLDOptions/LeftLDAmount"]
|
||||
margin_left = 59.0
|
||||
margin_right = 133.0
|
||||
margin_bottom = 24.0
|
||||
margin_left = 51.0
|
||||
margin_right = 115.0
|
||||
margin_bottom = 17.0
|
||||
hint_tooltip = "LDAMOUNT_HT"
|
||||
max_value = 1.0
|
||||
step = 0.01
|
||||
value = 0.1
|
||||
value = 10.0
|
||||
|
||||
[node name="LeftMirroring" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
|
||||
margin_top = 112.0
|
||||
|
|
@ -663,26 +663,24 @@ suffix = "px"
|
|||
[node name="RightColorInterpolation" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
|
||||
editor/display_folded = true
|
||||
visible = false
|
||||
margin_top = 112.0
|
||||
margin_top = 96.0
|
||||
margin_right = 208.0
|
||||
margin_bottom = 137.0
|
||||
margin_bottom = 113.0
|
||||
|
||||
[node name="ColorComesFrom" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightColorInterpolation"]
|
||||
margin_top = 5.0
|
||||
margin_top = 1.0
|
||||
margin_right = 90.0
|
||||
margin_bottom = 20.0
|
||||
margin_bottom = 16.0
|
||||
hint_tooltip = "COLORFROM_HT"
|
||||
text = "Brush color from"
|
||||
|
||||
[node name="RightInterpolateFactor" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightColorInterpolation"]
|
||||
margin_left = 94.0
|
||||
margin_right = 208.0
|
||||
margin_bottom = 25.0
|
||||
margin_bottom = 17.0
|
||||
hint_tooltip = "COLORFROM_HT"
|
||||
size_flags_horizontal = 3
|
||||
max_value = 1.0
|
||||
step = 0.01
|
||||
value = 1.0
|
||||
value = 100.0
|
||||
|
||||
[node name="RightFillArea" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
|
||||
editor/display_folded = true
|
||||
|
|
@ -707,36 +705,34 @@ selected = 0
|
|||
[node name="RightLDOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
|
||||
editor/display_folded = true
|
||||
visible = false
|
||||
margin_top = 110.0
|
||||
margin_right = 244.0
|
||||
margin_bottom = 158.0
|
||||
margin_top = 96.0
|
||||
margin_right = 208.0
|
||||
margin_bottom = 140.0
|
||||
|
||||
[node name="RightLightenDarken" type="OptionButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions"]
|
||||
margin_right = 244.0
|
||||
margin_bottom = 20.0
|
||||
margin_right = 208.0
|
||||
margin_bottom = 23.0
|
||||
text = "Lighten"
|
||||
items = [ "Lighten", null, false, 0, null, "Darken", null, false, 1, null ]
|
||||
selected = 0
|
||||
|
||||
[node name="RightLDAmount" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions"]
|
||||
margin_top = 24.0
|
||||
margin_right = 244.0
|
||||
margin_bottom = 48.0
|
||||
margin_top = 27.0
|
||||
margin_right = 208.0
|
||||
margin_bottom = 44.0
|
||||
|
||||
[node name="LDAmountLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions/RightLDAmount"]
|
||||
margin_top = 5.0
|
||||
margin_right = 55.0
|
||||
margin_bottom = 19.0
|
||||
margin_top = 1.0
|
||||
margin_right = 47.0
|
||||
margin_bottom = 16.0
|
||||
text = "Amount:"
|
||||
|
||||
[node name="RightLDAmountSpinbox" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightLDOptions/RightLDAmount"]
|
||||
margin_left = 59.0
|
||||
margin_right = 133.0
|
||||
margin_bottom = 24.0
|
||||
margin_left = 51.0
|
||||
margin_right = 115.0
|
||||
margin_bottom = 17.0
|
||||
hint_tooltip = "LDAMOUNT_HT"
|
||||
max_value = 1.0
|
||||
step = 0.01
|
||||
value = 0.1
|
||||
value = 10.0
|
||||
|
||||
[node name="RightMirroring" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
|
||||
editor/display_folded = true
|
||||
|
|
@ -881,6 +877,7 @@ zoom = Vector2( 0.15, 0.15 )
|
|||
script = ExtResource( 16 )
|
||||
|
||||
[node name="AnimationTimeline" type="Panel" parent="MenuAndUI/UI/CanvasAndTimeline"]
|
||||
editor/display_folded = true
|
||||
margin_top = 478.0
|
||||
margin_right = 704.0
|
||||
margin_bottom = 620.0
|
||||
|
|
@ -1106,6 +1103,7 @@ margin_right = 689.0
|
|||
margin_bottom = 139.0
|
||||
|
||||
[node name="LayerPanel" type="Panel" parent="MenuAndUI/UI"]
|
||||
editor/display_folded = true
|
||||
margin_left = 928.0
|
||||
margin_right = 1152.0
|
||||
margin_bottom = 620.0
|
||||
|
|
@ -1155,6 +1153,7 @@ margin_right = 224.0
|
|||
margin_bottom = 199.0
|
||||
|
||||
[node name="LayerVBoxContainer" type="VBoxContainer" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc"]
|
||||
editor/display_folded = true
|
||||
margin_top = 203.0
|
||||
margin_right = 224.0
|
||||
margin_bottom = 384.0
|
||||
|
|
@ -1438,8 +1437,8 @@ resizable = true
|
|||
mode = 0
|
||||
access = 2
|
||||
filters = PoolStringArray( "*.pxo ; Pixelorama Project" )
|
||||
current_dir = "D:/GitHub/Pixelorama"
|
||||
current_path = "D:/GitHub/Pixelorama/"
|
||||
current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama"
|
||||
current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/"
|
||||
|
||||
[node name="SaveSprite" type="FileDialog" parent="."]
|
||||
anchor_left = 0.5
|
||||
|
|
@ -1454,8 +1453,8 @@ window_title = "Save Sprite as .pxo"
|
|||
resizable = true
|
||||
access = 2
|
||||
filters = PoolStringArray( "*.pxo ; Pixelorama Project" )
|
||||
current_dir = "D:/GitHub/Pixelorama"
|
||||
current_path = "D:/GitHub/Pixelorama/"
|
||||
current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama"
|
||||
current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/"
|
||||
|
||||
[node name="ImportSprites" type="FileDialog" parent="."]
|
||||
margin_right = 515.0
|
||||
|
|
@ -1465,8 +1464,8 @@ resizable = true
|
|||
mode = 1
|
||||
access = 2
|
||||
filters = PoolStringArray( "*.bmp ; BMP Image", "*.hdr ; Radiance HDR Image", "*.jpg,*.jpeg ; JPEG Image", "*.png ; PNG Image", "*.svg ; SVG Image", "*.tga ; TGA Image", "*.webp ; WebP Image" )
|
||||
current_dir = "D:/GitHub/Pixelorama"
|
||||
current_path = "D:/GitHub/Pixelorama/"
|
||||
current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama"
|
||||
current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/"
|
||||
|
||||
[node name="ExportSprites" type="FileDialog" parent="."]
|
||||
anchor_left = 0.5
|
||||
|
|
@ -1481,8 +1480,8 @@ window_title = "Export Sprite"
|
|||
resizable = true
|
||||
access = 2
|
||||
filters = PoolStringArray( "*.png ; PNG Image" )
|
||||
current_dir = "D:/GitHub/Pixelorama"
|
||||
current_path = "D:/GitHub/Pixelorama/"
|
||||
current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama"
|
||||
current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/"
|
||||
|
||||
[node name="ScaleImage" type="ConfirmationDialog" parent="."]
|
||||
editor/display_folded = true
|
||||
|
|
|
|||
|
|
@ -449,7 +449,7 @@ func update_left_custom_brush() -> void:
|
|||
custom_brush.copy_from(custom_brushes[custom_left_brush_index])
|
||||
var custom_brush_size = custom_brush.get_size()
|
||||
custom_brush.resize(custom_brush_size.x * left_brush_size, custom_brush_size.y * left_brush_size, Image.INTERPOLATE_NEAREST)
|
||||
custom_left_brush_image = blend_image_with_color(custom_brush, left_color_picker.color, left_interpolate_slider.value)
|
||||
custom_left_brush_image = blend_image_with_color(custom_brush, left_color_picker.color, left_interpolate_slider.value / 100)
|
||||
custom_left_brush_texture.create_from_image(custom_left_brush_image, 0)
|
||||
|
||||
left_brush_type_button.get_child(0).texture = custom_left_brush_texture
|
||||
|
|
@ -465,7 +465,7 @@ func update_right_custom_brush() -> void:
|
|||
custom_brush.copy_from(custom_brushes[custom_right_brush_index])
|
||||
var custom_brush_size = custom_brush.get_size()
|
||||
custom_brush.resize(custom_brush_size.x * right_brush_size, custom_brush_size.y * right_brush_size, Image.INTERPOLATE_NEAREST)
|
||||
custom_right_brush_image = blend_image_with_color(custom_brush, right_color_picker.color, right_interpolate_slider.value)
|
||||
custom_right_brush_image = blend_image_with_color(custom_brush, right_color_picker.color, right_interpolate_slider.value / 100)
|
||||
custom_right_brush_texture.create_from_image(custom_right_brush_image, 0)
|
||||
|
||||
right_brush_type_button.get_child(0).texture = custom_right_brush_texture
|
||||
|
|
|
|||
|
|
@ -1012,12 +1012,12 @@ func _on_RightFillAreaOptions_item_selected(ID : int) -> void:
|
|||
func _on_LeftLightenDarken_item_selected(ID : int) -> void:
|
||||
Global.left_ld = ID
|
||||
func _on_LeftLDAmountSpinbox_value_changed(value : float) -> void:
|
||||
Global.left_ld_amount = value
|
||||
Global.left_ld_amount = value / 100
|
||||
|
||||
func _on_RightLightenDarken_item_selected(ID : int) -> void:
|
||||
Global.right_ld = ID
|
||||
func _on_RightLDAmountSpinbox_value_changed(value : float) -> void:
|
||||
Global.right_ld_amount = value
|
||||
Global.right_ld_amount = value / 100
|
||||
|
||||
func _on_LeftHorizontalMirroring_toggled(button_pressed) -> void:
|
||||
Global.left_horizontal_mirror = button_pressed
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ Brush: Pixel,Brush: Pixel,Πινέλο: Εικονοστοιχείο,Brosse : Pi
|
|||
Custom brush,Custom brush,Προσαρμοσμένο πινέλο,Brosse personnalisée,Benutzerdefinierter Pinsel,Niestandardowy pędzel
|
||||
Brush size:,Brush size:,Μέγεθος πινέλου:,Taille de la brosse :,Pinselgröße:,Rozmiar pędzla:
|
||||
Brush color from,Brush color from,Χρώμα πινέλου από,Couleur de la brosse depuis,Pinselfarbe von,Nadpisywanie koloru pędzla
|
||||
COLORFROM_HT,"0: Color from the brush itself, 1: the currently selected color","0: Χρώμα από το πινέλο, 1: επιλεγμένο χρώμα","0 : Couleur depuis la brosse elle-même, 1 : la couleur actuellement sélectionnée","0: Farbe von dem Pinsel selbst, 1: die aktuell ausgewählte Farbe","0: Kolor pochodzący z samego pędzla, 1: Obecnie wybrany kolor rysowania"
|
||||
COLORFROM_HT,"0: Color from the brush itself, 100: the currently selected color","0: Χρώμα από το πινέλο, 100: επιλεγμένο χρώμα","0 : Couleur depuis la brosse elle-même, 100 : la couleur actuellement sélectionnée","0: Farbe von dem Pinsel selbst, 100: die aktuell ausgewählte Farbe","0: Kolor pochodzący z samego pędzla, 100: Obecnie wybrany kolor rysowania"
|
||||
Fill area:,Fill area:,Περιοχή γεμίσματος:,Remplissage de zone :,Fülle Bereich,Wypełnij przestrzeń:
|
||||
Area of the same color,Area of the same color,Περιοχή ίδιου χρώματος,Zone de la même couleur,Bereich mit der selben Farbe,Przestrzeń o takim samym kolorze
|
||||
All pixels of the same color,All pixels of the same color,Όλα τα πίξελ ίδιου χρώματος,Tous les pixels de la même couleur,Alle Pixel mit der selben Farbe,Wszystkie piksele tego samego koloru
|
||||
|
|
|
|||
|
Loading…
Add table
Reference in a new issue