Frank Dana
47d69779b6
Fix override syntax
...
Overrides go at the end of the declaration. Qt also has the `Q_DECL_OVERRIDE` preprocessor define, which expands to `override` only when building the code using C++11 or higher.
2019-07-16 12:28:00 -04:00
nick black
4a1d133da8
PlayerDemo: declare keyPressEvent() override
2019-07-16 10:37:45 -04:00
Jonathan Thomas
89fcf5ca57
Merge pull request #278 from OpenShot/msys2-update
...
Updating MSYS2, New Cmake builder syntax
2019-07-16 02:17:10 -05:00
Jonathan Thomas
09a1715dea
Updating MSYS2 with new syntax
2019-07-16 01:57:43 -05:00
Frank Dana
ed4b32d4f5
Merge pull request #273 from ferdnyc/free-jsonobjs
...
Clean up allocated memory in JSON code
2019-07-12 00:37:36 -04:00
FeRD (Frank Dana)
35eb6adc55
Clean up allocated memory in JSON code
2019-07-11 05:00:47 -04:00
Frank Dana
8f6672be08
Merge pull request #270 from OpenShot/ferdnyc-patch-1
...
Correct parameter documentation for brightness
2019-07-10 05:18:05 -04:00
Frank Dana
86e610bfc8
Fix parameter documentation for brightness
...
The range was listed as 0 – 100, but implemented as -1 – +1. Edited documentation to reflect reality.
Reported by @jeffski like a year and a half ago.
Fixes #71
2019-07-10 04:48:31 -04:00
Jonathan Thomas
72b04ce838
Merge pull request #269 from OpenShot/fix-resvg-render-size
...
Fix resvg rendering issues for common transitions
2019-07-09 16:07:23 -05:00
Jonathan Thomas
9806694e13
Fix crash caused by resvg failing to parse SVG (when Qt can still parse things fine)
2019-07-09 15:48:46 -05:00
Jonathan Thomas
a4cc119717
Fix SVG render size for Resvg (breaking common transitions)
2019-07-09 15:23:52 -05:00
Jonathan Thomas
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
Jonathan Thomas
3b62176f56
Merge pull request #262 from ferdnyc/fix-win32-install
...
Properly install DLL on Win32
2019-07-01 13:06:25 -05:00
Jonathan Thomas
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
Jonathan Thomas
4e08ab32c1
Fixing a few more conflicts between this branch and develop
2019-07-01 12:43:31 -05:00
Jonathan Thomas
67e2ae4c1b
Merge branch 'develop' into cmake-owns-version
...
# Conflicts:
# CMakeLists.txt
2019-07-01 12:30:56 -05:00
Jonathan Thomas
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
FeRD (Frank Dana)
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
Frank Dana
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
Frank Dana
8f42a9ff07
Fix tabs-vs-spaces indent in Timeline.h
2019-06-26 02:07:02 -04:00
Chris Kirmse
572875b8d7
Merge remote-tracking branch 'upstream/develop' into develop
2019-06-24 10:00:22 -07:00
Chad Walker
e2677e4512
fix the crop_x and crop_y min and max
2019-06-22 20:19:34 -05:00
Chad Walker
094c378e67
add crop properties to json
2019-06-21 23:43:56 -05:00
Jonathan Thomas
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
Jonathan Thomas
9d09b65e70
Revert "Don't break Python install path detection on Debian"
2019-06-21 16:47:37 -05:00
