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

32 Commits

Author SHA1 Message Date
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