oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,884 Commits 1 Branch 0 Tags
89fb9f24b75512695d26aa7301b3fa7d7a914e27
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
itsmattkc 89fb9f24b7 Update README.md 2020-09-15 12:43:26 +10:00
itsmattkc ff17374237 ci: try acquiring deps in build directory 2020-09-15 12:39:09 +10:00
itsmattkc 759211e8e8 ci: try tests after package creation 2020-09-15 12:19:47 +10:00
itsmattkc 24a60f5ca1 ci: use bash for package creation 2020-09-15 12:04:48 +10:00
itsmattkc 9ec4dd3467 ci: try using env variable to find dlls 2020-09-15 03:46:18 +10:00
itsmattkc 916f170fa2 ci: try packaging 2020-09-15 03:31:09 +10:00
itsmattkc c0ad72da36 ci: try to set lib path before configure 2020-09-15 03:12:54 +10:00
itsmattkc 66cfe9b34c ci: pfpfhpfbbfht 2020-09-15 02:59:25 +10:00
itsmattkc 589099d67e ci: i don't even know what i'm doing anymore 2020-09-15 02:54:30 +10:00
itsmattkc 18979abe08 ci: different attempt at hacky path hack 2020-09-15 02:50:21 +10:00
itsmattkc 3019924e81 ci: use cmd for hacky path hack 2020-09-15 02:47:13 +10:00
itsmattkc 16a69e2666 ci: hacky path set 2020-09-15 02:43:35 +10:00
itsmattkc 8792c66c9c ci: removed debug output flag 2020-09-15 02:32:44 +10:00
itsmattkc 9ddcd2a229 ci: maybe this new zlib build will work 2020-09-15 02:14:31 +10:00
itsmattkc 9431739658 Merge pull request #1179 from rnkn/master 
Prefer curl on OSX
 2020-09-15 01:27:48 +10:00
itsmattkc b1c3b0e451 ci: build dependencies in main directory again 2020-09-14 23:18:22 +10:00
itsmattkc db4e4944a8 ci: try acquiring all dependencies into build folder 2020-09-14 23:13:35 +10:00
itsmattkc a26deb10fb ci: acquire Qt 2020-09-14 23:02:28 +10:00
itsmattkc 10a4f07a40 ci: try enabling msvc developer prompt and ninja 2020-09-14 22:48:58 +10:00
itsmattkc a3ee126cf2 ci: use nmake 2020-09-14 22:44:58 +10:00
itsmattkc 9a2292b024 ci: try using ninja 2020-09-14 22:43:27 +10:00
itsmattkc 6ca3796408 ci: acquire all dependencies 2020-09-14 21:38:35 +10:00
itsmattkc d1a01cbaa2 ci: try using curl in actions 2020-09-14 21:25:25 +10:00
itsmattkc 026e9bc2ff ci: remove extraneous colon 2020-09-14 20:57:16 +10:00
itsmattkc 570604a1a5 Update ci.yml 
ci: test dependency acquisition
 2020-09-14 20:55:13 +10:00
itsmattkc 4b20d11f76 Create ci.yml 
ci: beginning of GitHub Actions CI
 2020-09-14 20:44:46 +10:00
itsmattkc 32eb40253f Merge pull request #1178 from olive-editor/issue-template-improvements 
Improve issue templates
 2020-09-14 17:48:48 +10:00
itsmattkc f35cdd33e5 Create FUNDING.yml 2020-09-13 16:56:15 +10:00
itsmattkc aad08795f9 Update issue templates 2020-09-13 16:54:09 +10:00
itsmattkc 991f430cc8 Merge pull request #1155 from sobotka/waveform-updates 
Waveform Updates
 2020-08-07 20:18:30 +10:00
itsmattkc a772d9e739 Merge pull request #1170 from ThomasWilshaw/build_fix 
Attempt to fix CI build errors.
 2020-07-18 16:55:59 +10:00
itsmattkc 30de447cc5 Merge pull request #1168 from ThomasWilshaw/buildFix 
Attempt to fix the current Travis Linux build issue
 2020-07-07 00:19:32 +10:00
itsmattkc 49cec970f2 Merge pull request #1165 from sobotka/ocio-fixes 
Hopefully OCIO fixes
 2020-06-14 03:59:28 +10:00
itsmattkc 031c07f5e7 Merge pull request #1156 from parona-source/master 
REGEX MATCHALL doesn't recognise ${TMP} as an argument.
 2020-05-27 19:47:03 +10:00
itsmattkc 502ce85828 Merge pull request #1146 from sobotka/ocio-fixes 
OCIO Fixes
 2020-05-08 03:20:37 +10:00
itsmattkc 46b61c0226 Merge pull request #1152 from ThomasWilshaw/gitignore_update 
gitignore updates for Visual Studio with CMake
 2020-05-07 23:10:49 +10:00
itsmattkc 39efafc8c2 Merge pull request #1151 from ThomasWilshaw/footageProperties 
Fix first useable stream being selected
 2020-05-07 03:11:41 +10:00
itsmattkc b3ffc42113 Merge pull request #1140 from Simran-B/msvc-mp-flag 
MSVC: Build with Multiple Processes (CMAKE_CXX_FLAGS /MP)
 2020-05-07 03:11:24 +10: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 e7e895739b Merge pull request #1138 from olive-editor/BrimsonBhin-patch-1 
Gaussian Blur: Use straight multiply
 2020-04-29 04:52:22 +10:00
itsmattkc 290c8724c4 Merge pull request #1131 from luzpaz/typos-followup 
Fix typos cont.
 2020-04-16 12:21:45 +10:00
itsmattkc 100a2b19cc Merge pull request #1128 from luzpaz/typos 
Fix doxygen and misc. typos
 2020-03-19 12:17:02 +11:00
itsmattkc 2934c875a0 Merge pull request #1130 from eszlari/patch-2 
cmake: use foreach()
 2020-03-19 12:16:26 +11:00
itsmattkc e5ac72fa9d Merge branch 'master' into typos 2020-03-19 12:16:09 +11:00
itsmattkc 7975ef11ab Merge pull request #1115 from lightyear15/timerange 
timerange quick refactor
 2019-11-11 15:04:12 +09:00
itsmattkc aeef716d5f Merge pull request #1109 from Aaron-Mann/patch-1 
Update README.md
 2019-11-04 11:46:04 +11:00
itsmattkc d4bda77d7a Merge pull request #1111 from lightyear15/common_removeDefCtor 
Code Cleanup: common: removing default constructors
 2019-11-04 11:40:09 +11:00
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