Brenno A. C. Caldato
|
b6975ae4cf
|
Update src/effects/Stabilizer.h
Co-authored-by: Frank Dana <ferdnyc@gmail.com>
|
2021-01-11 21:22:36 -03:00 |
|
Brenno A. C. Caldato
|
e19c9310e5
|
Apply suggestions from code review
Co-authored-by: Frank Dana <ferdnyc@gmail.com>
|
2021-01-11 21:21:36 -03:00 |
|
Jonathan Thomas
|
49097cecb9
|
Merge pull request #614 from OpenShot/jonoomph-updating-protobuf-library
Fixing INSTALL issue related to ProtoBufMessage.dylib
|
2021-01-11 17:13:11 -06:00 |
|
Jonathan Thomas
|
ad73d23866
|
Updating link to renamed protobuf library
|
2021-01-11 16:38:55 -06:00 |
|
Jonathan Thomas
|
da83d572f6
|
Changing name of ProtoBufMessage to openshot_protobuf for clarity, also installing it in PREFIX/lib
|
2021-01-11 16:36:01 -06:00 |
|
Brenno
|
5b5763eebb
|
Merge remote-tracking branch 'origin/develop' into opencv
|
2020-12-17 22:19:10 -03:00 |
|
Brenno
|
6342d4350a
|
Fixed protobuf message compiling on Mac
|
2020-12-17 22:15:10 -03:00 |
|
Brenno
|
29b28f95dc
|
Improved protobuf message compiling
|
2020-12-12 20:38:06 -03:00 |
|
Frank Dana
|
d27cf22ed2
|
label-conflicts: Only on branch push, not PR (#600)
|
2020-12-12 08:50:41 -05:00 |
|
Frank Dana
|
ed5b2e2ae2
|
Switch to Github Actions for CI builds (#599)
* Use Github Actions for CI
* Incorporate coverage into os_test target
* CMake: Make 'test' an alias for 'os_test'
* Coverage in all clang builds
|
2020-12-12 08:36:59 -05:00 |
|
Jonathan Thomas
|
fabe580383
|
Update .gitlab-ci.yml
Fixing path for Qt and Python on opencv branch
|
2020-12-07 13:58:16 -06:00 |
|
Jonathan Thomas
|
141e1dad0c
|
Merge pull request #598 from OpenShot/jonoomph-patch-mac-qt-path
Update .gitlab-ci.yml
|
2020-12-07 13:54:21 -06:00 |
|
Jonathan Thomas
|
d2dafe841c
|
Update .gitlab-ci.yml
Fix qt path on mac builder
|
2020-12-07 11:00:39 -06:00 |
|
Jonathan Thomas
|
7ba7d92021
|
Merge pull request #597 from OpenShot/jonoomph-gitlab-mac-build
Update .gitlab-ci.yml
|
2020-12-04 09:05:55 -06:00 |
|
Jonathan Thomas
|
ad5052c6a4
|
Update .gitlab-ci.yml
Adding new Qt path prefix
|
2020-12-04 08:48:08 -06:00 |
|
Jonathan Thomas
|
69a23732b3
|
Update .gitlab-ci.yml
Removing specific Qt and Python paths on Mac build script
|
2020-12-04 08:45:45 -06:00 |
|
Frank Dana
|
e8b4dde32e
|
Timeline::GetClip: Add anti-slicing unit tests (#596)
|
2020-12-04 09:25:30 -05:00 |
|
Jonathan Thomas
|
e6eef0da88
|
Merge pull request #595 from OpenShot/fix-get-clip-method
Fixing an issue caused by timeline::GetClip returning a ClipBase* instead of Clip*
|
2020-12-03 12:51:31 -06:00 |
|
Jonathan Thomas
|
ac73bd965d
|
Fixing an issue caused by timeline::GetClip returning a ClipBase instead of a Clip (broke waveform generation).
Also adding a swig definition for the Caption effect.
|
2020-12-03 10:52:27 -06:00 |
|
Frank Dana
|
9a91abc0c2
|
Merge pull request #594 from ferdnyc/overrides-and-types
Overrides and types
|
2020-11-27 03:36:14 -05:00 |
|
FeRD (Frank Dana)
|
9c1ca0ca73
|
Clip: Mark methods as overrides
|
2020-11-27 03:28:03 -05:00 |
|
FeRD (Frank Dana)
|
2f6d88e168
|
various Readers: Fix GetCache return type
Tests: fix ImageWriter cache type
|
2020-11-27 03:28:03 -05:00 |
|
Frank Dana
|
aab6d1cb23
|
Merge pull request #590 from ferdnyc/label-merge-conflicts
Add label-merge-conflicts Action workflow
|
2020-11-19 08:47:44 -05:00 |
|
FeRD (Frank Dana)
|
9d34707317
|
Add label-merge-conflicts Action workflow
|
2020-11-19 08:46:16 -05:00 |
|
FeRD (Frank Dana)
|
39b4aa97eb
|
Make OpenShotAudio loading conditional
|
2020-11-08 02:29:50 -05:00 |
|