Commit a7d61ed8 authored by Gabriel Le Breton's avatar Gabriel Le Breton

Merge branch 'upgrade-to-2019.2.11f1' into 'master'

Upgrade to 2019.2.11f1

See merge request !28
parents 96c916e6 3edcfcd0
Pipeline #95255313 passed with stages
in 38 minutes and 54 seconds
image: gableroux/unity3d:2019.1.14f1
image: gableroux/unity3d:2019.2.11f1
stages:
- build_and_test
- deploy
# If you are looking for a place where to add 'UNITY_LICENSE_FILE' nad secrets, please visit your project's gitlab page:
# settings > CI/CD > Variables instead
variables:
BUILD_NAME: ExampleProjectName
UNITY_ACTIVATION_FILE: ./unity3d.alf
.unity_before_script: &unity_before_script
before_script:
......@@ -17,23 +20,17 @@ variables:
paths:
- Library/
# run this when you need to request a license again
# you will need to follow activation steps from documentation
# Look at the logs and grab the XML
get-license:
# run this job when you need to request a license
# you may need to follow activation steps from documentation
get-activation-file:
when: manual
stage: build_and_test
<<: *cache
script:
- chmod +x ./ci/get_license.sh && ./ci/get_license.sh
get-android-license:
when: manual
stage: build_and_test
image: gableroux/unity3d:2019.1.14f1-android
<<: *cache
script:
- chmod +x ./ci/get_license.sh && ./ci/get_license.sh
- chmod +x ./ci/get_activation_file.sh && ./ci/get_activation_file.sh
artifacts:
paths:
- $UNITY_ACTIVATION_FILE
expire_in: 10 min # Expiring this as artifacts may contain sensitive data and should not be kept public
.test: &test
stage: build_and_test
......@@ -45,11 +42,16 @@ get-android-license:
paths:
- $(pwd)/$TEST_PLATFORM-results.xml
test:
test-playmode:
<<: *test
variables:
TEST_PLATFORM: playmode
test-editmode:
<<: *test
variables:
TEST_PLATFORM: editmode
.build: &build
stage: build_and_test
<<: *unity_before_script
......@@ -70,6 +72,7 @@ build-StandaloneLinux64:
build-StandaloneOSX:
<<: *build
image: gableroux/unity3d:2019.2.11f1-mac
variables:
BUILD_TARGET: StandaloneOSX
......@@ -81,17 +84,19 @@ build-StandaloneOSX:
build-StandaloneWindows64:
<<: *build
image: gableroux/unity3d:2019.2.11f1-windows
variables:
BUILD_TARGET: StandaloneWindows64
build-WebGL:
<<: *build
image: gableroux/unity3d:2019.2.11f1-webgl
variables:
BUILD_TARGET: WebGL
build-android:
<<: *build
image: gableroux/unity3d:2019.1.14f1-android
image: gableroux/unity3d:2019.2.11f1-android
variables:
BUILD_TARGET: Android
......
......@@ -78,4 +78,4 @@ namespace RPGM.Gameplay
}
}
}
\ No newline at end of file
}
......@@ -46,4 +46,4 @@ namespace RPGM.Gameplay
EditorGUI.EndProperty();
}
}
}
\ No newline at end of file
}
......@@ -175,4 +175,4 @@ namespace RPGM.Gameplay
}
}
}
\ No newline at end of file
}
......@@ -140,4 +140,4 @@ namespace RPGM.Gameplay
return EditorGUI.EndChangeCheck();
}
}
}
\ No newline at end of file
}
......@@ -61,4 +61,4 @@ namespace RPGM.Gameplay
}
}
}
\ No newline at end of file
}
......@@ -88,4 +88,4 @@ namespace RPGM.Gameplay
list.DoLayoutList();
}
}
}
\ No newline at end of file
}
......@@ -84,4 +84,4 @@ namespace RPGM.EditorExtensions
return false;
}
}
}
\ No newline at end of file
}
......@@ -85,4 +85,4 @@ namespace RPGM.EditorExtensions
}
}
}
}
\ No newline at end of file
}
......@@ -83,4 +83,4 @@ namespace RPGM.EditorExtensions
Selection.activeGameObject = i;
}
}
}
\ No newline at end of file
}
......@@ -256,4 +256,4 @@ namespace RPGM.EditorExtensions
return remove;
}
}
}
\ No newline at end of file
}
......@@ -92,4 +92,4 @@ namespace RPGM.EditorExtensions
return false;
}
}
}
\ No newline at end of file
}
......@@ -43,4 +43,4 @@ namespace RPGM.Core
}
}
}
\ No newline at end of file
}
......@@ -111,4 +111,4 @@ namespace RPGM.Core
SiftDown(startpos, pos);
}
}
}
\ No newline at end of file
}
......@@ -8,4 +8,4 @@
{
public static T instance = new T();
}
}
\ No newline at end of file
}
......@@ -29,4 +29,4 @@ namespace RPGM.Core
}
}
}
}
\ No newline at end of file
}
......@@ -26,4 +26,4 @@ namespace RPGM.Gameplay
transform.position = Vector3.Lerp(transform.position, focus.position - offset, Time.deltaTime * smoothTime);
}
}
}
\ No newline at end of file
}
......@@ -93,4 +93,4 @@ namespace RPGM.Gameplay
pixelPerfectCamera = GameObject.FindObjectOfType<PixelPerfectCamera>();
}
}
}
\ No newline at end of file
}
......@@ -51,4 +51,4 @@ namespace RPGM.Gameplay
Gizmos.DrawWireSphere(transform.position, resetRadius);
}
}
}
\ No newline at end of file
}
......@@ -14,4 +14,4 @@ namespace RPGM.Gameplay
public string targetId;
public bool enabled;
}
}
\ No newline at end of file
}
......@@ -21,4 +21,4 @@ namespace RPGM.Gameplay
public Quest quest;
public List<ConversationOption> options;
}
}
\ No newline at end of file
}
......@@ -79,4 +79,4 @@ namespace RPGM.Gameplay
index[i.id] = i;
}
}
}
\ No newline at end of file
}
......@@ -30,4 +30,4 @@ namespace RPGM.Gameplay
targetAlpha = 1f;
}
}
}
\ No newline at end of file
}
......@@ -20,4 +20,4 @@ namespace RPGM.Gameplay
}
}
}
}
\ No newline at end of file
}
......@@ -34,4 +34,4 @@ namespace RPGM.Gameplay
}
}
}
\ No newline at end of file
}
......@@ -25,4 +25,4 @@ namespace RPGM.Gameplay
Schedule.Tick();
}
}
}
\ No newline at end of file
}
......@@ -100,4 +100,4 @@ namespace RPGM.Gameplay
return conversations.ContainsKey(owner);
}
}
}
\ No newline at end of file
}
......@@ -76,4 +76,4 @@ namespace RPGM.UI
model.player.nextMoveCommand = Vector3.zero;
}
}
}
\ No newline at end of file
}
......@@ -36,4 +36,4 @@ namespace RPGM.Gameplay
gameObject.SetActive(false);
}
}
}
\ No newline at end of file
}
......@@ -42,4 +42,4 @@ namespace RPGM.Gameplay
audioSourceB.outputAudioMixerGroup = audioMixerGroup;
}
}
}
\ No newline at end of file
}
......@@ -72,4 +72,4 @@ namespace RPGM.Gameplay
return null;
}
}
}
\ No newline at end of file
}
......@@ -155,4 +155,4 @@ namespace RPGM.Gameplay
}
}
}
\ No newline at end of file
}
......@@ -118,4 +118,4 @@ namespace RPGM.Events
}
}
}
\ No newline at end of file
}
......@@ -64,4 +64,4 @@ public class StandaloneController : Controller, ISerializationCallbackReceiver
public InputButton inputButton;
public KeyCode keyCode;
}
}
\ No newline at end of file
}
......@@ -22,4 +22,4 @@ namespace RPGM.Events
}
}
}
}
\ No newline at end of file
}
......@@ -12,4 +12,4 @@ namespace RPGM.Events
animator.SetBool("Talk", false);
}
}
}
\ No newline at end of file
}
......@@ -104,4 +104,4 @@ namespace RPGM.Gameplay
foreach (var i in _requiredInventoryItems) requiredInventoryItems.Add(i);
}
}
}
\ No newline at end of file
}
......@@ -6,7 +6,7 @@ namespace UnityEditor
{
[CustomGridBrush(true, false, false, "Coordinate Brush")]
[CreateAssetMenu(fileName = "New Coordinate Brush", menuName = "Brushes/Coordinate Brush")]
public class CoordinateBrush : GridBrush {
public class CoordinateBrush : UnityEditor.Tilemaps.GridBrush {
public int z = 0;
public override void Paint(GridLayout grid, GameObject brushTarget, Vector3Int position)
......@@ -36,7 +36,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(CoordinateBrush))]
public class CoordinateBrushEditor : GridBrushEditor
public class CoordinateBrushEditor : UnityEditor.Tilemaps.GridBrushEditor
{
private CoordinateBrush coordinateBrush { get { return target as CoordinateBrush; } }
......
......@@ -466,7 +466,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(GameObjectBrush))]
public class GameObjectBrushEditor : GridBrushEditorBase
public class GameObjectBrushEditor : UnityEditor.Tilemaps.GridBrushEditorBase
{
public GameObjectBrush brush { get { return target as GameObjectBrush; } }
......
......@@ -6,7 +6,7 @@ using UnityEngine.Tilemaps;
namespace UnityEditor
{
[CustomGridBrush(true, false, false, "Group Brush")]
public class GroupBrush : GridBrush
public class GroupBrush : UnityEditor.Tilemaps.GridBrush
{
public Vector3Int gap
{
......@@ -177,7 +177,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(GroupBrush))]
public class GroupBrushEditor : GridBrushEditor
public class GroupBrushEditor : UnityEditor.Tilemaps.GridBrushEditor
{
}
}
......@@ -9,7 +9,7 @@ namespace UnityEditor
{
[CustomGridBrush(true, false, false, "Line Brush")]
[CreateAssetMenu(fileName = "New Line Brush", menuName = "Brushes/Line Brush")]
public class LineBrush : GridBrush
public class LineBrush : UnityEditor.Tilemaps.GridBrush
{
public bool lineStartActive = false;
public bool fillGaps = false;
......@@ -150,7 +150,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(LineBrush))]
public class LineBrushEditor : GridBrushEditor
public class LineBrushEditor : UnityEditor.Tilemaps.GridBrushEditor
{
private LineBrush lineBrush { get { return target as LineBrush; } }
private Tilemap lastTilemap;
......
......@@ -7,7 +7,7 @@ namespace UnityEditor
{
[CreateAssetMenu(fileName = "Prefab brush", menuName = "Brushes/Prefab brush")]
[CustomGridBrush(false, true, false, "Prefab Brush")]
public class PrefabBrush : GridBrush
public class PrefabBrush : UnityEditor.Tilemaps.GridBrush
{
private const float k_PerlinOffset = 100000f;
public GameObject[] m_Prefabs;
......@@ -83,7 +83,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(PrefabBrush))]
public class PrefabBrushEditor : GridBrushEditor
public class PrefabBrushEditor : UnityEditor.Tilemaps.GridBrushEditor
{
private PrefabBrush prefabBrush { get { return target as PrefabBrush; } }
......
......@@ -8,7 +8,7 @@ namespace UnityEditor
{
[CustomGridBrush(false, false, false, "Random Brush")]
[CreateAssetMenu(fileName = "New Random Brush", menuName = "Brushes/Random Brush")]
public class RandomBrush : GridBrush
public class RandomBrush : UnityEditor.Tilemaps.GridBrush
{
internal struct SizeEnumerator : IEnumerator<Vector3Int>
{
......@@ -133,7 +133,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(RandomBrush))]
public class RandomBrushEditor : GridBrushEditor
public class RandomBrushEditor : UnityEditor.Tilemaps.GridBrushEditor
{
private RandomBrush randomBrush { get { return target as RandomBrush; } }
private GameObject lastBrushTarget;
......
......@@ -84,7 +84,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(TintBrushSmooth))]
public class TintBrushSmoothEditor : GridBrushEditorBase
public class TintBrushSmoothEditor : UnityEditor.Tilemaps.GridBrushEditorBase
{
public TintBrushSmooth brush { get { return target as TintBrushSmooth; } }
......
......@@ -61,7 +61,7 @@ namespace UnityEditor
[CustomEditor(typeof(TintBrush))]
public class TintBrushEditor : GridBrushEditorBase
public class TintBrushEditor : UnityEditor.Tilemaps.GridBrushEditorBase
{
public override GameObject[] validTargets
{
......
......@@ -145,4 +145,4 @@ namespace RPGM.UI
mainCamera = Camera.main;
}
}
}
\ No newline at end of file
}
......@@ -133,4 +133,4 @@ namespace RPGM.UI
return spriteRenderer.size.y;
}
}
}
\ No newline at end of file
}
......@@ -52,4 +52,4 @@ namespace RPGM.UI
sizer.Hide();
}
}
}
\ No newline at end of file
}
......@@ -60,4 +60,4 @@ namespace RPGM.UI
instance.messages.Enqueue(text);
}
}
}
\ No newline at end of file
}
......@@ -47,4 +47,4 @@ namespace RPGM.UI
textMeshPro = GetComponentInChildren<TextMeshPro>();
}
}
}
\ No newline at end of file
}
......@@ -70,4 +70,4 @@ namespace RPGM.UI
}
}
}
}
\ No newline at end of file
}
......@@ -76,4 +76,4 @@ namespace RPGM.UI
State state;
float t;
}
}
\ No newline at end of file
}
......@@ -113,4 +113,4 @@ namespace RPGM.UI
if (instance != null) instance.Play(audioClip);
}
}
}
\ No newline at end of file
}
......@@ -3,4 +3,4 @@
"optionalUnityReferences": [
"TestAssemblies"
]
}
\ No newline at end of file
}
......@@ -6,4 +6,4 @@ You GET libre use (study, modify, share) except for branding, logos and direct t
You MUST credit both foundry and type designer(s).
You CAN modify, improve, build upon a black font provided you share the derivate product with the rest of the world (no free riders, a logo builded upon a black font belongs to everybody else ; a black font is NOT for branding.
This font software comes without any warranty. If it is sold as or with a tangible item, a limited warranty applies to the tangible item itself, but not to the font file.
\ No newline at end of file
This font software comes without any warranty. If it is sold as or with a tangible item, a limited warranty applies to the tangible item itself, but not to the font file.
)]}〕〉》」』】〙〗〟’”⦆»ヽヾーァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ々〻‐゠–〜?!‼⁇⁈⁉・、%,.:;。!?]):;=}¢°"†‡℃〆%,.
\ No newline at end of file
)]}〕〉》」』】〙〗〟’”⦆»ヽヾーァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ々〻‐゠–〜?!‼⁇⁈⁉・、%,.:;。!?]):;=}¢°"†‡℃〆%,.
([{〔〈《「『【〘〖〝‘“⦅«$—…‥〳〴〵\[({£¥"々〇〉》」$⦆¥₩ #
\ No newline at end of file
([{〔〈《「『【〘〖〝‘“⦅«$—…‥〳〴〵\[({£¥"々〇〉》」$⦆¥₩ #
This sample of beautiful emojis are provided by EmojiOne https://www.emojione.com/
Please visit their website to view the complete set of their emojis and review their licensing terms.
\ No newline at end of file
Please visit their website to view the complete set of their emojis and review their licensing terms.
fileFormatVersion: 2
guid: 8a0c9218a650547d98138cd835033977
folderAsset: yes
timeCreated: 1484670163
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
{
"dependencies": {
"com.unity.2d.pixel-perfect": "1.0.1-preview",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "2.3.1",
"com.unity.analytics": "3.3.2",
"com.unity.collab-proxy": "1.2.16",
"com.unity.ext.nunit": "1.0.0",
"com.unity.ide.rider": "1.1.0",
"com.unity.ide.vscode": "1.1.2",
"com.unity.multiplayer-hlapi": "1.0.2",
"com.unity.package-manager-ui": "2.1.2",
"com.unity.package-manager-ui": "2.2.0",
"com.unity.purchasing": "2.0.6",
"com.unity.test-framework": "1.0.13",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.0.0",
"com.unity.timeline": "1.1.0",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.0.2",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
......
m_EditorVersion: 2019.1.14f1
m_EditorVersionWithRevision: 2019.1.14f1 (148b5891095a)
m_EditorVersion: 2019.2.11f1
m_EditorVersionWithRevision: 2019.2.11f1 (5f859a4cfee5)
......@@ -7,4 +7,4 @@
"False",
"False"
]
}
\ No newline at end of file
}
......@@ -20,24 +20,27 @@ This repository is hosted on multiple remotes to provide examples for [Gitlab-CI
- [Getting started](#getting-started)
- [Points of interest](#points-of-interest)
- [Build script](#build-script)
- [CI Configuration](#ci-configuration)
- [gitlab-ci](#gitlab-ci)
- [WIP: CircleCI](#wip-circleci)
- [Travis](#travis)
- [Test files](#test-files)
- [Build script](#build-script)
- [CI Configuration](#ci-configuration)
- [gitlab-ci](#gitlab-ci)
- [WIP: CircleCI](#wip-circleci)
- [Travis](#travis)
- [Test files](#test-files)
- [How to activate](#how-to-activate)
- [Unity Personal](#unity-personal)
- [Unity Plus/Pro](#unity-pluspro)
- [Travis](#travis-1)
- [Unity license per target](#unity-license-per-target)
- [Unity Personal](#unity-personal)
- [a. Using gitlab-ci](#a-using-gitlab-ci)
- [b. Locally](#b-locally)
- [Unity Plus/Pro](#unity-pluspro)
- [Unity license per target](#unity-license-per-target)
- [Note about components in recent images](#note-about-components-in-recent-images)
- [Travis](#travis-1)
- [How to add build targets](#how-to-add-build-targets)
- [gitlab-ci](#gitlab-ci-1)
- [iOS support](#ios-support)
- [Android support](#android-support)
- [gitlab-ci](#gitlab-ci-1)
- [iOS support](#ios-support)
- [Android support](#android-support)
- [How to run scripts manually](#how-to-run-scripts-manually)
- [Test](#test)
- [Build](#build)
- [Test](#test)
- [Build](#build)
- [About the example project](#about-the-example-project)
- [Get involved](#get-involved)
- [Shameless plug](#shameless-plug)
......@@ -50,17 +53,18 @@ This repository is hosted on multiple remotes to provide examples for [Gitlab-CI
If you don't have a Unity project yet: