cb6ac21219
src/effects: Catch-by-reference
2019-07-03 06:29:32 -04:00
8158a1f2fa
Catch-by-reference for tests/Clip_Tests
2019-07-03 06:28:57 -04:00
1b19ae7fe4
Merge pull request #249 from chad3814/crop
...
make use of crop_x, crop_y, crop_with, crop_height keyframes
2019-07-01 14:24:59 -05:00
3b62176f56
Merge pull request #262 from ferdnyc/fix-win32-install
...
Properly install DLL on Win32
2019-07-01 13:06:25 -05:00
19d8868cc6
Merge pull request #263 from OpenShot/cmake-owns-version
...
Move version info ownership to CMake (based on @ferdnyc PR https://github.com/OpenShot/libopenshot/pull/253 )
2019-07-01 12:56:51 -05:00
4e08ab32c1
Fixing a few more conflicts between this branch and develop
2019-07-01 12:43:31 -05:00
67e2ae4c1b
Merge branch 'develop' into cmake-owns-version
...
# Conflicts:
# CMakeLists.txt
2019-07-01 12:30:56 -05:00
376170d7dd
Merging work from @ferdnyc, to move version info to CMake, and other misc Cmake improvements. This was the easiest way to resolve the merge conflict for me (to apply it locally and commit it).
2019-07-01 12:24:50 -05:00
cf9fbf4402
Properly install DLL on Win32
...
Adding a RUNTIME DESTINATION to the install for the library
target will install the DLL on Windows systems, so it no
longer has to be manually copied in the `.gitlab-ci.yml` script
2019-06-26 21:19:02 -04:00
1e00618049
Merge pull request #199 from ckirmse/develop
...
fix grammar error with possessive its and update example code
2019-06-26 02:18:00 -04:00
8f42a9ff07
Fix tabs-vs-spaces indent in Timeline.h
2019-06-26 02:07:02 -04:00
572875b8d7
Merge remote-tracking branch 'upstream/develop' into develop
2019-06-24 10:00:22 -07:00
e2677e4512
fix the crop_x and crop_y min and max
2019-06-22 20:19:34 -05:00
094c378e67
add crop properties to json
2019-06-21 23:43:56 -05:00
a8d545ea92
Merge pull request #260 from OpenShot/revert-229-debian-py-fix
...
Revert "Don't break Python install path detection on Debian"
2019-06-21 17:01:34 -05:00
9d09b65e70
Revert "Don't break Python install path detection on Debian"
2019-06-21 16:47:37 -05:00
eea1293d6d
Merge pull request #229 from ferdnyc/debian-py-fix
...
Don't break Python install path detection on Debian
2019-06-21 16:32:27 -05:00
f2b98e8dbf
Merge pull request #259 from OpenShot/virtual-destructor-break
...
Removing duplicate destructor definitions and implementations
2019-06-21 16:09:54 -05:00
ac8876f810
Removing duplicated destructor definitions and implementations... so our virtual destructors will not break on older toolchains.
2019-06-21 15:57:41 -05:00
ffb5439a2e
Merge pull request #224 from sparfenyuk/develop
...
Add virtual destructor for abstract classes
2019-06-21 15:47:08 -05:00
f11acef193
Merge pull request #180 from jeffski/text-background-box
...
Add a text background colored box option to the text reader
2019-06-21 15:39:57 -05:00
16bb22c238
Merge pull request #247 from SuslikV/patch-5
...
Add 2 new multiplexing presets for mp4, mov files
2019-06-21 15:25:55 -05:00
e85e60594d
Merge pull request #223 from ferdnyc/patch-1
...
Travis CI: Also run `make install`
2019-06-21 15:18:58 -05:00
67794f96d9
Merge pull request #234 from jeffski/fix-settings-include-path
...
Fix path to Settings.h
2019-06-21 14:23:53 -05:00
09604311ad
Merge pull request #258 from OpenShot/auto-update-documentation
...
Auto update documentation (Doxygen)
2019-06-21 14:07:39 -05:00
FeRD (Frank Dana)
Jonathan Thomas
Chris Kirmse
Chad Walker