Commit Graph
1213 Commits
Author SHA1 Message Date
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 c82ef62b13 Merge branch 'master' of https://github.com/olive-editor/olive 2019-02-26 10:02:59 -08:00
itsmattkc 19618fb8e9 added thread count selection in export settings 2019-02-26 10:02:36 -08:00
U-COMTROL_US\mattm 9cb8f7a628 Use Ctrl instead of Shift for zoom modifier in timeline 2019-02-26 09:22:21 -06:00
itsmattkc 3233c0d0f9 fixed segmentation fault on release builds 2019-02-25 23:47:37 -08:00
itsmattkc 39d62fe394 fixed frei0r inconsistency 2019-02-25 23:01:51 -08:00
itsmattkc da2f51ee6e fixed missing include for gcc compiling 2019-02-25 22:51:39 -08:00
itsmattkc a1455ce9c7 changed preview generator functions to a static function 2019-02-25 22:07:19 -08:00
itsmattkc 47d0065eff implemented translating without restarting #514 2019-02-25 20:40:23 -08:00
itsmattkc c3373524b1 giant rendering overhaul and many small fixes 2019-02-25 13:47:18 -08:00
itsmattkc b9d7efa0bc Merge branch 'ocio2' 2019-02-21 00:32:26 -08:00
itsmattkc 74a5aa2a7d pulled emboss effect 2019-02-21 00:31:26 -08:00
itsmattkc 110b75a04d first commit 2019-02-20 19:13:10 -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
Matt Mayfield 5bcc3078ee Fix crash on double-click media item #534 2019-02-20 09:31:38 -06:00
alexmitchell cf3abe0e86 fix up white space, using spaces not tabs in this file 2019-02-20 16:08:30 +10:30
alexmitchell 76aad9c468 Added single frame highlight to playhead inside timelinewidget, only shows if frame is larger than
5px
2019-02-20 15:49:05 +10:30
itsmattkc e0b2cf3b7a implemented text shadow angles #490 #523 2019-02-19 17:48:55 -08:00
itsmattkc c833e4849d implemented #507 2019-02-19 16:59:42 -08:00
itsmattkc 7f1a418d1b fixed vst loading bug 2019-02-19 16:58:56 -08:00
itsmattkc 83ad41d9fd added memory includes 2019-02-19 10:42:02 -08:00
itsmattkc d15d630377 fixed broken effects path 2019-02-19 04:31:13 -08:00
itsmattkc ecf2d9cba3 documented config 2019-02-19 03:57:47 -08:00
itsmattkc 0f2deb76d9 merge of various commits 2019-02-19 02:41:01 -08:00
itsmattkc efbe2d187a minor clip changes 2019-02-19 02:38:21 -08:00
itsmattkc 7efea428c7 some refactoring work 2019-02-19 02:28:50 -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 ee967294ea reimplemented loading/saving into transitions 2019-02-19 02:05:21 -08:00
Jonathan Noble 23a43aba3e Removed 5 duplicated blocks of code.
https://sonarcloud.io/project/issues?id=jonno85uk_olive&issues=AWjXpEv0EzgCzR11xzeI&open=AWjXpEv0EzgCzR11xzeI
(cherry picked from commit 64bb2e7cdfac36a69e380a3c0ad5c25b97b4402f)

# Conflicts:
#	app/debug.cpp
2019-02-19 09:30:58 +00:00
itsmattkc a1619ce8ce transition rewrite mostly done 2019-02-19 01:16:37 -08:00
Jonathan Noble a77901e421 Merge remote-tracking branch 'upstream/master' into pull_requests
# Conflicts:
#	io/previewgenerator.cpp
#	ui/renderfunctions.cpp
2019-02-19 08:57:47 +00: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
Alexandre Prokoudine e3f79a44dc Update Russian translation 2019-02-18 16:55:12 +03:00
Alexandre Prokoudine 69272a8086 Mark user-visible message for translation 2019-02-18 16:50:10 +03:00
itsmattkc d1037d4ffa add transition rewrite 2019-02-18 03:13:27 -08:00
itsmattkc 886c5f1273 small timeline cleanup 2019-02-18 01:38:17 -08:00
itsmattkc 2bdafc72cb preview generator updates the appropriate ui when done 2019-02-17 23:46:39 -08:00
Mathis Dubrul e54304c46e Add french translation 2019-02-18 07:45:38 +01:00
itsmattkc a63b4fbe52 timeline minor refactor 2019-02-17 22:32:18 -08:00
itsmattkc 5cf5321c0f further progress on translation without restart 2019-02-17 03:36:23 -08:00
itsmattkc eb55a89cfd none bracket consistency 2019-02-17 03:16:23 -08:00
itsmattkc 5b59207cb4 started translating without restarting 2019-02-17 03:15:18 -08:00
itsmattkc 059e2a1fe8 began transition rewrite 2019-02-17 01:18:03 -08:00
itsmattkc 4b5cd8bd26 moved inits into constructor 2019-02-16 22:24:33 -08:00
itsmattkc f14b0cef7d replaced mediathrobber with mediaiconservice 2019-02-16 22:22:43 -08:00
itsmattkc 5207a0511f several conversions to smart pointers 2019-02-16 21:21:04 -08:00
itsmattkc e063a5ba8f switched global to unique ptr and renamed olive namespace 2019-02-16 15:08:33 -08:00
itsmattkc 3d0a65c70d rewrote void loading 2019-02-16 14:02:26 -08:00