Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-14 22:42:34 +02:00
Code Issues Projects Releases Activity
2,226 Commits 19 Branches 35 Tags 192 MiB
5eddac7c83
Commit Graph

71 Commits

Author SHA1 Message Date
tretrauit
5eddac7c83
Disable ffmpeg downloading if we're in the shared GitLab CI 
It freeze randomly and we don't have control over it so idk
 2022-01-04 21:13:39 +07:00
darkelaina
14a64c9340 Refactor build script 2022-01-04 09:12:03 +00:00
Elias Steurer
0f5b310f68 Merge branch 'master' into qt6-kde 
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/app.cpp
#	ScreenPlay/src/screenplaymanager.cpp
#	Tools/build.py
 2021-12-31 13:32:37 +01:00
Elias Steurer
6bfdd9894c Fix steam plugin loading 2021-12-18 13:24:03 +01:00
Elias Steurer
4f5bfe44d1 Add cpack based installer 2021-12-04 10:41:21 +01:00
Elias Steurer
eabe625cd9 Add cpack IFW installer 
Update to Qt 6.2.2
 2021-12-03 15:30:17 +01:00
Elias Steurer
6bd7deaa43 Update vcpkg 
Fix compilation
Remove unused benchmark
 2021-12-02 15:31:05 +01:00
Elias Steurer
797b4e205c Fix qt version 2021-11-13 14:30:55 +01:00
Elias Steurer
2216fc3351 Fix macos qt path and version 2021-11-12 15:32:30 +01:00
Elias Steurer
8615d7371f Add basic http server 
this is for content like godot webasm
that is only able to be shown from a
webserver
 2021-10-23 18:34:25 +02:00
Elias Steurer
223d6225c2 Merge branch 'master' into qt6-support 
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/translations/ScreenPlay_pt_BR.ts
#	ScreenPlay/translations/ScreenPlay_zh_CN.ts
#	Tools/build.py
 2021-10-08 10:13:44 +02:00
Elias Steurer
d4289c8e08 Fix steam build default from true/false to on/off 2021-10-07 17:22:10 +02:00
Elias Steurer
4146f2fbba Fix missing dlls 2021-10-03 17:45:44 +02:00
Elias Steurer
6b653bdfdc Merge branch 'master' into qt6-support 
# Conflicts:
#	.gitlab-ci.yml
#	CMakeLists.txt
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/qml/Workshop/Workshop.qml
#	ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml
#	ScreenPlay/translations/ScreenPlay_.ts
#	ScreenPlay/translations/ScreenPlay_de.ts
#	ScreenPlay/translations/ScreenPlay_es.ts
#	ScreenPlay/translations/ScreenPlay_fr.ts
#	ScreenPlay/translations/ScreenPlay_ko.ts
#	ScreenPlay/translations/ScreenPlay_pt_br.ts
#	ScreenPlay/translations/ScreenPlay_ru.ts
#	ScreenPlay/translations/ScreenPlay_vi.qm
#	ScreenPlay/translations/ScreenPlay_vi.ts
#	ScreenPlay/translations/ScreenPlay_zh_cn.ts
 2021-09-26 17:56:40 +02:00
Elias Steurer
0b9bd9c02c Remove SCREENPLAY_STEAM_DEPLOY 
in the end it is the same as SCREENPLAY_STEAM
 2021-09-26 16:52:14 +02:00
Elias Steurer
6b3fc174d4 Fix qt version 2021-09-10 12:47:21 +02:00
Elias Steurer
7883a98181 Change apple signing to run parallel 2021-09-04 21:50:34 +02:00
Elias Steurer
dca107efbb Add examples to python scripts 2021-09-04 12:13:19 +02:00
Elias Steurer
30acb08bcf Fix macOS build.py 
It looks like these are the best settings to finally
create a working signation after many hours of experimenting
 2021-09-03 13:03:48 +02:00
Elias Steurer
3a49341083 Merge remote-tracking branch 'origin/master' 2021-08-21 14:11:21 +02:00
Elias Steurer
01f4b656de Replace branch name with commit text 
Branch name would always be master
 2021-08-21 14:11:16 +02:00
Elias Steurer
41f66a236a Fix incorrect qmldir for mac deploy 2021-08-21 14:09:19 +02:00
Elias Steurer
becba82a77 Fix depot name 2021-08-21 13:37:24 +02:00
Elias Steurer
0f4b30492b Fix missing depot in temporary folder 2021-08-21 13:28:32 +02:00
Elias Steurer
202cd32bb4 Add default vdf config names for every platform 
Makes sense to autodetect this.
 2021-08-21 13:17:08 +02:00
Elias Steurer
ddcb83b79b Add steam publish python script with dynamic description based on git branch, hash and date 2021-08-21 12:53:19 +02:00
Elias Steurer
5d1f1121dd Fix missing entitlements needed by mac version of steam 2021-08-16 15:58:45 +02:00
Elias Steurer
d76d782e72 Add missing ffmpeg prebuild bin to setup for mac 2021-08-16 11:48:06 +02:00
Elias Steurer
6ea784ffed Fix explicit steam workshop build for build.py 2021-08-16 11:22:25 +02:00
Elias Steurer
79e3c39721 Add steam depot config 2021-08-14 14:34:55 +02:00
Elias Steurer
28a9dd3ec6 Add explicit steam deploy version flag 
This simply disables the copy of the steam_appid.txt
 2021-08-14 12:59:43 +02:00
Elias Steurer
fe0ab29cf8 Change mac signing to be opt in 2021-08-14 12:44:32 +02:00
Elias Steurer
538889465d Merge remote-tracking branch 'origin/master' 2021-08-08 19:33:20 +02:00
Elias Steurer
2d04ce2608 Add macOS code signing 2021-08-08 19:31:50 +02:00
Elias Steurer
5752a56d14 Add missing benchmark dependency 2021-07-25 16:31:05 +02:00
Elias Steurer
f521f94a6a Disable infoware for now because it wont compile 2021-07-25 16:21:16 +02:00
Elias Steurer
613a4d435d Test CI 2021-07-25 16:15:31 +02:00
Elias Steurer
e3a6193275 Fix macos compilation and workshop files 2021-07-25 12:26:55 +02:00
Elias Steurer
2448e9462e Update vcpkg 2021-06-25 12:42:03 +02:00
Elias Steurer
2fb51d20e4 Add curl to satisfy sentry 2021-06-25 12:35:41 +02:00
Elias Steurer
60bf972c26 Fix vcpkg command call 2021-06-25 12:32:19 +02:00
Elias Steurer
e118fa235c Add sentry support for macos 
Fix cmake apple define because apple
is a unix system.
 2021-06-12 15:17:38 +02:00
Elias Steurer
5add9d869e Fix setup script for macos and linux 2021-06-12 14:42:55 +02:00
Elias Steurer
1e29d44d7d Add ffmpeg and fix video import 2021-05-21 12:02:16 +02:00
Elias Steurer
3fd25dcbeb Change formatter to 6.1 
6.1 actually now has support for some modern
qml features like inline components.
 2021-05-16 19:35:05 +02:00
Elias Steurer
4001d1ddd2 Fix join of arguments being to early 2021-05-16 16:38:04 +02:00
Elias Steurer
1bb3cd36b0 Fix arch 2021-05-16 16:34:05 +02:00
Elias Steurer
201b7efe9a Remove timeout 2021-05-16 14:13:27 +02:00
Elias Steurer
71c422cbca Fix check for not set args.path 2021-05-16 14:10:37 +02:00
Elias Steurer
5164a7b916 Change CI to use setup.py 2021-05-16 13:12:24 +02:00