1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Commit Graph

106 Commits

Author SHA1 Message Date
Elias Steurer
962f3ea4cd Fix setup script 2022-07-22 13:35:23 +02:00
Elias Steurer
a8cad9eb76 Merge remote-tracking branch 'origin/master' 2022-07-22 13:35:08 +02:00
Elias Steurer
3a917c18c4 Update macos build scripts 2022-07-22 13:21:30 +02:00
Elias Steurer
cda5aeeb85 Add automatic requirements installation 2022-07-22 12:31:52 +02:00
Elias Steurer
4f27231311 Add python Windows ffmpeg downloads 2022-07-21 14:21:52 +02:00
Elias Steurer
e2e1a05347 Revert to bat file
this works always, the ps1 script stopped working
for some reason....
2022-07-15 13:11:09 +02:00
Elias Steurer
29ca12fc6e Merge remote-tracking branch 'origin/master' 2022-07-15 13:08:23 +02:00
Elias Steurer
37c8918683 Update to latest vcpkg and ffmpeg 5.0.1
Remove old download_ffmpeg.bat
2022-07-15 13:08:17 +02:00
Elias Steurer
376e96f96c Add macos folder copy for qml folder 2022-07-15 13:05:47 +02:00
Elias Steurer
4db3591c66 Add explicit x86_64 and arm64 build option for mac
VCPKG cannot compile two architectures at once.
We still need to combine the created Apps into a fat binary.
2022-07-15 12:43:57 +02:00
Elias Steurer
82beeaeb05 Revert to Qt 6.3.1
6.4 crashes on some videos
2022-07-09 19:51:57 +02:00
Elias Steurer
1f80ba90ca Refactor build and publish scripts
Add mac arm support
Refactor build and publish build build
2022-07-09 13:05:42 +02:00
Elias Steurer
7773bdb148 Merge remote-tracking branch 'origin/master' 2022-07-08 12:50:37 +02:00
Elias Steurer
bf199ab001 Add explicit SCREENPLAY_RELEASE option
For now this disables setting autostart path on
dev builds. This is annoying because it previously
did set the path to the ScreenPlay dev build that
did have all the dlls and thus fails.
2022-07-08 12:49:53 +02:00
Elias Steurer
a5ca4c7796 Add explicit arm64-osx support to the build script
Add not yet used download_qt.py
2022-07-08 12:33:26 +02:00
Elias Steurer
169b00091b Fix installer argument 2022-05-20 15:52:32 +02:00
Elias Steurer
b900f5c0ae Add Scoop recipe 2022-05-20 13:23:39 +02:00
Elias Steurer
e00b5f1ebe Fix steam dylib paths 2022-05-12 14:55:58 +02:00
Elias Steurer
4da09711e6 Merge remote-tracking branch 'origin/HEAD' 2022-05-12 14:36:18 +02:00
Elias Steurer
bf2aa2d1fa Add osx universal builds 2022-05-06 17:23:14 +02:00
Elias Steurer
a366fcc56a Add .screenplay project export import via QArchive 2022-05-06 14:51:56 +02:00
Elias Steurer
40bfa967eb Fix build when only msvc2019 is installed 2022-04-24 09:56:50 +02:00
Elias Steurer
86aaa7147e Change sentry to be windows only for now
this still has general problems with osx builds and m1 support
2022-04-24 09:01:59 +02:00
Elias Steurer
5c138fa8d4 Update to latest vcpkg
Add libxkbcommon for compiling shader
Fix SysInfo not available on osx and linux
2022-04-23 20:15:32 +02:00
Elias Steurer
41967b541c Fix none steam builds and installer
Refactor Navigation to use Qt style navigation
2022-04-23 19:26:55 +02:00
Elias Steurer
5d1c941cb3 Formatting 2022-04-04 18:09:45 +02:00
Elias Steurer
77a81451ca Multiple refactoring....
Bump Qt to 6.3 to fix video loop
Remove no longer working shader and add new
WIP: Shader compilation path is wrong for some reason
Add Steamless version content path
Remove cmake-format: sortable from CMakeLists.txt
Add Widnow scale indocator icon to the bottom right
Remove unused doctest and benchmark
Fix tests and installer cmake logic
2022-04-04 18:06:43 +02:00
Elias Steurer
42bdd7682c Fix cmake formatting script ignoring sort 2022-03-12 14:36:03 +01:00
Elias Steurer
b44aab27ef Merge remote-tracking branch 'origin/master' into release 2022-02-20 17:57:08 +01:00
Elias Steurer
fb5d6581ec Change all plugins to be QML_ELEMENT
Add ScreenPlayWeather
2022-02-20 17:55:26 +01:00
Elias Steurer
907658261e Merge remote-tracking branch 'origin/release' 2022-02-17 18:13:41 +01:00
Elias Steurer
626904a6c1 Change linux deploy to just copy...
everything from the qt installation
2022-02-17 18:13:32 +01:00
Elias Steurer
13192e2964 Update Qt version in build.py 2022-02-03 18:45:12 +01:00
Elias Steurer
a1fe840e54 Fix IFW path on linux ci 2022-01-29 12:24:26 +01:00
Elias Steurer
e55182cdaf Add some basic working in installer with cmake 3.23 2022-01-27 14:54:45 +01:00
Elias Steurer
a2ac33180e Fix build.py help 2022-01-09 16:56:56 +01: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