Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00
Code Issues Projects Releases Activity

Merge branch 'dev' into 'misc'

Browse Source 
# Conflicts:
#   README.md
This commit is contained in:
Elias Steurer (Kelteseth) 2019-07-29 06:18:11 +00:00
commit 69c0c50b2b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@ -6,7 +6,9 @@ Every changes to ScreenPlay are done via Gitlab issues and merge requests (pull
### Development ### Development
1. Accept the [Contributing Agreement](https://gitlab.com/kelteseth/ScreenPlay). 1. Accept the Contributing Agreement:
* [For regular contributors](https://gitlab.com/kelteseth/ScreenPlay/blob/dev/Legal/individual_contributor_license_agreement.md)
* [For members of a company](https://gitlab.com/kelteseth/ScreenPlay/blob/dev/Legal/corporate_contributor_license_agreement.md)
2. Download and set up ScreenPlay as described in the main [Readme](https://gitlab.com/kelteseth/ScreenPlay). 2. Download and set up ScreenPlay as described in the main [Readme](https://gitlab.com/kelteseth/ScreenPlay).
2. Choose an issue to work on: 2. Choose an issue to work on:
* Your own ideas or thinks you want to improve. Alternatively you can tackle existing open issues: * Your own ideas or thinks you want to improve. Alternatively you can tackle existing open issues:

12
README.md
View File

@ -3,8 +3,8 @@
</div> </div>
<div align="center"> <div align="center">
ScreenPlay is an open source cross platform app for displaying Wallpaper, Widgets and AppDrawer. It is written in modern C++17/Qt5/QML. Binaries with workshop support are available for Windows/Linux/MacOSX via <a href="https://store.steampowered.com/about/">Steam</a>. ScreenPlay is an open source cross plattform app for displaying Wallpaper, Widgets and AppDrawer. It is written in modern C++17/Qt5/QML. Binaries with workshop support are available for Windows/Linux/MacOSX via <a href="https://store.steampowered.com/about/">Steam</a>.
Join our community: <a href="https://screen-play.app/">Homepage</a>, <a href="https://forum.screen-play.app/">Forum</a>, <a href="https://discord.gg/3RygPHZ">Discord</a> Join our community: <a href="https://screen-play.app/">Homepage</a>, <a href="https://forum.screen-play.app/">Forum</a>
<br> Visit our <a href="https://kelteseth.gitlab.io/ScreenPlayDocs/"> Developer Documentation</a> and our <a href="https://kelteseth.gitlab.io/ScreenPlayDocs/"> Getting Started Guide</a>! <br> Visit our <a href="https://kelteseth.gitlab.io/ScreenPlayDocs/"> Developer Documentation</a> and our <a href="https://kelteseth.gitlab.io/ScreenPlayDocs/"> Getting Started Guide</a>!
<br> <br>
<h3><a href="https://steamcommunity.com/app/672870/">Download ScreenPlay!</a></h3> <h3><a href="https://steamcommunity.com/app/672870/">Download ScreenPlay!</a></h3>
@ -32,8 +32,8 @@ git clone --recursive https://gitlab.com/kelteseth/ScreenPlay.git
3. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer) 3. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
- Install the Maintaince tool - Install the Maintaince tool
- Select the following features to install: - Select the following features to install:
- Qt 5.13.0 - Qt 5.13.0
- MSVC 2019 (updated MSVC 2017 should work too) 64-bit - MSVC 2017 64-bit
- Qt WebEngine - Qt WebEngine
- Tools - Tools
- Qt Creator 4.x CDB Debugger Support - Qt Creator 4.x CDB Debugger Support
@ -56,7 +56,7 @@ sudo zypper install -t pattern devel_basis
2. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer) 2. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
- Install the Maintaince tool - Install the Maintaince tool
- Select the following features to install: - Select the following features to install:
- Qt 5.13.0 - Qt 5.13.0
- GCC - GCC
- Qt WebEngine - Qt WebEngine
### OSX ### OSX
@ -66,6 +66,6 @@ sudo zypper install -t pattern devel_basis
3. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer) 3. [Download and install Qt 5 binary installer from qt.io](https://www.qt.io/download-qt-installer)
- Install the Maintaince tool - Install the Maintaince tool
- Select the following features to install: - Select the following features to install:
- Qt 5.13.0 - Qt 5.13.0
- Qt WebEngine - Qt WebEngine
4. Change your default kit: QtCreator -> Options -> Kits -> Select your default kit (Desktop Qt 5.13.0) -> Change c and c++ Compiler to Apple Clang (x86_64) 4. Change your default kit: QtCreator -> Options -> Kits -> Select your default kit (Desktop Qt 5.13.0) -> Change c and c++ Compiler to Apple Clang (x86_64)