1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-18 16:32:33 +02:00
Commit Graph

629 Commits

Author SHA1 Message Date
Elias
e4904b8904 Remove analytics include 2018-12-05 12:12:27 +01:00
Elias
982ed2bb78 Remove no longer used text 2018-12-05 12:12:08 +01:00
Elias
fea537b3af Fix path QUrl -> toLocalFile 2018-12-05 12:10:56 +01:00
Elias
24160f1e28 Remove common folder <.< 2018-12-04 19:23:03 +01:00
Elias
b5adb28086 Merge remote-tracking branch 'origin/dev' into dev 2018-12-04 19:21:35 +01:00
Elias
221de6561b Add OpenSSL libs
Remove google analytics
2018-12-04 19:21:10 +01:00
Elias
05aa946280 Change easing for all animations 2018-12-04 18:27:39 +01:00
Elias
9a8f2334ea Fix background vars 2018-12-04 18:27:19 +01:00
Elias Steurer (Kelteseth)
9338d29ab3 Update README.md 2018-12-04 17:18:58 +00:00
Elias Steurer (Kelteseth)
5fd37c5587 Fix content @mrminimal 2018-12-04 17:13:44 +00:00
Elias
062d6d6f71 Add custom Background qml item. This prevents flickering on navigation change 2018-12-04 17:31:05 +01:00
Elias Steurer (Kelteseth)
4aefcdc521 Add submodule text
Add XCode text
2018-12-04 13:13:02 +00:00
Elias Steurer (Kelteseth)
6397c019da Update README.md 2018-12-04 13:02:12 +00:00
Elias Steurer (Kelteseth)
790137838f Deleted ProtocolBuffers/ProtocolBuffers.pro 2018-12-04 12:59:49 +00:00
Elias Steurer (Kelteseth)
88bd84845d Update README.md 2018-12-04 12:57:54 +00:00
Elias Steurer (Kelteseth)
1359d2d092 Update README.md 2018-12-04 12:40:26 +00:00
kelteseth
c1618a45a7 Merge remote-tracking branch 'origin/dev' into dev 2018-12-04 13:26:59 +01:00
kelteseth
16fe2bde47 Add shadow
Fix spacing
Remove debugs
2018-12-04 13:25:46 +01:00
kelteseth
55a11b471a Merge remote-tracking branch 'origin/es/feature/convertVideo' into dev
# Conflicts:
#	ScreenPlay/Resources.qrc
#	ScreenPlay/main.cpp
#	ScreenPlay/qml/Create/CreateWallpaper.qml
#	ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
#	ScreenPlay/qml/Navigation.qml
#	ScreenPlay/src/create.cpp
#	ScreenPlayWidget/ScreenPlayWidget.pro
#	ScreenPlayWorkshop/workshopsdk/ScreenPlayWorkshop.pro
2018-12-04 13:25:03 +01:00
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