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
|
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
|
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
|
8a79576c14
|
Apply cmake format
|
2021-07-25 15:31:35 +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 |
|