oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,345 Commits 1 Branch 0 Tags
fa8dc8892bddafdb6e246fec00d1a8d712e2ba90
Commit Graph
230 Commits
Author SHA1 Message Date
itsmattkc e91ae5e4df Merge branch 'master' into multicam 2022-10-01 13:51:04 -07:00
itsmattkc df97df635d timeline: implement nest function 
Also includes some improved cache/request code
 2022-10-01 13:04:51 -07:00
itsmattkc 3abc9eb1d1 nodes: revise means of limiting array elements 2022-09-19 08:55:37 -07:00
itsmattkc d0e12ce607 timeline: add options for manually caching and discarding parts of clips 2022-09-13 19:19:42 -07:00
itsmattkc 53def87749 timeline: request caches on import 2022-09-01 11:05:30 -07:00
itsmattkc 54d0a94a20 Merge branch 'master' into cache-update 2022-08-18 08:12:46 -07:00
itsmattkc a3d6ecc4fd timeline: skip gaps when moving blocks 2022-08-08 11:31:31 -07:00
itsmattkc 9b8c23c994 timeline: fix issue where subtitle text wasn't shown 2022-07-19 10:23:54 -07:00
itsmattkc 7e1792cfea Merge branch 'master' into cache-update 2022-07-01 22:32:49 -05:00
itsmattkc 079d6beff2 timeline: separate markers and workarea 2022-06-27 23:39:31 -07:00
itsmattkc e27c53bea8 timeline: relink duplicated clips 2022-06-10 10:34:51 -07:00
itsmattkc eeea16c5c3 cache: add passthroughs to allow shallow copies of data 2022-06-06 20:06:43 -07:00
itsmattkc e3c3ee9ac4 code: removed unnecessary code 2022-05-30 08:59:25 -07:00
itsmattkc 2f7dc3c98b implemented separate waveform cache 2022-05-29 17:52:35 -07:00
itsmattkc f124ad3178 cache waveforms at clip level 2022-05-22 20:54:59 -07:00
itsmattkc 3cf01c1464 timeline: show media in adj in ghost overlays 2022-05-21 19:55:14 -07:00
itsmattkc 7ab3350c59 timeline: ensure tentative subtitle command is taken when dropping onto null 2022-05-16 09:06:49 -07:00
itsmattkc 20d04af64b timeline: use sequence dimensions for width and height 
Fixes #1923
 2022-05-16 08:47:08 -07:00
itsmattkc 7130371690 timeline: improved subtitle import behavior 2022-05-16 08:37:14 -07:00
itsmattkc 1fa51613f9 improved transition behavior 
This is still not complete, but definitely should help a lot
 2022-05-15 11:06:45 -07:00
itsmattkc fb72ca4997 timeline: fix bug in trackviewitem drag/drop 2022-05-13 20:34:29 -07:00
itsmattkc 07f92911cd text: minor refactoring to make rect setting code more reusable 2022-05-13 08:41:22 -07:00
itsmattkc 1def68f1a4 viewer: allow adding objects with a rect 2022-05-12 13:40:11 -07:00
itsmattkc c0ad244397 nodeview: implement dragging items from project explorer into node view 2022-05-11 14:55:07 -07:00
itsmattkc 83e7707025 media: implement importing SRT files 2022-05-11 13:48:59 -07:00
itsmattkc 4b366a9b73 update copyright year to 2022 2022-05-10 10:38:56 -07:00
itsmattkc 91b761693b code: use config macro 
Macro is much easier to use and more readable
 2022-05-04 09:50:34 -07:00
itsmattkc ef515579df completed audio recording implementation 2022-05-02 17:05:11 -07:00
itsmattkc 9101f5dc49 implemented core audio recording support 2022-05-02 14:00:03 -07:00
itsmattkc e6d4fe43de reworked and vastly improved snapping subsystem 2022-05-02 00:01:49 -07:00
itsmattkc e8dde836e3 Merge branch 'master' into pr/1717 2022-05-01 10:58:44 -07:00
itsmattkc 25d0196094 timeline: add links when trimming adjacent gaps 
Fixes #1808
 2022-04-12 00:32:15 -07:00
itsmattkc 7ceb5c0914 timeline: implement track select tool 
Fixes #866
 2022-04-11 19:49:50 -07:00
itsmattkc 518f57992e cmake: revert to C++14 
I've modified some of the code so our C++ version can decrease back to C++14. If this fixes the OTIO linker issue... well that sucks. Hopefully whatever the issue is gets resolved some time so that we can upgrade to C++17
 2022-03-28 00:40:19 -07:00
itsmattkc 16580841a6 Squashed commit of the following: 
commit 8619bb044081da81b4eef238d138bd051e678a4c
Merge: 1a767e0c2 1c30c4d36
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sun Mar 27 23:59:10 2022 -0700

    Merge branch 'master' into gizmo-rework

commit 1a767e0c2279cac3baf96a9028c1b78ec0491e00
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sun Mar 27 17:23:07 2022 -0700

    implement custom html parser/exporter

commit bbd9361d345ce864d198f4340b3d59f526e642e5
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 22:27:17 2022 -0800

    textgizmo: further improved behavior

commit 27634d5d377f03cab009bca418765d73764893f2
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 22:26:19 2022 -0800

    textgizmo: improved double click behavior

commit 0897ebfa36e676461c7a47305a3c1bf66e7a9fd1
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 10:20:57 2022 -0800

    text: added more features and improvements

commit 9d6446a25d977ea0c66e5f5c69239aed0e92fe83
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 10:14:59 2022 -0800

    text: don't create color input

commit d1d3b9d46e74d8197ba3485a8e965068eb245166
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 09:10:23 2022 -0800

    text: convert to reference space

commit 3ba1565129a0bdd74b860b1869fec5ef30025abb
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 17:57:26 2022 -0800

    finally got scaling to work

    holy shit I never thought it'd be this easy

commit 081368cfac9b49a171db6c1d576e134903dffac0
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 11:25:58 2022 -0800

    improved text behavior

commit f3eda52eee29b7cd354d7d90b3ae1a819e1b1cf2
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 11:08:31 2022 -0800

    implemented font styles (weights and italics)

commit 0898b613ec9b473ac93996536d00541e0a2a3f74
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 01:26:13 2022 -0800

    implemented beginnings of text gizmo

commit bffb8ede2d425e7391d16bc03e613d4d90367add
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sun Mar 6 17:55:03 2022 -0800

    conformed transform node to new gizmos

commit 1a1f86fa9bec9ea6b67f77032748c04b6b4c95fd
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sat Mar 5 11:16:34 2022 -0800

    update polygon node

commit 2388dd69164e8c57e0a1d221c7680a0d39173c2c
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Fri Mar 4 15:31:39 2022 -0800

    implement glsl hack for corner pin

commit e96df6cb326fb278cc6555890ff0ac1d37ebf4bf
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 17:06:14 2022 -0800

    updated corner pin

commit c70aa0e72d4e83045c84259294608c1380e8929b
Merge: 5afed6383 780342881
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 17:04:40 2022 -0800

    Merge branch 'master' into gizmo-rework

commit 5afed6383952d7d936b5eeda2556339c854610af
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 16:55:57 2022 -0800

    use float points for more precise math

commit 159ade0d2812d556dee57f99e3f733ef1e838d01
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 16:55:40 2022 -0800

    ported shape node

commit 28f9500d7bc6cd2661ee9ea591db7b3f8d583196
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 15:50:19 2022 -0800

    implemented enough dragging code to reimplement crop

    Requires far less boiler-plate code per node

commit 5aeaa59227ad2f1dc3c7f499c636de843a262a88
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 2 19:45:04 2022 -0800

    update just merged corner pin for new gizmos

commit 8a2d041650d1b873c6d87664564ebcdf92a3760f
Merge: c916e8e08 f5b4729a1
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 2 19:38:36 2022 -0800

    Merge branch 'master' into gizmo-rework

commit c916e8e08016c1d0b72d85087db76e4137587d52
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 2 19:35:09 2022 -0800

    gizmos: rewrote drawing into standard routines

    Work towards a far more maintainable gizmo system
 2022-03-28 00:01:48 -07:00
ThomasWilshaw 02b9a38737 Merge branch 'master' into marker 2022-01-28 22:30:29 +00:00
itsmattkc cce379ad22 handle cache properly in ripple delete 2022-01-28 13:49:49 -08:00
itsmattkc 9d5ec1e60f Merge branch 'node-view-show-ctx' 2022-01-02 12:15:55 -08:00
itsmattkc 3c95ff7ac8 recalculate selected nodes on pointer operation 2021-12-29 00:54:48 -08:00
itsmattkc 93be94bc2c more work 2021-11-16 23:58:34 -08:00
itsmattkc 6033039046 improved connector UI in node view 2021-11-10 21:59:54 -08:00
Thomas Wilshaw e606c156c5 Cleanup for review 2021-11-09 11:59:29 +00:00
itsmattkc dc79a6a5d9 revised text node 
Fixes #1684
 2021-10-25 15:46:06 -07:00
itsmattkc 4ed9ba5475 rename current text effect to textlegacy 2021-10-25 14:54:48 -07:00
Thomas Wilshaw 91ae2ecc44 Make sure either clips are selected or markers are selected, never both. 2021-10-22 22:15:51 +01:00
itsmattkc c29939b523 use audio waveform constants to determine min/max zoom levels 2021-09-28 21:35:24 -07:00
itsmattkc 407407491f timeline: add null check 2021-09-27 11:05:35 -07:00
itsmattkc 401f8d394c shapenode: added gizmos 2021-09-22 01:45:05 -07:00
itsmattkc dc7f7a6dda formalized valuehint as a class 2021-09-21 20:13:14 -07:00
itsmattkc 751b5f6c44 timeline: used footage params as basis for manual selection 2021-09-21 19:03:51 -07:00