mirror of
https://github.com/Orama-Interactive/Pixelorama.git
synced 2025-01-18 17:19:50 +00:00
Merge branch 'Orama-Interactive:master' into select_frames
This commit is contained in:
Variable
GitHub
commit
032b702c3e
10
.github/workflows/dev-desktop-builds.yml
vendored
10
.github/workflows/dev-desktop-builds.yml
vendored
|
|
@ -11,9 +11,9 @@ on:
|
|||
- "installer/po/*"
|
||||
|
||||
env:
|
||||
GODOT_VERSION: 3.5
|
||||
GODOT_VERSION_MAC: 3.5
|
||||
RASPBERRY_PI_BUILDS_VERSION: 1.13.0
|
||||
GODOT_VERSION: 3.5.2
|
||||
GODOT_VERSION_MAC: 3.5.2
|
||||
RASPBERRY_PI_BUILDS_VERSION: 1.15.0
|
||||
EXPORT_NAME: Pixelorama
|
||||
|
||||
jobs:
|
||||
|
|
@ -21,7 +21,7 @@ jobs:
|
|||
name: Windows Export 🗔
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: docker://barichello/godot-ci:3.5
|
||||
image: docker://barichello/godot-ci:3.5.2
|
||||
steps:
|
||||
- name: Setup WINE and rcedit 🍷
|
||||
run: |
|
||||
|
|
@ -58,7 +58,7 @@ jobs:
|
|||
name: Linux Export 🐧
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: docker://barichello/godot-ci:3.5
|
||||
image: docker://barichello/godot-ci:3.5.2
|
||||
steps:
|
||||
- name: Checkout 🛎️
|
||||
uses: actions/checkout@v2
|
||||
|
|
|
|||
4
.github/workflows/dev-web.yml
vendored
4
.github/workflows/dev-web.yml
vendored
|
|
@ -5,7 +5,7 @@ on:
|
|||
branches: [ master ]
|
||||
|
||||
env:
|
||||
GODOT_VERSION: 3.5
|
||||
GODOT_VERSION: 3.5.2
|
||||
EXPORT_NAME: Pixelorama
|
||||
|
||||
jobs:
|
||||
|
|
@ -13,7 +13,7 @@ jobs:
|
|||
name: Web Export 🌐
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: docker://barichello/godot-ci:3.5
|
||||
image: docker://barichello/godot-ci:3.5.2
|
||||
steps:
|
||||
- name: Checkout 🛎️
|
||||
uses: actions/checkout@v2
|
||||
|
|
|
|||
14
.github/workflows/release.yml
vendored
14
.github/workflows/release.yml
vendored
|
|
@ -5,11 +5,11 @@ on:
|
|||
branches: [ release ]
|
||||
|
||||
env:
|
||||
GODOT_VERSION: 3.5
|
||||
GODOT_VERSION_MAC: 3.5
|
||||
RASPBERRY_PI_BUILDS_VERSION: 1.13.0
|
||||
GODOT_VERSION: 3.5.2
|
||||
GODOT_VERSION_MAC: 3.5.2
|
||||
RASPBERRY_PI_BUILDS_VERSION: 1.15.0
|
||||
EXPORT_NAME: Pixelorama
|
||||
TAG: v0.10.3
|
||||
TAG: v0.11
|
||||
BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
|
||||
|
||||
jobs:
|
||||
|
|
@ -17,7 +17,7 @@ jobs:
|
|||
name: Windows Export 🗔
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: docker://barichello/godot-ci:3.5
|
||||
image: docker://barichello/godot-ci:3.5.2
|
||||
steps:
|
||||
- name: Setup WINE, rcedit and NSIS 🍷
|
||||
run: |
|
||||
|
|
@ -78,7 +78,7 @@ jobs:
|
|||
name: Linux Export 🐧
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: docker://barichello/godot-ci:3.5
|
||||
image: docker://barichello/godot-ci:3.5.2
|
||||
steps:
|
||||
- name: Checkout 🛎️
|
||||
uses: actions/checkout@v2
|
||||
|
|
@ -191,7 +191,7 @@ jobs:
|
|||
name: Web Export 🌐
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: docker://barichello/godot-ci:3.5
|
||||
image: docker://barichello/godot-ci:3.5.2
|
||||
steps:
|
||||
- name: Checkout 🛎️
|
||||
uses: actions/checkout@v2
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|||
This update has been brought to you by the contributions of:
|
||||
[@mrtripie](https://github.com/mrtripie), Martin Novák ([@novhack](https://github.com/novhack)), Fayez Akhtar ([@Variable-ind](https://github.com/Variable-ind)), [@20kdc](https://github.com/20kdc), Arron Washington ([@radicaled](https://github.com/radicaled)), Christos Tsoychlakis ([@ChrisTs8920](https://github.com/ChrisTs8920))
|
||||
|
||||
Built using Godot 3.5.2.
|
||||
|
||||
### Added
|
||||
- Layer groups in the timeline, for better organization. [#698](https://github.com/Orama-Interactive/Pixelorama/pull/698)
|
||||
- Support for reference images has been implemented. [#771](https://github.com/Orama-Interactive/Pixelorama/pull/771)
|
||||
|
|
@ -76,6 +78,8 @@ This update has been brought to you by the contributions of:
|
|||
This update has been brought to you by the contributions of:
|
||||
Fayez Akhtar ([@Variable-ind](https://github.com/Variable-ind))
|
||||
|
||||
Built using Godot 3.5.
|
||||
|
||||
### Added
|
||||
- The UI now automatically gets scaled, based on the dpi and resolution of the monitor. Resolves [#643](https://github.com/Orama-Interactive/Pixelorama/issues/643).
|
||||
- A "Divide into equal parts" button has been added in Gradient Map. This is meant for easy gradient bisecting, which is helpful for converting Linear/Cubic interpolated gradients into Constant. This will eventually be used in gradient generation as well, once multi-color gradient generation support gets implemented.
|
||||
|
|
@ -112,6 +116,8 @@ Fayez Akhtar ([@Variable-ind](https://github.com/Variable-ind))
|
|||
This update has been brought to you by the contributions of:
|
||||
Fayez Akhtar ([@Variable-ind](https://github.com/Variable-ind)), [@GrantMoyer](https://github.com/GrantMoyer)
|
||||
|
||||
Built using Godot 3.5.
|
||||
|
||||
### Added
|
||||
- A gradient map image effect. Addresses the second half of [#595](https://github.com/Orama-Interactive/Pixelorama/discussions/595).
|
||||
- A new rotation type, Rotxel with smear. Thanks to [azagaya](https://github.com/azagaya) for the shader code.
|
||||
|
|
@ -130,7 +136,6 @@ Fayez Akhtar ([@Variable-ind](https://github.com/Variable-ind)), [@GrantMoyer](h
|
|||
- On quit, the "Save & Exit" button is now focused by default.
|
||||
- The icon for onion skinning options has changed. [#711](https://github.com/Orama-Interactive/Pixelorama/pull/711)
|
||||
- Extensions are now being automatically reloaded if the user installs an already-existing extension, without the need to restart Pixelorama.
|
||||
- Updated to Godot 3.5.
|
||||
|
||||
### Fixed
|
||||
- Fixed a macOS crash on startup. [90d2473](https://github.com/Orama-Interactive/Pixelorama/commit/90d2473f5256425146a8c10f539b7737aa37fd23)
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ codesign/description=""
|
|||
codesign/custom_options=PoolStringArray( )
|
||||
application/modify_resources=true
|
||||
application/icon="res://assets/graphics/icons/icon.ico"
|
||||
application/file_version="0.10.3.0"
|
||||
application/product_version="0.10.3.0"
|
||||
application/file_version="0.11.0.0"
|
||||
application/product_version="0.11.0.0"
|
||||
application/company_name="Orama Interactive"
|
||||
application/product_name="Pixelorama"
|
||||
application/file_description="Pixelorama - Your free & open-source sprite editor"
|
||||
|
|
@ -89,8 +89,8 @@ application/icon="res://assets/graphics/icons/icon.icns"
|
|||
application/identifier="com.orama-interactive.pixelorama"
|
||||
application/signature=""
|
||||
application/app_category="Graphics-design"
|
||||
application/short_version="0.10.3"
|
||||
application/version="0.10.3"
|
||||
application/short_version="0.11"
|
||||
application/version="0.11"
|
||||
application/copyright="Orama Interactive and contributors 2019-present"
|
||||
display/high_res=false
|
||||
privacy/microphone_usage_description=""
|
||||
|
|
@ -210,8 +210,8 @@ codesign/description=""
|
|||
codesign/custom_options=PoolStringArray( )
|
||||
application/modify_resources=true
|
||||
application/icon="res://assets/graphics/icons/icon.ico"
|
||||
application/file_version="0.10.3.0"
|
||||
application/product_version="0.10.3.0"
|
||||
application/file_version="0.11.0.0"
|
||||
application/product_version="0.11.0.0"
|
||||
application/company_name="Orama Interactive"
|
||||
application/product_name="Pixelorama"
|
||||
application/file_description="Pixelorama - Your free & open-source sprite editor"
|
||||
|
|
@ -284,7 +284,7 @@ script_encryption_key=""
|
|||
[preset.7.options]
|
||||
|
||||
custom_template/debug=""
|
||||
custom_template/release="./godot_3.5-stable_rpi4/godot_3.5-stable_rpi4_export-template_lto.bin"
|
||||
custom_template/release="./godot_3.5.2-stable_rpi4/godot_3.5.2-stable_rpi4_export-template_lto.bin"
|
||||
binary_format/64_bits=false
|
||||
binary_format/embed_pck=false
|
||||
texture_format/bptc=false
|
||||
|
|
|
|||
|
|
@ -331,7 +331,7 @@ config/icon="res://assets/graphics/icons/icon.png"
|
|||
config/macos_native_icon="res://assets/graphics/icons/icon.icns"
|
||||
config/windows_native_icon="res://assets/graphics/icons/icon.ico"
|
||||
config/custom_user_dir_name.X11="pixelorama"
|
||||
config/Version="v0.11-rc1"
|
||||
config/Version="v0.11-rc2"
|
||||
config/ExtensionsAPI_Version=3
|
||||
config/Pxo_Version=2
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ var rate := Global.onion_skinning_past_rate
|
|||
|
||||
|
||||
func _draw() -> void:
|
||||
var project = Global.current_project
|
||||
if !Global.onion_skinning:
|
||||
return
|
||||
rate = Global.onion_skinning_past_rate if type == PAST else Global.onion_skinning_future_rate
|
||||
|
|
@ -18,21 +19,26 @@ func _draw() -> void:
|
|||
var position_tmp := position
|
||||
var scale_tmp := scale
|
||||
if Global.mirror_view:
|
||||
position_tmp.x += Global.current_project.size.x
|
||||
position_tmp.x += project.size.x
|
||||
scale_tmp.x = -1
|
||||
draw_set_transform(position_tmp, rotation, scale_tmp)
|
||||
|
||||
for i in range(1, rate + 1):
|
||||
var change: int = Global.current_project.current_frame
|
||||
var change: int = project.current_frame
|
||||
change += i if type == FUTURE else -i
|
||||
if change == clamp(change, 0, Global.current_project.frames.size() - 1):
|
||||
if change == clamp(change, 0, project.frames.size() - 1):
|
||||
var layer_i := 0
|
||||
for cel in Global.current_project.frames[change].cels:
|
||||
var layer: BaseLayer = Global.current_project.layers[layer_i]
|
||||
for cel in project.frames[change].cels:
|
||||
var layer: BaseLayer = project.layers[layer_i]
|
||||
if layer.is_visible_in_hierarchy():
|
||||
# Ignore layer if it has the "_io" suffix in its name (case in-sensitive)
|
||||
if not (layer.name.to_lower().ends_with("_io")):
|
||||
color.a = 0.6 / i
|
||||
draw_texture(cel.image_texture, Vector2.ZERO, color)
|
||||
if [change, layer_i] in project.selected_cels:
|
||||
draw_texture(
|
||||
cel.image_texture, Global.canvas.move_preview_location, color
|
||||
)
|
||||
else:
|
||||
draw_texture(cel.image_texture, Vector2.ZERO, color)
|
||||
layer_i += 1
|
||||
draw_set_transform(position, rotation, scale)
|
||||
|
|
|
|||
|
|
@ -27,27 +27,6 @@
|
|||
[ext_resource path="res://assets/graphics/timeline/loop.png" type="Texture" id=31]
|
||||
[ext_resource path="res://src/UI/Timeline/FrameTagDialog.tscn" type="PackedScene" id=42]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id=15]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id=16]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id=17]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id=18]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id=19]
|
||||
|
||||
[sub_resource type="Theme" id=20]
|
||||
HScrollBar/icons/decrement = null
|
||||
HScrollBar/icons/decrement_highlight = null
|
||||
HScrollBar/icons/increment = null
|
||||
HScrollBar/icons/increment_highlight = null
|
||||
HScrollBar/styles/grabber = SubResource( 15 )
|
||||
HScrollBar/styles/grabber_highlight = SubResource( 16 )
|
||||
HScrollBar/styles/grabber_pressed = SubResource( 17 )
|
||||
HScrollBar/styles/scroll = SubResource( 18 )
|
||||
HScrollBar/styles/scroll_focus = SubResource( 19 )
|
||||
|
||||
[sub_resource type="InputEventAction" id=21]
|
||||
action = "go_to_first_frame"
|
||||
|
||||
|
|
@ -84,6 +63,27 @@ action = "go_to_last_frame"
|
|||
[sub_resource type="ShortCut" id=14]
|
||||
shortcut = SubResource( 22 )
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id=15]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id=16]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id=17]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id=18]
|
||||
|
||||
[sub_resource type="StyleBoxEmpty" id=19]
|
||||
|
||||
[sub_resource type="Theme" id=20]
|
||||
HScrollBar/icons/decrement = null
|
||||
HScrollBar/icons/decrement_highlight = null
|
||||
HScrollBar/icons/increment = null
|
||||
HScrollBar/icons/increment_highlight = null
|
||||
HScrollBar/styles/grabber = SubResource( 15 )
|
||||
HScrollBar/styles/grabber_highlight = SubResource( 16 )
|
||||
HScrollBar/styles/grabber_pressed = SubResource( 17 )
|
||||
HScrollBar/styles/scroll = SubResource( 18 )
|
||||
HScrollBar/styles/scroll_focus = SubResource( 19 )
|
||||
|
||||
[node name="AnimationTimeline" type="Panel"]
|
||||
margin_right = 902.0
|
||||
margin_bottom = 160.0
|
||||
|
|
@ -310,7 +310,6 @@ size_flags_horizontal = 3
|
|||
margin_right = 677.0
|
||||
margin_bottom = 38.0
|
||||
size_flags_horizontal = 3
|
||||
theme = SubResource( 20 )
|
||||
scroll_vertical_enabled = false
|
||||
|
||||
[node name="AnimationTools" type="PanelContainer" parent="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer"]
|
||||
|
|
|
|||
Loading…
Reference in a new issue