Skip to content

Commit

Permalink
Merge pull request #5543 from OpenShot/release-20240619
Browse files Browse the repository at this point in the history
Release PR for version 3.2.0
  • Loading branch information
jonoomph committed Jun 25, 2024
2 parents 54671e2 + 47e8755 commit 8418a37
Show file tree
Hide file tree
Showing 41 changed files with 19,322 additions and 18,040 deletions.
2 changes: 1 addition & 1 deletion doc/effects.rst
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ impossible or impractical to shoot in.
Property Name Description
========================== ============
color ``(color)`` The color to match
fuzz ``(float, 0 to 125)`` The fuzz factor (or threshold)
threshold ``(float, 0 to 125)`` The threshold (or fuzz factor) for matching similar colors. The larger the value the more colors that will be matched.
halo ``(float, 0 to 125)`` The additional threshold for halo elimination.
keymethod ``(int, choices: ['Basic keying', 'HSV/HSL hue', 'HSV saturation', 'HSL saturation', 'HSV value', 'HSL luminance', 'LCH luminosity', 'LCH chroma', 'LCH hue', 'CIE Distance', 'Cb,Cr vector'])`` The keying method or algorithm to use.
========================== ============
Expand Down
13 changes: 11 additions & 2 deletions doc/transitions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ overlap two clips, and can be added manually by dragging one onto the timeline f
A transition must be placed on top of a clip (overlapping it), with the most common location being the beginning or end
or a clip.

NOTE: Transitions **do not** affect **audio**, so if you are intending to fade in/out the
audio volume of a clip, you must adjust the ``volume`` clip property. See :ref:`clip_properties_ref`.
NOTE: Transitions **do not** affect **audio**, so if you are intending to fade in/out the audio volume of a clip,
you must adjust the ``volume`` clip property. See :ref:`clip_properties_ref`

Overview
--------
Expand All @@ -52,6 +52,15 @@ direction of the fade. You can also manually adjust the **Brightness** curve, an

.. image:: images/transition-reverse.jpg

Transparency
------------
If transitions are used on images or videos that contain transparency (*i.e. alpha channel*) this will result in the
original clip disappearing abruptly (or popping out of existence), since OpenShot's transition system expects the 2nd
clip to fully cover up the first clip. For example, if the 2nd clip does not fully cover the first clip,
a transition might not be the best tool to use. Instead, you should consider adjusting the ``alpha`` property of the first
clip to make it fade out where needed, see :ref:`clip_properties_ref` or :ref:`clip_presets_ref`. Alternatively, you can
combine a transition and ``alpha`` fade when using transparent clips to more smoothly fade between then.

Cutting & Slicing
-----------------
OpenShot has many easy ways to adjust the start and end trim positions of a transition (otherwise known as cutting or trimming). The most common
Expand Down
1 change: 1 addition & 0 deletions images/Humanity/actions/custom/discord-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions images/Humanity/actions/custom/github-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions images/Humanity/actions/custom/launchpad-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions images/Humanity/actions/custom/paypal-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
142 changes: 142 additions & 0 deletions images/Humanity/actions/custom/reddit-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions images/openshot.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@
<file>Humanity/actions/custom/snap.svg</file>
<file>Humanity/actions/custom/center-on-playhead.svg</file>
<file>Humanity/actions/custom/camera-photo-symbolic.svg</file>
<file>Humanity/actions/custom/paypal-icon.svg</file>
<file>Humanity/actions/custom/discord-icon.svg</file>
<file>Humanity/actions/custom/launchpad-icon.svg</file>
<file>Humanity/actions/custom/github-icon.svg</file>
<file>Humanity/actions/custom/reddit-icon.svg</file>
<file>Humanity/mimes/16/font-x-generic.svg</file>
<file>Humanity/mimes/16/video-x-generic.svg</file>
<file>Humanity/status/16/dialog-error.svg</file>
Expand Down
Loading

0 comments on commit 8418a37

Please sign in to comment.