oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,656 Commits 1 Branch 0 Tags
6fdfd03ffd138dab707e126607225e43dbdcf65a
Commit Graph
54 Commits
Author SHA1 Message Date
Mike Solar 6fdfd03ffd update: update copyright 2025-08-05 17:12:49 +08:00
Mike Solar 74f73ab3be change: change code style to Linux style except indent. 2025-08-03 03:09:40 +08:00
itsmattkc b091ed8592 project: remove constant root node 2023-02-28 17:01:46 -08:00
itsmattkc 92af3b5aec loadotio: corrected includes 2023-02-21 16:09:58 -08:00
Thomas Wilshaw c43d4b7a12 otioload: Improve error reporting 2022-10-21 17:48:47 +01:00
itsmattkc 4b366a9b73 update copyright year to 2022 2022-05-10 10:38:56 -07:00
itsmattkc 8373a7ea96 loadotio: minor UI tweaks 2022-01-08 11:57:30 -08:00
Thomas Wilshaw da00d94b60 Fix string creation 2022-01-07 01:24:29 +00:00
Thomas Wilshaw 764c7bb088 Add tr to string and fix variable name 2022-01-07 01:20:38 +00:00
Thomas Wilshaw 5624b03e65 Merge branch 'OTIO_load' of https://github.com/ThomasWilshaw/olive into OTIO_load 2022-01-07 00:03:34 +00:00
Thomas Wilshaw 836903cbe9 Fix PR comments 2022-01-07 00:02:46 +00:00
ThomasWilshaw b865bfa963 Merge branch 'master' into OTIO_load 2022-01-06 13:56:08 +00:00
itsmattkc 9d5ec1e60f Merge branch 'node-view-show-ctx' 2022-01-02 12:15:55 -08:00
itsmattkc 1828c2fd73 otio: update to be v0.14 compliant 2021-12-01 15:41:05 -08:00
itsmattkc a6af473f53 reimplemented node positioning and deleting 2021-11-17 12:09:41 -08:00
Thomas Wilshaw 90a0077c02 Fix uninitialized memory build error 
Join Sequences and timelines together in a QMap for simpler code.
 2021-11-15 15:10:26 +00:00
Thomas Wilshaw dc11358b85 loadotio: Update loading bar 2021-11-09 14:50:34 +00:00
Thomas Wilshaw 04a0b6024e otioload: Add simple dialog to change settings 
Adds a table of sequences in the OTIO file and allows the settings to
be changed. The dialog takes a list of sequences and relies on each
OTIO timeline having a unique name.

The dialog has to be called from the main thread so there is a wrapper
function in Core.
 2021-11-09 14:44:51 +00:00
itsmattkc a77166c833 fixed otio issue 2021-09-20 21:12:44 -07:00
itsmattkc cb5d776dab Merge pull request #1562 from ThomasWilshaw/otio_merge_fixes 
Fixes for OTIO merges
 2021-08-24 19:26:35 -07:00
Thomas Wilshaw 64a3cb5c84 Replace undo commands with non undoable functions. 2021-08-17 13:13:02 +01:00
itsmattkc 9dad2ef104 transitiontool: updated 2021-08-16 21:28:13 -07:00
Thomas Wilshaw 850b75fe24 Transitiosn and gaps are now added. Also removed unnecessary code 2021-08-07 15:06:50 +01:00
Thomas Wilshaw 1d2341245b Correctly add footage nodes and setup contexts. 2021-08-07 14:30:15 +01:00
itsmattkc 6995ffe015 reworked timeline elements 2021-08-01 11:05:18 -07:00
Thomas Wilshaw 2bdd5a3707 Update to master 2021-07-28 15:52:24 +01:00
Thomas Wilshaw c86b7f6185 Make sure Olive doesn't overwrite OTIO files. 2021-07-28 15:15:01 +01:00
Thomas Wilshaw 332351d1d9 Move FolderAddChild to correct place to avoid duplicates 2021-07-28 15:15:01 +01:00
Thomas Wilshaw 0154cfc1c2 Place footage into its own folder 2021-07-28 15:15:00 +01:00
Thomas Wilshaw 79b9d0b26b Fix shadow variable. 2021-07-28 15:14:59 +01:00
Thomas Wilshaw 5b2d889a4c Add footage to root folder and set labels correctly. 2021-07-28 15:14:59 +01:00
itsmattkc 52c5617159 undo: wrapped redo/undo functions to ensure prepare is called 2021-07-17 00:14:24 -07:00
itsmattkc c41047ab02 timeline: reorganized undo commands 
Split commands between several files rather than having them all in two monolithic ones.
 2021-07-16 01:38:20 -07:00
itsmattkc 77d4b18a60 updated copyright year for 2021 [skip ci] 2021-04-17 18:56:50 +10:00
itsmattkc b22c2f48ff Merge branch 'otio_improvments' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-otio_improvments 2021-04-10 11:07:51 +10:00
itsmattkc d7557f8e74 Merge branch 'otio_transition' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-otio_transition 2021-04-10 10:55:49 +10:00
itsmattkc cb75e37e77 moved several files around 
Mostly moved classes that became node derivatives into the node/ folder.
 2021-04-08 12:15:59 +10:00
itsmattkc 898ea25e89 finished merge of viewer and footage 2021-04-06 13:08:56 +10:00
itsmattkc 9fad1efe1b wrap otio classes in compiler definition 2021-04-02 15:29:17 +11:00
itsmattkc e0e4e42096 corrected otio files 2021-02-18 13:21:16 +11:00
itsmattkc d1a3e22eaa fixed linux compilation issues 2021-01-31 10:39:14 +11:00
itsmattkc 7849d6f3ff corrections for non shared ptrs in OTIO code 2020-12-16 14:32:18 +11:00
ThomasWilshaw a937238bd0 Merge branch 'master' into otio_improvments 2020-12-04 16:08:38 +00:00
itsmattkc f8ceefff6c don't use shared ptr on projects 
Really unnecessary
 2020-11-27 14:24:02 +11:00
ThomasWilshaw a30d86f411 Merge branch 'master' into otio_transition 2020-11-18 18:27:30 +00:00
itsmattkc b3c3fe0fc8 merged video and audio nodes into a single media node 
They performed exactly the same function so I don't think we need the clutter.

Also bumped the project version, but old projects are automatically converted.
 2020-11-18 13:48:14 +11:00
itsmattkc 75d4cd899b use hardcoded namespace 
The macro defined namespaces confused the hell out of lupdate and more or less broke translations permanently. Looks like the only way we can do it is to have a hardcoded namespace, which goes against my instinct, but honestly how likely is it that we'll change the namespace anyway (I guess forks might want to do it, but that's their problem ;) )
 2020-11-17 20:24:42 +11:00
itsmattkc d241090a9f finally updated the copyright year 2020-11-17 20:13:22 +11:00
Thomas Wilshaw 7f4b676318 Move OTIO macro to define.h 
Move the OTIO macro to define.h to avoid having to add it to all
required files.

Also add some cleanup.
 2020-11-12 13:44:50 +00:00
Thomas Wilshaw a1d967efe6 OTIO: Use macro OTIO for opentimelineio::v1_0 
Exapnd the use of the OTIO macro and add the version number macro.
 2020-11-11 22:13:14 +00:00