1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-25 12:13:00 +01:00
Commit Graph

22 Commits

Author SHA1 Message Date
Elias Steurer
a57a47538d Remove old stomt sdk 2020-05-19 16:09:02 +02:00
Elias Steurer
dc3464cd42 Update breakpad submodule 2020-05-03 19:24:50 +02:00
Elias Steurer
365e054003 Merge branch 'master' into refactor/save-configs
# Conflicts:
#	ScreenPlay/ScreenPlay.pro
#	ScreenPlay/src/settings.cpp
#	ScreenPlay/src/settings.h
2020-05-03 19:22:40 +02:00
Elias Steurer
1e6d819b1a Update stomt submodule 2020-05-03 13:22:43 +02:00
Elias Steurer
11e7594e6b Update stomt submodule 2020-05-03 13:16:26 +02:00
Elias Steurer
49aad4bf31 Update breakpad cmake integration 2020-05-03 13:16:15 +02:00
Elias Steurer
c7fd69a78e Add first working cmake version for ScreenPlay
Refactor stomt sdk from qmake/github to cmake/gitlab
2020-04-30 20:03:14 +02:00
Elias Steurer
5d7a97ff8b Remove old stomt qt sdk 2020-04-30 19:11:47 +02:00
Elias Steurer
4785956b2d Add google breakpad for crash analytics 2020-03-06 12:39:42 +01:00
Elias Steurer
350a0dd69f Bump stomt sdk version to fix install step 2019-12-14 12:54:27 +01:00
Elias Steurer
f0189643a4 Fix install dependencies 2019-12-01 13:34:15 +01:00
Elias Steurer
f8c4eeba71 Remove vcpkg submodule. Now installable via vcpkg-install-dependencies 2019-12-01 11:33:28 +01:00
Elias Steurer
fd94d65a3d Cleanup third party libs into common folder
Remove old OpenSSL which now get bundled with Qt installer
2019-12-01 11:31:09 +01:00
Elias
fe660f6a0a Add vcpkg 2019-04-27 15:35:19 +02:00
Elias
e03cfd5b3c Add dep install script for windows 2019-04-27 11:46:37 +02:00
Elias
24160f1e28 Remove common folder <.< 2018-12-04 19:23:03 +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
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
6203a2e8c0 Fix 2018-11-17 18:35:09 +01:00
Daniel Schukies
8e10948094 Add protocolbuffer lib 2018-11-17 11:31:38 +01:00