1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 10:42:29 +01:00
Commit Graph

660 Commits

Author SHA1 Message Date
Elias Steurer (Kelteseth)
b912256d25 Update README.md 2018-12-04 11:52:01 +00:00
Elias Steurer (Kelteseth)
4be78c0d87 Update README.md 2018-12-04 11:45:17 +00:00
Elias Steurer (Kelteseth)
c6e2dc147c Update README.md 2018-12-04 11:18:28 +00:00
Dominik Louven
50e95cd8fb Fix converter macos statements 2018-12-03 16:55:48 +01:00
Dominik Louven
3c90588220 Fix library paths for widgets under macos 2018-12-03 16:54:47 +01:00
Dominik Louven
855283d1ba Add cpu and ram stats to sysinfo 2018-12-02 21:22:12 +01:00
kelteseth
f228c39826 Remove mp4 filter 2018-12-01 18:21:51 +01:00
kelteseth
e5302d6d00 Merge remote-tracking branch 'origin/feature/macos' into dev
# Conflicts:
#	ScreenPlay.pro
2018-12-01 18:06:32 +01:00
kelteseth
fc919bf679 Remove qt analytics 2018-12-01 18:05:24 +01:00
kelteseth
d904d6ca92 Add disabling of main Navigation 2018-12-01 18:02:55 +01:00
kelteseth
1d9b3b6497 Remove force opengl 2018-12-01 18:01:17 +01:00
kelteseth
a5ec0c7a5b Add macosx ffmpeg libs 2018-12-01 18:00:49 +01:00
kelteseth
615f23e861 Add working kill of ffmpeg process via event loop inside of the seperate thread 2018-12-01 17:15:52 +01:00
Dominik Louven
a09b4672dd Fix broken dependency 2018-11-27 20:14:46 +01:00
Dominik Louven
19fadb0389 Fix steam lib paths for macOS 2018-11-27 20:08:46 +01:00
Dominik Louven
958b96ae9a Fix open folder dialog for MacOS 2018-11-27 19:27:10 +01:00
Dominik Louven
ef6dc7bc17 Fix video rendering for macOS 2018-11-27 18:53:30 +01:00
Dominik Louven
b0cd5bc984 Implement basic invoke of native Mac bridge wrapper for screenplay window 2018-11-27 11:34:09 +01:00
Dominik Louven
1b9e20eebf Add Mac qmake statements to .pro for native code compilation 2018-11-27 11:33:43 +01:00
Dominik Louven
79ac3477c9 Create MacIntegration wrapper class for macbridge 2018-11-27 11:31:17 +01:00
Dominik Louven
ba7d04c034 Add native Mac bridge code for window level settings 2018-11-27 11:31:00 +01:00
Dominik Louven
2b3c69c1c6 Create native Mac bridge files 2018-11-27 11:30:43 +01:00
Dominik Louven
cb10848ca6 Removed forcefully OpenGL 2018-11-26 22:31:07 +01:00
Dominik Louven
5d7e342131 Removed /opt/ dependency in pro file 2018-11-26 22:30:52 +01:00
Dominik Louven
bed40fee31 Fix file handling in various places for Mac OS support 2018-11-26 22:30:30 +01:00
Dominik Louven
a0dc8efd75 Fix double file:// prefix in qml 2018-11-26 22:28:57 +01:00
Dominik Louven
caad10aafa Fix bin paths for Widget and Window binary 2018-11-26 22:28:35 +01:00
Dominik Louven
5c2ae13736 Add .DS_STORE and cache.qrc to gitignore 2018-11-26 20:40:10 +01:00
Dominik Louven
d31ecf2c2d Remove exclusive shader syntax 2018-11-26 20:39:04 +01:00
Dominik Louven
53280d1a36 Disabled Windows only WinApi calls in sys info 2018-11-26 20:38:23 +01:00
Dominik Louven
3ab531877a Fixed local paths for Mac OS file system 2018-11-26 20:38:10 +01:00
Dominik Louven
9a97f19918 Fixed MacOS library paths 2018-11-26 20:37:48 +01:00
Dominik Louven
ddc80ceedc Removed Google Tracker for MacOS 2018-11-26 20:37:18 +01:00
kelteseth
742fee688d Add empty screen nav element 2018-11-24 16:51:30 +01:00
kelteseth
d066c4c18c Removed abomination 2018-11-24 15:38:35 +01:00
kelteseth
152cdeba92 Move sdk from qml to cpp 2018-11-24 14:28:02 +01:00
kelteseth
964b63f604 Remove workshop, server and common 2018-11-21 23:13:23 +01:00
Daniel Schukies
4aa03a1d76 Add proto stuff, needs fix 2018-11-21 21:07:04 +01:00
kelteseth
2c059d2efc Fix compiling 2018-11-17 18:38:02 +01:00
kelteseth
69c6c9eb58 Add audio extraction 2018-11-17 18:35:22 +01:00
kelteseth
6203a2e8c0 Fix 2018-11-17 18:35:09 +01:00
kelteseth
67a33f740e Merge remote-tracking branch 'gitlab.com/feature/server' into es/feature/convertVideo 2018-11-17 11:55:25 +01:00
kelteseth
855c70273b Add 2018-11-17 11:54:59 +01:00
Daniel Schukies
e983a12aa8 Add server project 2018-11-17 11:49:37 +01:00
Daniel Schukies
368bf83660 Add workshop project 2018-11-17 11:48:57 +01:00
Daniel Schukies
8e10948094 Add protocolbuffer lib 2018-11-17 11:31:38 +01:00
kelteseth
baa162d862 Fix readyRead crash
Fix percentage calc
2018-11-15 17:14:13 +01:00
Daniel Schukies
2acb4c4229 Merge remote-tracking branch 'origin/es/feature/convertVideo' into feature/server 2018-11-15 14:22:00 +01:00
kelteseth
e4fe59db71 Add gif preview 2018-11-13 12:13:37 +01:00
Sandro
9b99e7b5ce Merge commit '79303414787998cc6b537ed6eb79a8b4df7eb891' into dev 2018-11-12 17:43:40 +01:00