1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-14 22:42:34 +02:00
Commit Graph

99 Commits

Author SHA1 Message Date
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
3781f6ef17 Add IPAdress feature to show v4 and v6 address 2022-03-12 14:30:03 +01:00
Elias Steurer
fb5d6581ec Change all plugins to be QML_ELEMENT
Add ScreenPlayWeather
2022-02-20 17:55:26 +01:00
Elias Steurer
157823739d Update SteamSDK to 1.53a
Fix invalid utf8 files via convert_steam_sdk_to_utf8.py
2022-01-09 17:13: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
429a5b231d Merge remote-tracking branch 'origin/HEAD' 2021-12-18 13:24:18 +01:00
Elias Steurer
6bfdd9894c Fix steam plugin loading 2021-12-18 13:24:03 +01:00
Elias Steurer
55b4608f69 WIP on master: bb738ca Fix qml Wallpaper and Widget setup missing qrc 2021-12-11 17:05:41 +01:00
Elias Steurer
6bd7deaa43 Update vcpkg
Fix compilation
Remove unused benchmark
2021-12-02 15:31:05 +01:00
Elias Steurer
db4a7c7391 Fix regular steam builds 2021-11-13 14:51:38 +01:00
Elias Steurer
1c4f7dd250 Fix none steam builds 2021-11-13 14:47:43 +01:00
Elias Steurer
ee1ee157c9 Merge commit '4c29196a14da422b5553671428b47f201ebe9335' 2021-11-12 15:26:54 +01:00
Elias Steurer
4c29196a14 Fix macOS steam workshop plugin...
For some reason it only loads when the plugin is in the same dir
as the .app. This needs to be fixed someday...
2021-11-12 15:26:24 +01:00
Elias Steurer
69fbd679e2 Remove not needed encryptedappticket 2021-11-09 11:26:33 +01:00
Elias Steurer
fbb4d80817 Add automatic qml plugin generation...
We still need a way to register the enums in the plugin
2021-11-09 09:22:10 +01:00
Elias Steurer
83d4f425c4 Remove no longer available qml dir file 2021-11-01 18:25:59 +01:00
Elias Steurer
e155879e37 Merge remote-tracking branch 'origin/qt6-support' into qt6-support 2021-10-23 13:46:54 +02:00
Elias Steurer
6bcd2ad24b Add missing linux steam .so 2021-10-16 15:08:58 +02:00
Elias Steurer
feb9648684 Refactor to use Qt6 style cmake/qml plugins 2021-10-15 15:06:05 +02:00
Elias Steurer
6a081b4f25 Update SteamSDK to 1.52 with Apple m1 support 2021-10-10 11:47:20 +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
5d347a5746 Fix upload not working because old folder naming convention 2021-10-03 08:43:15 +02:00
Elias Steurer
75173c45b5 Fix inverted bool logic 2021-09-26 18:10:53 +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
7e029bcdf8 Refactor workshop plugin to show forum when not installed
Replace upload popup with regular page
2021-09-23 15:55:40 +02:00
Elias Steurer
40d8696e99 Remove more Qt6 #ifdef 2021-09-10 11:16:46 +02:00
Elias Steurer
4504f06eb1 Merge branch 'master' into qt6-support
# Conflicts:
#	CMakeLists.txt
#	ScreenPlay/app.h
#	ScreenPlay/main.cpp
#	ScreenPlay/main.qml
#	ScreenPlay/qml/Navigation/Navigation.qml
#	ScreenPlay/src/settings.h
#	ScreenPlay/translations/ScreenPlay_zh_cn.qm
#	ScreenPlayWallpaper/CMakeLists.txt
#	ScreenPlayWallpaper/SPWResources.qrc
#	ScreenPlayWallpaper/qml/Wallpaper.qml
2021-09-10 11:09:38 +02:00
Elias Steurer
d233e10441 Add explicit property for steam 2021-09-04 12:13:00 +02:00
Elias Steurer
a8152b5ab0 Fix installed list sorting because of missing LastModified
Fix ScreenPlayItem isNew location
2021-08-29 12:19:28 +02:00
Elias Steurer
4d5032538a Add docs to steam init functions 2021-08-16 16:01:48 +02:00
Elias Steurer
36e6a5772e Remove test code 2021-08-16 15:59:44 +02:00
Elias Steurer
cbd49b8613 Fix steam deploy options
Fix options being regular variables
Fix macos invalid time command
Add prints messages for all cmake options and defines
2021-08-16 11:00:53 +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
bf92792872 Remove git-lfs that breaks gitlab-ci
https://gitlab.com/gitlab-org/gitlab-runner/-/issues/4040
did not work for me
2021-07-30 10:51:08 +02:00
Elias Steurer
8a79576c14 Apply cmake format 2021-07-25 15:31:35 +02:00
Elias Steurer
6cb31ffa3f Apply clang format 2021-07-25 15:30:37 +02:00
Elias Steurer
e3a6193275 Fix macos compilation and workshop files 2021-07-25 12:26:55 +02:00
Elias Steurer
686fe05ea4 Fix output folder 2021-07-21 15:44:48 +02:00
Elias Steurer
59758487b4 Fix missing QtQuickCompiler and qrc 2021-07-16 16:44:28 +02:00
Elias Steurer
42bc6f869b Fix steam lib copy on macos 2021-07-16 11:36:02 +02:00
Elias Steurer
a9b2a7130e Set workshop out path for this lib only 2021-07-16 11:29:22 +02:00
Elias Steurer
fe2be3665e Make ScreenPlayWorkshop open source 2021-07-16 11:14:21 +02: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
Daniel Schukies
368bf83660 Add workshop project 2018-11-17 11:48:57 +01:00
kelteseth
a6f15329d0 Add workshop subproject 2018-10-17 20:39:39 +02:00