diff --git a/Main.tscn b/Main.tscn index 3074d7af4..bbe7a91a5 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1432,8 +1432,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 @@ -1448,8 +1448,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 @@ -1459,8 +1459,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 @@ -1475,8 +1475,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 diff --git a/README.md b/README.md index 61edf9ec2..eb0d73c04 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Current features as of version v0.5: - Are you an animator? Then you've come to the right place! Pixelorama has its own Animation Timeline just for you!​ - Import images and edit them inside Pixelorama. If you import multiple files, they will be added as individual animation frames. - Export your gorgeous art as PNG files. -- Save snd open your projects as Pixelorama's custom file format, .pxo +- Save and open your projects as Pixelorama's custom file format, .pxo - Undo/Redo support! - Horizontal & vertical mirrored drawing! - Tile Mode for pattern creation! diff --git a/Scripts/Canvas.gd b/Scripts/Canvas.gd index 5c09feccc..35a782397 100644 --- a/Scripts/Canvas.gd +++ b/Scripts/Canvas.gd @@ -257,10 +257,10 @@ func _process(delta : float) -> void: elif Input.is_action_just_released("shift"): is_making_line = false line_2d.queue_free() - + if is_making_line: line_2d.set_point_position(1, mouse_pos) - + if is_making_selection != "None": #If we're making a selection if Input.is_action_just_released(is_making_selection): #Finish selection when button is released @@ -648,7 +648,7 @@ func draw_pixel(pos : Vector2, color : Color, current_mouse_button : String, cur layers[current_layer_index][0].lock() sprite_changed_this_frame = true - + previous_mouse_pos = current_pixel previous_mouse_pos.x = clamp(previous_mouse_pos.x, location.x, location.x + size.x) previous_mouse_pos.y = clamp(previous_mouse_pos.y, location.y, location.y + size.y) diff --git a/Scripts/Global.gd b/Scripts/Global.gd index e942771c2..8b442d7c4 100644 --- a/Scripts/Global.gd +++ b/Scripts/Global.gd @@ -267,7 +267,7 @@ func _ready() -> void: move_up_layer_button = find_node_by_name(root, "MoveUpLayer") move_down_layer_button = find_node_by_name(root, "MoveDownLayer") merge_down_layer_button = find_node_by_name(root, "MergeDownLayer") - + add_palette_button = find_node_by_name(root, "AddPalette") remove_palette_button = find_node_by_name(root, "RemovePalette") palette_option_button = find_node_by_name(root, "PaletteOptionButton") diff --git a/Scripts/PaletteContainer.gd b/Scripts/PaletteContainer.gd index 5ececdeaf..eb733ff67 100644 --- a/Scripts/PaletteContainer.gd +++ b/Scripts/PaletteContainer.gd @@ -42,9 +42,9 @@ var default_palette = [ # Called when the node enters the scene tree for the first time. func _ready() -> void: #Global.palettes["Default"] = default_palette - + _load_palettes() - + on_palette_select(current_palette) pass # Replace with function body. @@ -87,14 +87,14 @@ func on_color_select(index : int) -> void: func _load_palettes() -> void: var files := [] - + var dir := Directory.new() - + if not dir.dir_exists("user://palettes"): dir.make_dir("user://palettes"); dir.copy("res://Assets/Graphics/Palette/default_palette.json","user://palettes/default_palette.json"); dir.copy("res://Assets/Graphics/Palette/bubblegum16.json","user://palettes/bubblegum16.json"); - + dir.open("user://palettes") dir.list_dir_begin() @@ -106,7 +106,7 @@ func _load_palettes() -> void: files.append(file_name) dir.list_dir_end() - + for file_name in files: var result : String = load_palette("user://palettes/" + file_name) if result: @@ -115,7 +115,7 @@ func _load_palettes() -> void: Global.palette_option_button.set_item_metadata(index, result) if result == "Default": Global.palette_option_button.select(index) - + for item in Global.palette_option_button.items: print(item) pass @@ -123,7 +123,7 @@ func _load_palettes() -> void: func load_palette(path : String) -> String: var file := File.new() file.open(path, File.READ) - + var text = file.get_as_text() var result_json = JSON.parse(text) var result = {} @@ -139,22 +139,22 @@ func load_palette(path : String) -> String: if data.has("name"): palette_name = data.name Global.palettes[data.name] = data.colors - + file.close() - + return palette_name func _save_palette(palette : Array, name : String, path : String): var file := File.new() file.open(path, File.WRITE) - + var data := {} data.name = name data.colors = palette - + file.store_string(JSON.print(data)) file.close() - + pass # Called every frame. 'delta' is the elapsed time since the previous frame. diff --git a/Scripts/SelectionRectangle.gd b/Scripts/SelectionRectangle.gd index 82112ab5b..ee8793ac9 100644 --- a/Scripts/SelectionRectangle.gd +++ b/Scripts/SelectionRectangle.gd @@ -61,7 +61,7 @@ func _process(delta : float) -> void: Global.canvas.update_texture(Global.canvas.current_layer_index) tex.create_from_image(img, 0) update() - + # Makes line2d invisible if weakref(Global.canvas.line_2d).get_ref(): # Checks to see if line_2d object still exists Global.canvas.line_2d.default_color = Color(0, 0, 0, 0) @@ -102,7 +102,7 @@ func _process(delta : float) -> void: Global.selected_pixels.append(Vector2(xx, yy)) Global.canvas.handle_redo("Rectangle Select") #Redo - + # Makes line2d visible if weakref(Global.canvas.line_2d).get_ref(): # Checks to see if line_2d object still exists Global.canvas.line_2d.default_color = Color.darkgray diff --git a/Translations/#Translations.de.translation b/Translations/#Translations.de.translation index 4de5d1312..9b06353b6 100644 Binary files a/Translations/#Translations.de.translation and b/Translations/#Translations.de.translation differ diff --git a/Translations/#Translations.el.translation b/Translations/#Translations.el.translation index 4395f4b70..bca6ef0e0 100644 Binary files a/Translations/#Translations.el.translation and b/Translations/#Translations.el.translation differ diff --git a/Translations/#Translations.en.translation b/Translations/#Translations.en.translation index d7d28ed49..8e54dd074 100644 Binary files a/Translations/#Translations.en.translation and b/Translations/#Translations.en.translation differ diff --git a/Translations/#Translations.fr.translation b/Translations/#Translations.fr.translation index 87db4b67a..5e1cb2843 100644 Binary files a/Translations/#Translations.fr.translation and b/Translations/#Translations.fr.translation differ diff --git a/project.godot b/project.godot index d93ee1c6a..a1833fab9 100644 --- a/project.godot +++ b/project.godot @@ -182,7 +182,7 @@ right_colorpicker_tool={ [locale] -translations=PoolStringArray( "res://Translations/#Translations.en.translation", "res://Translations/#Translations.el.translation", "res://Translations/#Translations.fr.translation" ) +translations=PoolStringArray( "res://Translations/#Translations.en.translation", "res://Translations/#Translations.el.translation", "res://Translations/#Translations.fr.translation", "res://Translations/#Translations.de.translation" ) locale_filter=[ 0, [ ] ] [rendering]