Merge branch 'master' of https://github.com/OverloadedOrama/Pixelorama

Assets/Graphics/Transparent Background.png.import

@@ -10,4 +10,3 @@ source_file="res://Assets/Graphics/Transparent Background.png"
 dest_files=[ "res://.import/Transparent Background.png-62a2c5eb3e805ff7dbb890edc2b8d883.image" ]
 
 [params]
-

Main.tscn

@@ -886,9 +886,9 @@ window_title = "Open File(s)"
 resizable = true
 mode = 1
 access = 2
-filters = PoolStringArray( "*jpg, *.png ; JPG, PNG Images" )
-current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama"
-current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/"
+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 = "/home/danielnaoexiste/Documents/Prog/Pixelorama"
+current_path = "/home/danielnaoexiste/Documents/Prog/Pixelorama/"
 
 [node name="ExportSprites" type="FileDialog" parent="."]
 anchor_left = 0.5

README.md

@@ -1,8 +1,8 @@
 # Pixelorama - your free and open-source sprite editor!
  A free & open-source 2D sprite editor, made with Godot Engine, using GDScript!
- 
+
  [![Pixelorama's horrible UI](https://functionoverload590613498.files.wordpress.com/2019/10/screenshot_265.png)](https://www.youtube.com/watch?v=L8o8QKB8lPs)
- 
+
 Current features as of version v0.3:
 
 - Choosing between 4 tools – pencil, eraser, fill bucket and rectangle select – and mapping them to both of your left and right mouse buttons. That’s, pretty wild, huh?

Scripts/BrushButton.gd

@@ -18,4 +18,4 @@ func _on_BrushButton_pressed() -> void:
 		add_child(Global.right_brush_indicator)
 		if custom_brush_index > -1:
 			Global.custom_right_brush_index = custom_brush_index
-			Global.update_right_custom_brush()
+			Global.update_right_custom_brush()

Scripts/CameraMovement.gd

@@ -15,7 +15,7 @@ func _input(event) -> void:
 		drag = true
 	elif event.is_action_released("camera_drag"):
 		drag = false
-		
+
 	if Global.can_draw && Global.has_focus && Rect2(Vector2.ZERO, viewport_size).has_point(mouse_pos):
 		if event.is_action_pressed("zoom_in"): # Wheel Up Event
 			zoom_camera(-1)
@@ -30,8 +30,8 @@ func zoom_camera(dir : int) -> void:
 	#if zoom + zoom_margin > zoom_min && zoom + zoom_margin < zoom_max:
 	if zoom + zoom_margin > zoom_min:
 		zoom += zoom_margin
-	
+
 	if zoom > zoom_max:
 		zoom = zoom_max
 	if name == "Camera2D":
-		Global.zoom_level_label.text = "Zoom: x%s" % [stepify(1 / zoom.x, 0.01)]
+		Global.zoom_level_label.text = "Zoom: x%s" % [stepify(1 / zoom.x, 0.01)]

Scripts/FrameButton.gd

@@ -4,4 +4,4 @@ var frame := 0
 
 func _on_FrameButton_pressed() -> void:
 	Global.current_frame = frame
-	Global.change_frame()
+	Global.change_frame()

Scripts/Global.gd

@@ -251,4 +251,4 @@ func blend_image_with_color(image : Image, color : Color, interpolate_factor : f
 					blended_image.set_pixel(xx, yy, new_color)
 			else: #If color is transparent - if it's the eraser
 				blended_image.set_pixel(xx, yy, Color(0, 0, 0, 0))
-	return blended_image
+	return blended_image

Scripts/LayerContainer.gd

@@ -61,4 +61,4 @@ func _on_VisibilityButton_button_down() -> void:
 	visibility_toggled = true
 
 func _on_VisibilityButton_button_up() -> void:
-	visibility_toggled = false
+	visibility_toggled = false

Scripts/Main.gd

@@ -785,4 +785,4 @@ func _on_LeftVerticalMirroring_toggled(button_pressed) -> void:
 func _on_RightHorizontalMirroring_toggled(button_pressed) -> void:
 	Global.right_horizontal_mirror = button_pressed
 func _on_RightVerticalMirroring_toggled(button_pressed) -> void:
-	Global.right_vertical_mirror = button_pressed
+	Global.right_vertical_mirror = button_pressed