oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,372 Commits 1 Branch 0 Tags
fd30643204b84e01b2f8454936efdfccba47602b
Commit Graph
3372 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
itsmattkc fd30643204 Merge branch 'master' of https://github.com/olive-editor/olive 2020-05-06 00:23:11 +10:00
itsmattkc 721f6a79b4 mild conform to the rest of the code 2020-05-06 00:22:43 +10:00
itsmattkc 0d0d35f025 Merge branch 'ire_lines' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-ire_lines 2020-05-06 00:12:37 +10:00
itsmattkc d5f293c02a Merge branch 'master' of https://github.com/olive-editor/olive 2020-05-06 00:11:09 +10:00
itsmattkc 17876410b5 rewrote OCIO C locale patch 
Previous build was getting optimized out. This one shouldn't.
 2020-05-06 00:10:10 +10:00
itsmattkc c6213b32ad Merge branch 'nodeviewredux' 2020-05-05 23:47:33 +10:00
itsmattkc af994cd1b6 preferences: added preference for node color scheme 2020-05-05 23:47:03 +10:00
itsmattkc 0628ddb901 nodes: use different colors from config based on category 2020-05-05 23:24:00 +10:00
itsmattkc 74d252c5c0 nodes: use defined categories rather than arbitrary string based 2020-05-05 22:12:15 +10:00
Thomas Wilshaw 1e81969fca Waveform fixes 
- Due to a floating point division error not all the bars on the waveform were
  being drawn.
- Fix ratio in the fragment shader
 2020-05-05 11:29:15 +01:00
itsmattkc 911ef782f9 colormanager: always temporarily set C locale when loading an OCIO config from file 
Fixes known bug in OCIO when loading files from non-English locales.
 2020-05-05 14:48:09 +10:00
Thomas Wilshaw 921a5f357e Merge branch 'master' of https://github.com/olive-editor/olive 2020-05-04 18:11:43 +01:00
itsmattkc 1bf0f90a0a Merge pull request #1145 from eszlari/cmake-generate 
ocioconf: replace script with cmake
 2020-05-05 02:58:35 +10:00
itsmattkc 51c896ed7e scopes: moved all shared code to a base class to easily add more scopes 2020-05-05 02:41:16 +10:00
ThomasWilshaw 3074e4e507 Merge pull request #1 from olive-editor/master 
Merge Olive into fork
 2020-05-04 17:34:03 +01:00
itsmattkc 30efe054c7 colordialog: if display changes, ensure views change before anything else 
Prevents exception if new display doesn't contain current view.
 2020-05-05 00:42:55 +10:00
itsmattkc b80eb6fd45 track: fixed segfault if user tried to use "add" tool on nonexistant track 2020-05-05 00:36:28 +10:00
itsmattkc 63f3e542ee style: fixed windows compile issue 2020-05-04 12:58:28 +10:00
Peter Eszlari 2c8ebdf0d2 ocioconf: replace script with cmake 2020-05-04 04:35:32 +02:00
itsmattkc 1fa3f4edb4 footageproperties: auto-select first usable stream (fixes #105) 2020-05-04 02:09:52 +10:00
itsmattkc 22bfff2c62 proxy: improved progress signalling 
Signals once cache to disk is fully complete (rather than signalling on decode
and then sitting at 100% for ages until the disk saving is done).
 2020-05-04 01:53:47 +10:00
itsmattkc b458bfa542 proxy: improved UI on proxy menu 2020-05-04 01:33:26 +10:00
itsmattkc 2b1640ac04 frame/texture: use dividers when allocating buffers 
Allows render pipeline to know the "real" and "simulated" resolution of a
divided buffer.
 2020-05-04 01:08:46 +10:00
itsmattkc e4e797c901 proxy: cleaned up, re-use the render cache's disk save system for proxies, multithreaded compression 2020-05-04 00:29:26 +10:00
itsmattkc f7f437ab04 Merge branch 'master' into exrproxy 2020-05-03 17:15:32 +10:00
itsmattkc b2acb5c326 style: use native menu styling on macOS too 2020-05-03 17:15:09 +10:00
itsmattkc 6754feb2f6 proxy: began work towards creating proxy from video 2020-05-03 17:09:52 +10:00
itsmattkc e4c3b6bf7b renderer/decoder: simplified audio PCM transcode 
Turned the two-step PCM transcode into one step and simplified/removed much of
the unnecessary infrastructure that supported it. This makes the code cleaner
and generally improves the code paths.
 2020-05-03 16:07:10 +10:00
itsmattkc a925476c3f began work on exr proxy task 2020-05-03 05:23:36 +10:00
itsmattkc 403a8a8656 ocio: change lut edge size to 64 instead of 32 
Doesn't "solve" the white inaccuracy issue, but does mitigate it somewhat. Also
improves accuracy across the board.
 2020-05-03 03:14:38 +10:00
itsmattkc 80acd91d88 created script to auto-generate qt resource file from ocio config 2020-05-03 02:21:52 +10:00
itsmattkc c5458c6843 timeline: use headers in waveform data files rather than sidecar metadata files 2020-05-03 00:44:14 +10:00
itsmattkc 2d0e5322f2 oiiodecoder: fixed namespace issue 2020-05-02 22:55:45 +10:00
itsmattkc 3e57cdac1d use linesize workaround for setting OIIO pixels as well as getting 2020-05-02 22:51:29 +10:00
itsmattkc 90597bd08a mainmenu: fixed bug in window menu 2020-05-02 16:28:06 +10:00
itsmattkc 676b18ba6e timelineviewblockitem: fixed incorrectly positioned underline 2020-05-02 15:45:16 +10:00
itsmattkc 4f23db02db preferences: removed integer quality modes 2020-05-02 15:36:35 +10:00
itsmattkc 6a50c0a66d Merge branch 'master' of https://github.com/olive-editor/olive 2020-05-01 18:19:38 +10:00
itsmattkc e7400adabc oiiodecoder: added compatibility for OIIO 1.x 2020-05-01 18:19:08 +10:00
itsmattkc 4a225aff85 colormanager: show OCIO error if env config failed to load 2020-05-01 17:55:04 +10:00
itsmattkc b39403a4e9 fixed formatting on contributing page 2020-05-01 17:03:06 +10:00
itsmattkc e67dabf1ff keyframes: implemented deleting keyframes with the delete shortcut 2020-05-01 17:01:16 +10:00
itsmattkc ca323b7bfd updated contributing page with more information 2020-05-01 16:57:13 +10:00
itsmattkc 4290797389 colormanager: use env variable as default config if it exists 2020-05-01 16:33:46 +10:00
itsmattkc 6433a0bb8c appveyor: fixed incorrect comparison in last commit 2020-05-01 14:40:07 +10:00
itsmattkc 2125293a3c appveyor: use ninja to build and try to prevent deploying on PRs 2020-05-01 14:38:49 +10:00
itsmattkc 9335815d20 waveform: ensure waveform updates on null buffers 2020-05-01 14:20:35 +10:00
itsmattkc baf954a4e0 cmake: add minimum macos version 2020-05-01 14:00:40 +10:00
itsmattkc be5e5042bd timeline: prevent rubberband from showing if the user right clicked 2020-05-01 04:08:35 +10:00
itsmattkc 6f2993477d added null check for audio that hasn't been indexed yet 2020-05-01 03:51:56 +10:00