1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-23 03:02:30 +01:00
Commit Graph

1376 Commits

Author SHA1 Message Date
Elias Steurer
234300f61b Fix not existing folder 2020-09-27 20:29:57 +02:00
Elias Steurer
1a86a8c8e7 Fix ffmpeg download paths 2020-09-27 19:31:33 +02:00
Elias Steurer
f57537414e Test CI 2020-09-27 18:53:58 +02:00
Elias Steurer
2dd7659212 Test CI 2020-09-27 17:28:25 +02:00
Elias Steurer
4071ae6a18 Test CI 2020-09-27 17:23:56 +02:00
Elias Steurer
0b201c5dc2 Test CI 2020-09-27 17:13:29 +02:00
Elias Steurer
1fac481a93 Test CI 2020-09-27 17:10:08 +02:00
Elias Steurer
3bf66ba610 Test CI
fatal: 'origin/master' does not appear to be a git repository
https://stackoverflow.com/questions/15637507/fatal-origin-does-not-appear-to-be-a-git-repository
2020-09-27 17:07:48 +02:00
Elias Steurer
10c1812999 Test CI 2020-09-27 17:03:08 +02:00
Elias Steurer
38f59261db Test CI 2020-09-27 17:00:57 +02:00
Elias Steurer
f6c6cf83ee Cleanup shadertoy shader and files 2020-09-27 16:59:24 +02:00
Elias Steurer
0fa55884ac Add shadertoy shader 2020-09-24 19:08:06 +02:00
Elias Steurer
6d7389833d Merge branch 'master' into local/tmp/71-create-a-shader-library-subproject 2020-09-24 11:47:32 +02:00
Elias Steurer
93f7e2fad4 Change welcome button to a nice green 2020-09-24 11:26:20 +02:00
Elias Steurer
5a8a81f941 Enable CommunityNavItem steam workshop 2020-09-24 11:26:06 +02:00
Elias Steurer
2a3c29a0cc Fix dependencies 2020-09-18 17:44:03 +02:00
Elias Steurer
3113cff59b Bump version to V0.12.1 2020-09-18 16:38:04 +02:00
Elias Steurer
c29726787d Merge branch '106-remove-ffmpeg-download' into 'master'
Resolve "Remove ffmpeg download"

Closes #106

See merge request kelteseth/ScreenPlay!38
2020-09-18 14:37:07 +00:00
Elias Steurer
f2d791fc6f Remove util member
Fix install_dependencies_windows
2020-09-18 16:34:14 +02:00
Elias Steurer
c6ac701875 Merge branch 'master' into 106-remove-ffmpeg-download
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/src/util.cpp
#	install_dependencies_linux_mac.sh
#	install_dependencies_windows.bat
2020-09-18 16:17:59 +02:00
Elias Steurer
fff7cea503 Fix crash on exit 2020-09-18 16:11:07 +02:00
Elias Steurer
0fa6dc1a9b Fix CI 2020-09-18 15:39:54 +02:00
Elias Steurer
89ff34fc3c Fix ci to check if folder exists 2020-09-18 15:33:14 +02:00
Elias Steurer
880c452114 Test CI 2020-09-18 15:27:36 +02:00
Elias Steurer
85c14d25c0 Test CI 2020-09-18 15:25:32 +02:00
Elias Steurer
bc57e8c4c2 Fix CI 2020-09-18 15:12:38 +02:00
Elias Steurer
ad9bea6e7f Fix CI 2020-09-18 15:09:42 +02:00
Elias Steurer
996d071da3 Change git clone to cmd to ignore error 2020-09-18 14:55:53 +02:00
Elias Steurer
beda4cef39 Change build into gitlab-ci.yml 2020-09-18 14:51:46 +02:00
Elias Steurer
828bd81edd Change commands to cmd version 2020-09-18 13:59:03 +02:00
Elias Steurer
e901a76487 Change install_dependencies_windows to use cmd 2020-09-18 13:46:46 +02:00
Elias Steurer
ab5be0b49a Remove last ffmpeg download references 2020-09-18 13:44:43 +02:00
Elias Steurer
1021607652 Fix url to always point to the right version 2020-09-18 13:44:27 +02:00
Elias Steurer
8b3040180a Add ffmpeg as dev direct download 2020-09-18 12:22:42 +02:00
Elias Steurer
25df082d88 Add tmp 2020-09-13 19:51:20 +02:00
Elias Steurer
561aa5770b Merge branch 'master' into 71-create-a-shader-library-subproject 2020-09-11 17:01:02 +02:00
Elias Steurer
582c6af744 Merge branch '108-add-sentry-io-integration' into 'master'
Resolve "Add sentry.io integration"

Closes #108

See merge request kelteseth/ScreenPlay!39
2020-09-11 14:54:21 +00:00
Elias Steurer
d009540d8e Fix vcpkg using old commit 2020-09-11 16:41:45 +02:00
Elias Steurer
1b8e708836 Replace qt-breakpad with sentry.io 2020-09-11 16:33:27 +02:00
Elias Steurer
d850a05aa8 Add ffmpeg to vcpkg dependencies 2020-09-10 17:32:24 +02:00
Elias Steurer
06a4e9b312 Remove ffmpeg download and extraction 2020-09-10 17:14:34 +02:00
Elias Steurer
c8a87e1ef9 Fix sysinfo sdk not building shared bin 2020-09-10 17:07:01 +02:00
Elias Steurer
fe2eb8178a Add not working water shader 2020-09-10 17:05:19 +02:00
Elias Steurer
ddad721574 Add basic shader plugin 2020-09-10 11:40:07 +02:00
Elias Steurer
6f77e77ffe Update README.md 2020-09-04 07:17:22 +00:00
Elias Steurer
d7cd880ed7 Update CI to 5.15.1 2020-09-03 19:23:17 +02:00
Elias Steurer
3be5ab032e Add removal of Wallpaper/Widget on crash 2020-09-03 19:22:59 +02:00
Elias Steurer
fa6b734820 Fix set wallpaper volume, position and playback speed 2020-08-30 17:43:59 +02:00
Elias Steurer
71c2da13f6 Fix wrong qml names 2020-08-30 17:31:31 +02:00
Elias Steurer
d510f46eb6 Merge remote-tracking branch 'origin/master' into master 2020-08-30 17:25:14 +02:00