Jonathan Thomas
|
720c2d5ed7
|
Update Version.h
Reverting version for develop branch
|
2018-06-11 23:37:02 -07:00 |
|
Jonathan Thomas
|
f4b4aac7df
|
Update Frame.cpp
Fixing merge error
|
2018-06-11 23:36:23 -07:00 |
|
Jonathan Thomas
|
805304312a
|
Merge branch 'develop' into feature/new-audio-mixing
|
2018-06-11 23:32:05 -07:00 |
|
Jonathan Thomas
|
422f98a35b
|
Float max function
|
2018-06-11 22:45:31 -07:00 |
|
Jonathan Thomas
|
11a53e3292
|
Always use 1.0 as max_volume, unless greater than 1.0
|
2018-06-11 22:32:52 -07:00 |
|
Jonathan Thomas
|
b17bc83eae
|
Make windows artifact downloads not error on 404
|
2018-06-11 16:14:10 -07:00 |
|
Jonathan Thomas
|
322478f781
|
Make trigger use gitlab runner
|
2018-06-11 15:31:45 -07:00 |
|
Jonathan Thomas
|
fa59962bff
|
Make linux build manual, and remove error flag from curl
|
2018-06-11 15:14:19 -07:00 |
|
Jonathan Thomas
|
04e4f63ea8
|
Calculate max volume of all overlapping clips, and scale clip volume to fit within the 100%, to prevent popping
|
2018-06-11 12:02:21 -07:00 |
|
Jonathan Thomas
|
8942ae9037
|
Merge pull request #111 from OpenShot/feature/merge-develop-back-to-release
Updating release branch from develop
|
2018-06-07 17:02:07 -05:00 |
|
Jonathan Thomas
|
06b244f19a
|
Updating release branch from develop
|
2018-06-07 16:58:31 -05:00 |
|
Jonathan Thomas
|
c34ffdcd65
|
Merge pull request #110 from OpenShot/feature/more-gitlab-changes
Re-adding master to gitlab pipeline
|
2018-06-07 15:46:59 -05:00 |
|
Jonathan Thomas
|
05d97e0a97
|
Re-adding master to gitlab pipeline
|
2018-06-07 15:43:45 -05:00 |
|
Jonathan Thomas
|
c460bb3ff6
|
Merge pull request #109 from OpenShot/feature/support-custom-branches-in-gitlab
Adding conditional download of artifacts
|
2018-06-07 15:14:32 -05:00 |
|
Jonathan Thomas
|
08c2e03744
|
Merge branch 'develop' into feature/support-custom-branches-in-gitlab
|
2018-06-07 15:10:21 -05:00 |
|
Jonathan Thomas
|
780f3539c4
|
Adding conditional download of artifacts... use current branch name first, and then fallback to develop artifacts. This is to help the build pipeline support all branches.
|
2018-06-07 15:06:07 -05:00 |
|
Jonathan Thomas
|
a0481db9a5
|
Merge pull request #108 from OpenShot/feature/support-custom-branches-in-gitlab
Integrate custom libopenshot branches into GitLab build pipeline. Als…
|
2018-06-07 13:26:39 -05:00 |
|
Jonathan Thomas
|
c8bd54129b
|
Merge remote-tracking branch 'origin/feature/support-custom-branches-in-gitlab' into feature/support-custom-branches-in-gitlab
|
2018-06-07 13:15:12 -05:00 |
|
Jonathan Thomas
|
aecf7d96cb
|
Merge branch 'develop' into feature/support-custom-branches-in-gitlab
|
2018-06-06 14:52:17 -05:00 |
|
Jonathan Thomas
|
056d6fe776
|
Merge branches 'develop' and 'feature/support-custom-branches-in-gitlab' of github.com:OpenShot/libopenshot into feature/support-custom-branches-in-gitlab
|
2018-06-06 14:51:30 -05:00 |
|
Jonathan Thomas
|
b801907217
|
Integrate custom libopenshot branches into GitLab build pipeline. Also, download previous artifacts from same branch name, and default to develop if not found.
|
2018-06-06 14:48:58 -05:00 |
|
Jonathan Thomas
|
c175a345c2
|
Merge pull request #107 from OpenShot/bugfix/mask-windows-crash
Move critical sections to prevent crash on Windows
|
2018-06-06 13:45:55 -05:00 |
|
Jonathan Thomas
|
ace89efa59
|
Move critical sections to prevent crash on Windows
|
2018-06-06 06:31:46 -05:00 |
|
Jonathan Thomas
|
ad9952f971
|
Merge pull request #106 from OpenShot/bugfix/prevent-negative-starting-sample-release
Prevent a negative starting sample when adding audio to a frame
|
2018-06-06 06:18:05 -05:00 |
|
Jonathan Thomas
|
1c71659e94
|
Prevent a negative starting sample when adding audio to a frame
(cherry picked from commit 0327143)
|
2018-06-06 05:14:21 -05:00 |
|