Merge branch 'develop'

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 This document keeps track of the changes between versions of the toolkit.
 
+## 1.2.1 (2020-12-10)
+
+### Fixed
+- Fixed a compilation error that was caused by the OpenID Connect module when building with IL2CPP on other platforms than UWP
+
+### Changed
+- Added an instance of the app console to the OpenID Connect sample scene.
+  This way, the console output with the login result can be seen in compiled applications.
+
 ## 1.2.0 (2020-12-07)
 
 ### Added

Documentation~/i5-Toolkit-for-Unity.md

@@ -1,3 +1,3 @@
 # Documentation of the i5 Toolkit for Unity
 
-Click [here](https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/index.html) to go to the documentation pages for version 1.2.0 of the package.
+Click [here](https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/index.html) to go to the documentation pages for version 1.2.1 of the package.

README.md

@@ -7,27 +7,27 @@ It is a foundation for new projects, kickstarting the development with already c
 
 ![Continuous Integration](https://github.com/rwth-acis/i5-Toolkit-for-Unity/workflows/Continuous%20Integration/badge.svg)
 
-![1.2.0](https://img.shields.io/badge/version-1.2.0-blue)
+![1.2.1](https://img.shields.io/badge/version-1.2.1-blue)
 
 ## Modules
 
 The i5 Toolkit provides a series of modules and features that can be used in projects.
 
 <table style="text-align: center; vertical-align: middle">
     <tr>
-        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/manual/App-Console.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/resources/Logos/AppConsole.svg" alt="App Console" style="width:200px"/><br/>App Console</a></td>
-        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/manual/Modified-3D-Objects.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/resources/Logos/RoundedCorners.svg" alt="Modified 3D Objects" style="width:200px"/><br/>Modified 3D Models</a></td>
-        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/manual/Object-Pool.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/resources/Logos/ObjectPool.svg" alt="Object Pool" style="width:200px"/><br/>Object Pool</a></td>
+        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/manual/App-Console.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/resources/Logos/AppConsole.svg" alt="App Console" style="width:200px"/><br/>App Console</a></td>
+        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/manual/Modified-3D-Objects.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/resources/Logos/RoundedCorners.svg" alt="Modified 3D Objects" style="width:200px"/><br/>Modified 3D Models</a></td>
+        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/manual/Object-Pool.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/resources/Logos/ObjectPool.svg" alt="Object Pool" style="width:200px"/><br/>Object Pool</a></td>
     </tr>
     <tr>
-        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/manual/Obj-Importer.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/resources/Logos/ObjImporter.svg" alt="Obj Importer" style="width:200px"/><br/>Obj Importer</a></td>
-        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/manual/OpenID-Connect-Client.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/resources/Logos/OpenIDConnectClient.svg" alt="OpenID Connect Client" style="width:200px"/><br/>OpenID Connect Client</a></td>
-        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/manual/Procedural-Geometry.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/resources/Logos/ProceduralGeometry.svg" alt="Procedural Geometry" style="width:200px"/><br/>Procedural Geometry</a></td>
+        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/manual/Obj-Importer.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/resources/Logos/ObjImporter.svg" alt="Obj Importer" style="width:200px"/><br/>Obj Importer</a></td>
+        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/manual/OpenID-Connect-Client.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/resources/Logos/OpenIDConnectClient.svg" alt="OpenID Connect Client" style="width:200px"/><br/>OpenID Connect Client</a></td>
+        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/manual/Procedural-Geometry.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/resources/Logos/ProceduralGeometry.svg" alt="Procedural Geometry" style="width:200px"/><br/>Procedural Geometry</a></td>
     </tr>
     <tr>
-        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/manual/Scene-Documentation.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/resources/Logos/SceneDocumentation.svg" alt="Scene Documentation" style="width:200px"/><br/>Scene Documentation</a></td>
-        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/manual/Service-Core.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/resources/Logos/ServiceCore.svg" alt="Service Core" style="width:200px"/><br/>Service Core</a></td>
-        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/manual/Spawner.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.0/resources/Logos/Spawner.svg" alt="Spawner" style="width:200px"/><br/>Spawner</a></td>
+        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/manual/Scene-Documentation.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/resources/Logos/SceneDocumentation.svg" alt="Scene Documentation" style="width:200px"/><br/>Scene Documentation</a></td>
+        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/manual/Service-Core.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/resources/Logos/ServiceCore.svg" alt="Service Core" style="width:200px"/><br/>Service Core</a></td>
+        <td><a href="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/manual/Spawner.html"><img src="https://rwth-acis.github.io/i5-Toolkit-for-Unity/1.2.1/resources/Logos/Spawner.svg" alt="Spawner" style="width:200px"/><br/>Spawner</a></td>
     </tr>
 </table>
 
@@ -41,7 +41,7 @@ The tool is available as a package for the Unity Package Manager. It can be incl
 
 1. Open your project's root folder in a file explorer.
 2. Navigate to the Packages folder and open the file manifest.json. It contains a list of package dependencies which are loaded into the project.
-3. To add a specific version of the tool to the dependencies, add the following line inside of the "dependencies" object and replace [version] with "v", followed by the release number, e.g. "v1.2.0".
+3. To add a specific version of the tool to the dependencies, add the following line inside of the "dependencies" object and replace [version] with "v", followed by the release number, e.g. "v1.2.1".
    To receive the latest version, replace [version] with upm.
    `"com.i5.toolkit.core": "https://github.com/rwth-acis/i5-Toolkit-for-Unity.git#[version]",`
    After that, Unity will automatically download and import the package.
@@ -56,7 +56,7 @@ The package can be downloaded from a git-repository in the package manager's UI.
 
 1. In Unity, go to Window > Package Manger.
 2. Click on the plus-button in the top left corner of the package manager and select "add".
-3. Enter https://github.com/rwth-acis/i5-Toolkit-for-Unity.git#[version] into the text field where [version] is replaced with "v", followed by the release number, e.g. "v1.2.0" or upm for the latest version.
+3. Enter https://github.com/rwth-acis/i5-Toolkit-for-Unity.git#[version] into the text field where [version] is replaced with "v", followed by the release number, e.g. "v1.2.1" or upm for the latest version.
    Confirm the download by clicking on the "add" button.
 
 If you specify "upm" to get the latest version, be aware that the package is not automatically updated.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.i5.toolkit.core",
-  "version": "1.2.1-preview",
+  "version": "1.2.1",
   "displayName": "i5 Toolkit for Unity",
   "description": "This package contains a collection of tools, features and assets for the development of Unity projects",
   "unity": "2018.4",