Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 11:32:42 +01:00
Code Issues Projects Releases Activity
1,506 Commits 19 Branches 35 Tags 192 MiB
1eff5f7e70
Commit Graph

1506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
poly000
f25a96c2b6 a 2020-10-03 00:27:37 +08:00
poly000
aa84ee7de0 hmmm 2020-10-02 23:04:17 +08:00
poly000
4af060b1df rename zh to zh-cn 2020-10-02 22:33:47 +08:00
poly000
175c19f65d ? 2020-10-02 22:32:30 +08:00
poly000
771945d88c Merge remote-tracking branch 'upstream/master' 2020-10-02 22:31:40 +08:00
poly000
80ebfb3d54 fix type 2020-10-02 22:30:52 +08:00
Elias Steurer
bf087d7c7d Add missing --ssl-no-revoke 2020-10-02 16:29:12 +02:00
poly000
5aa76970a6 complete 50% 2020-10-02 22:24:30 +08:00
Elias Steurer
ecc9377064 Fix required dev setup 2020-10-02 10:49:05 +02:00
Elias Steurer
113e09763d Update translations and add update script 2020-10-02 10:47:46 +02:00
Elias Steurer
a309ab547f Merge branch 'master' into 'master' 
Master

See merge request kelteseth/ScreenPlay!41
 2020-10-02 08:39:14 +00:00
PEdajilao
b0e8b5b354 Upload New File 2020-09-30 08:14:06 +00:00
PEdajilao
ea37862f8f Delete ScreenPlay_zh-CN.ts 2020-09-30 08:13:39 +00:00
PEdajilao
c1d6ff2104 Update ScreenPlay_translations_ScreenPlay_zh-CN.ts 2020-09-30 08:13:06 +00:00
PEdajilao
23344240b0 Update ScreenPlay_translations_ScreenPlay_zh-CN.ts 2020-09-30 08:11:14 +00:00
PEdajilao
917aefb380 Delete ScreenPlay_zh-CN.ts 2020-09-30 08:10:58 +00:00
PEdajilao
071555b6c3 Upload New File 2020-09-30 08:04:58 +00:00
PEdajilao
be1a17d093 Update ScreenPlay_zh-CN.ts 2020-09-30 07:11:55 +00:00
PEdajilao
d65ad83103 Add new file 2020-09-30 06:12:34 +00:00
PEdajilao
7e1312dbcc Delete transkationsScreenPlay_zh-CN.ts 2020-09-30 06:11:02 +00:00
PEdajilao
7645fdbced Add new file 2020-09-30 06:05:42 +00:00
Elias Steurer
462d7acc00 Change ui to contain some tutorials 2020-09-27 21:46:53 +02:00
Elias Steurer
bd7e95fd02 Merge branch 'master' into 107-refactor-create-screen 
# Conflicts:
#	ScreenPlay/qml/Create/Create.qml
#	ScreenPlay/qml/Create/ImportContent.qml
 2020-09-27 21:07:03 +02:00
Elias Steurer
c8529e4c9c Merge branch '71-create-a-shader-library-subproject' into 'master' 
Resolve "Create a shader library subproject"

Closes #71

See merge request kelteseth/ScreenPlay!36
 2020-09-27 18:47:19 +00:00
Elias Steurer
e93892aaeb Merge branch 'master' into '71-create-a-shader-library-subproject' 
# Conflicts:
#   install_dependencies_windows.bat
 2020-09-27 18:37:58 +00:00
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
15da7d2cf3 Merge branch 'add-ssl-no-revoke-to-curl' into 'master' 
Add --ssl-no-revoke to Windows dependencies install script.

See merge request kelteseth/ScreenPlay!40
 2020-09-19 11:34:11 +00:00
teppyboy
639874679e Add --ssl-no-revoke to Windows dependencies install script. 
Because Windows is dumb. This fixes the The revocation function was unable to check revocation for the certificate error.
 2020-09-18 23:15:15 +07: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