Commit Graph
100 Commits
Author SHA1 Message Date
itsmattkc 7950223245 Update README.md 2019-10-02 17:58:44 +10:00
itsmattkc 5453fdc4ba Merge pull request #1070 from trebmuh/patch-1
Adds French to the menu item andthe appdata file
2019-08-25 11:23:20 +10:00
itsmattkc c19cd20c7c Update README.md 2019-08-22 12:39:31 +10:00
itsmattkc e939f4e60d Merge pull request #1051 from ibara/patch-1
Don't use GNU grep for OpenBSD package builds
2019-08-13 22:32:01 +10:00
itsmattkc 55fe8941e7 Merge pull request #1033 from eszlari/linux-metadata
linux/appdata: generate release info
2019-07-13 03:06:41 -04:00
itsmattkc 5e0e033485 Merge pull request #953 from olive-editor/sobotka-patch-1
Fix for #952
2019-05-15 01:05:02 +10:00
itsmattkc 1e3cf5337c Merge pull request #759 from eszlari/cmake-doxy
cmake: add doxygen
2019-05-03 00:19:00 +10:00
itsmattkc f81df00664 Merge pull request #862 from ZoomTen/icons-new
Filetype icons (light palette, Windows & Linux)
2019-05-02 21:42:06 +10:00
itsmattkc 1d9414d062 Merge pull request #877 from freshstudio/bugfix/875
Fix issue #875
2019-05-02 21:39:04 +10:00
itsmattkc 4bbab59d3b Merge pull request #878 from luzpaz/misc-typos
Misc. typos
2019-05-02 21:38:51 +10:00
itsmattkc ca72bdb527 Merge pull request #880 from cgvirus/master
Crop and vignette Inverse Feature added
2019-05-02 21:38:29 +10:00
itsmattkc 9e6226df29 Delete global.cpp 2019-05-02 21:35:43 +10:00
itsmattkc 1ba05323ca Merge pull request #887 from sobotka/patch-3
Update coefficients from busted up REC.601
2019-05-02 21:26:14 +10:00
itsmattkc 0526609e9a Merge branch 'master' into patch-3 2019-05-02 21:26:07 +10:00
itsmattkc 56e2c097ec Merge pull request #803 from naj59/master
lupdate and german translation update
2019-04-20 12:00:41 +10:00
itsmattkc ee93696bcf Merge pull request #846 from BrimsonBhin/patch-1
Include a feature request template
2019-04-20 11:54:43 +10:00
itsmattkc 68b62d15e7 Merge pull request #854 from sobotka/patch-2
Fix #853 lower_control_layout QSizePolicy
2019-04-20 11:53:14 +10:00
itsmattkc e7d6a06749 Merge pull request #855 from eszlari/patch-7
debian/control: add qttools5-dev
2019-04-20 11:52:50 +10:00
itsmattkc 0aae64bc06 Merge pull request #814 from eszlari/patch-5
cmake: set OpenGL_GL_PREFERENCE fallback to LEGACY
2019-04-17 21:52:43 +10:00
itsmattkc bbe9a7f87e Merge pull request #821 from eszlari/patch-6
cmake: try to fix PPA build (#818)
2019-04-17 21:52:32 +10:00
itsmattkc 8cef5ce94d Merge pull request #773 from ZoomTen/master
Update Indonesian translation
2019-04-14 22:29:33 +10:00
itsmattkc 6264123bea Merge pull request #630 from eszlari/cmake
add cmake buildsystem
2019-04-05 11:38:58 +11:00
itsmattkc 96886cdd97 Merge pull request #757 from ZoomTen/master
Update olive_id.ts
2019-04-05 10:56:11 +11:00
itsmattkc 4c20991c3e Merge pull request #743 from Symbian9/patch-2
Update olive_uk.ts
2019-04-05 10:55:55 +11:00
itsmattkc a6f3b4a5da Merge pull request #694 from prokoudine/master
Update Russian translation
2019-03-28 19:48:51 +11:00
itsmattkc e8474640d0 Merge pull request #669 from eszlari/patch-4
sourceiconview.h: include <QDropEvent>
2019-03-24 14:29:36 +11:00
itsmattkc a619bebf79 Merge pull request #678 from ZoomTen/master
Add Indonesian translation
2019-03-24 14:29:22 +11:00
itsmattkc 829c9826a7 Merge pull request #651 from Symbian9/patch-1
Update Ukrainian locale
2019-03-24 14:27:58 +11:00
itsmattkc 233a409bd0 Update README.md 2019-03-16 21:23:50 +11:00
itsmattkc 2bb48d7862 Update README.md 2019-03-16 21:18:59 +11:00
itsmattkc 76b3cf589b Merge pull request #622 from Symbian9/patch-1
Add Ukrainian translation
2019-03-14 22:42:22 +11:00
itsmattkc e2138cb85b Merge pull request #627 from prokoudine/master
Update Russian translation
2019-03-14 22:42:14 +11:00
itsmattkc ed05cedc48 fixed expired discord link 2019-03-12 16:49:32 +11:00
itsmattkc 0bc69af0f4 Merge pull request #604 from naj59/master
German translation update
2019-03-06 11:57:17 -08:00
itsmattkc a71e8b41da Merge pull request #585 from jonno85uk/pullrequests
Using <random> library instead of rand()
2019-03-06 10:34:46 -08:00
itsmattkc 53b2bff2bd Merge pull request #591 from mmuman/haiku-port
Preliminary Haiku port
2019-03-05 19:56:13 -08:00
itsmattkc f07dd6926d Merge pull request #582 from elsandosgrande/master
Translations
2019-03-02 16:34:47 -08:00
itsmattkc f19eded768 Update README.md 2019-03-01 12:02:53 -08:00
itsmattkc 2b158c22b7 Update README.md 2019-03-01 12:02:15 -08:00
itsmattkc b93cc9958a Merge pull request #577 from naj59/master
readme and issue template update
2019-03-01 12:00:17 -08:00
itsmattkc 9488927c86 Merge pull request #561 from mdmayfield/gitignore
Add Qt artifacts to .gitignore
2019-02-27 11:46:38 -08:00
itsmattkc 8ba58acbc3 Merge pull request #533 from alcomposer/playhead_frame_highlight
Single frame highlight to playhead
2019-02-26 10:25:38 -08:00
itsmattkc 66ec4aaf75 Merge pull request #558 from mdmayfield/master
Use Ctrl instead of Shift for zoom modifier in timeline
2019-02-26 10:03:22 -08:00
itsmattkc f4668e317a Merge pull request #536 from mdmayfield/master
Fix crash on double-click media item #534
2019-02-20 11:22:34 -08:00
itsmattkc 6b648d218d Merge pull request #530 from jonno85uk/pull_requests
Simplification of debug.cpp:debug_message_handler
2019-02-19 02:09:26 -08:00
itsmattkc b848116c63 Merge pull request #527 from prokoudine/master
Mark user-visible message for translation and update Russian translation to match latest changes
2019-02-18 23:19:38 -08:00
itsmattkc 4a3bb6e93a Merge pull request #526 from Matouche/master
Add French translation
2019-02-18 23:19:22 -08:00
itsmattkc 0ac9dd9f42 Merge pull request #513 from elsandosgrande/master
Translations
2019-02-15 05:43:15 -08:00
itsmattkc b15f3167d5 Merge pull request #509 from elsandosgrande/master
Translations
2019-02-14 01:57:04 -08:00
itsmattkc ae3ac64093 Merge pull request #508 from naj59/master
basic issue template
2019-02-13 16:27:03 -08:00
itsmattkc c596456a68 Merge pull request #486 from prokoudine/master
Updated Russian translation
2019-02-12 16:12:56 -08:00
itsmattkc 96dfd30ae9 Merge pull request #481 from eszlari/wayland-icon
linux/wayland: fix icon
2019-02-12 16:12:28 -08:00
itsmattkc d289f5584b Merge pull request #468 from naj59/master
updated german translation
2019-02-09 17:21:23 -08:00
itsmattkc 48f1d0affe Merge pull request #431 from prokoudine/master
Updated Russian translation
2019-02-04 11:39:16 +11:00
itsmattkc 65d40a8c9e Merge pull request #423 from prokoudine/master
Mark a bunch of user-visible messages for translation
2019-02-04 02:42:27 +11:00
itsmattkc e35145731d Update README.md 2019-02-04 02:37:03 +11:00
itsmattkc 7d7250c82e Merge pull request #417 from CodingBobby/master
Update olive_de.ts
2019-02-03 15:30:20 +11:00
itsmattkc 7aa0734c7f Merge pull request #412 from alcomposer/fix_timecodeeffect_descent
Simple fix for timecode text dropping too low within background
2019-02-03 15:30:11 +11:00
itsmattkc 620aa875ff Merge pull request #408 from prokoudine/master
Add initial Russian translation
2019-02-03 01:33:09 +11:00
itsmattkc 56b543bd6d Merge pull request #404 from olive-editor/proxies
core proxy support
2019-02-02 15:01:48 +11:00
itsmattkc a21b7e5eb3 Merge pull request #392 from alcomposer/marker_small_fix
Repaint timeline after adding marker & tell user if they are adding a
2019-02-02 12:34:15 +11:00
itsmattkc 3278df9a2a Merge pull request #358 from oc1024/master
Extra Keying Effects I: Luma Key and Color Selector
2019-02-02 00:09:22 +11:00
itsmattkc c8aec606d0 Merge pull request #379 from naj59/master
added initial german translation
2019-01-31 03:51:41 +11:00
itsmattkc 13b4c22ea8 Merge pull request #378 from olive-editor/variousimprovements
various improvements
2019-01-30 23:21:23 +11:00
itsmattkc 00944ba17e Merge pull request #374 from naj59/master
fixed translation files
2019-01-30 01:14:58 +11:00
itsmattkc dab1f467cc Merge pull request #373 from olive-editor/betterzoom
for viewer zooming, scale texture instead of surface #332
2019-01-29 15:22:51 +11:00
itsmattkc 6e1e342c16 Merge pull request #371 from olive-editor/blendmodefix
expanded blending pipeline, added shader blending modes, other fixes
2019-01-28 17:35:21 +11:00
itsmattkc 0bd3e6949c Merge pull request #338 from eszlari/patch-3
snap: use make install
2019-01-21 19:57:29 +11:00
itsmattkc d00ad46f26 Merge pull request #339 from olive-editor/frei0r
added frei0r support for windows/mac/linux
2019-01-21 11:55:13 +11:00
itsmattkc 3d34572eb7 Merge pull request #287 from pgilfernandez/project_icons
updated project icons
2019-01-20 12:21:13 +11:00
itsmattkc 6d2dcecda4 Merge pull request #325 from olive-editor/threadedgl2
move renderer to separate thread
2019-01-17 23:10:27 +11:00
itsmattkc 5daebac30d Merge pull request #309 from olive-editor/translation
wrapped all string literals with tr()
2019-01-12 21:55:15 +11:00
itsmattkc ab02ecd3f7 Merge pull request #303 from olive-editor/debugdialog
rewrote debug message handler
2019-01-12 00:56:45 +11:00
itsmattkc f0155a3ac8 Merge pull request #301 from Carmot/master
Minor fixes.
2019-01-11 22:24:16 +11:00
itsmattkc 8929c93272 Merge pull request #293 from prokoudine/master
More proportional font size in the Action Search dialog
2019-01-10 13:49:52 +11:00
itsmattkc 7fc2bf6bbc Merge pull request #295 from olive-editor/nulleffect
added void effect if Olive couldn't find one requested by a project
2019-01-10 13:27:18 +11:00
itsmattkc 1de4065b3c Merge pull request #294 from Symbian9/patch-1
Appdata: add Ukrainian translation
2019-01-10 13:21:08 +11:00
itsmattkc 21ef8ab7b5 Merge pull request #290 from prokoudine/master
Add default shortcut for Action Search
2019-01-10 11:32:31 +11:00
itsmattkc 796a21ec53 Merge pull request #292 from olive-editor/exportkeys
import/export keys
2019-01-10 11:26:45 +11:00
itsmattkc d9f173f4dd Merge pull request #282 from olive-editor/winvst
vst 2.4 support on windows
2019-01-09 14:45:57 +11:00
itsmattkc 24e643ce19 Merge pull request #271 from eszlari/new-screenshot
linux/appdata: 1600x900 screenshot
2019-01-08 17:14:30 +11:00
itsmattkc 952c67972b Merge pull request #266 from olive-editor/actionsearch
implemented action search
2019-01-07 17:51:15 +11:00
itsmattkc a16993b36e Merge pull request #261 from olive-editor/commitmsg
added commit hash to titlebar
2019-01-07 09:50:22 +11:00
itsmattkc 78d359f4cd Merge pull request #224 from eszlari/move-to-packaging
Move OS-specific files to /packaging
2019-01-06 21:07:57 +11:00
itsmattkc 7857b064ff Merge pull request #253 from olive-editor/pptoolbar
added optional project panel toolbar
2019-01-06 21:07:09 +11:00
itsmattkc 7e8afc8967 Merge pull request #252 from olive-editor/frconform
added frame rate conforming for media
2019-01-06 20:26:47 +11:00
itsmattkc e959ea3b7f Merge pull request #251 from olive-editor/keysaves
added saving keyboard shortcuts
2019-01-06 16:59:10 +11:00
itsmattkc 69a33c756c Merge pull request #245 from olive-editor/bezierkeys
bezier keyframes and keyframe system overhaul
2019-01-04 23:12:13 +11:00
itsmattkc ec8e42cc02 Merge pull request #236 from eszlari/patch-2
appdata: screenshot, license, bugtracker
2019-01-03 14:05:38 +11:00
itsmattkc 42964befe7 Merge pull request #235 from eszlari/patch-1
Linux mime: add icon
2019-01-03 10:00:03 +11:00
itsmattkc acea409a8c Merge pull request #223 from olive-editor/timelinebehaviorfixes
tons of fixes and enhancements
2018-12-31 01:33:14 +11:00
itsmattkc 7e3f245962 Merge pull request #220 from olive-editor/timelinebehaviorfixes
fixed crash when copying an effect after copying a clip
2018-12-30 08:39:58 +11:00
itsmattkc 1f2ae6094b Merge pull request #214 from Cambloid/patch-2
Refactoring names of ui components in effectcontrols
2018-12-29 11:29:51 +11:00
itsmattkc a321068fb1 Merge pull request #210 from eszlari/install-target
support make install for Linux
2018-12-29 11:27:46 +11:00
itsmattkc a5ff76575b Merge pull request #209 from probonopd/patch-1
Build and upload AppImage, closes #159
2018-12-28 09:02:54 +11:00
itsmattkc 11d0a17bcb Merge pull request #217 from LeandroStanger/patch-2
Update org.olivevideoeditor.Olive.appdata.xml
2018-12-28 08:14:21 +11:00
itsmattkc 66ff0d758a Merge pull request #216 from prokoudine/master
Add missing tooltip for the Hand tool
2018-12-28 08:14:04 +11:00
itsmattkc 4f9c4b080a Merge pull request #215 from prokoudine/master
Remove pleonasms in appdata/desktop files, add Russian translation
2018-12-27 23:57:59 +11:00
itsmattkc 088aad5ffb Merge pull request #212 from LeandroStanger/patch-1
Translation support for Appdata.xml
2018-12-27 23:04:11 +11:00
itsmattkc 227089e707 Merge pull request #211 from alcomposer/update_aa_playhead
remove unnecessary AA playhead functions
2018-12-27 22:52:52 +11:00