Skip to content
This repository was archived by the owner on Dec 5, 2018. It is now read-only.

Commit 5055655

Browse files
author
Firtina Ozbalikci
authored
Merge pull request #11 from firtina-improbable/feature/upgrade-13
Upgrade to SpatialOS 13.0.0
2 parents 6c7c99a + 48d15ea commit 5055655

File tree

604 files changed

+26911
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

604 files changed

+26911
-11
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,10 @@ spatialos_worker_packages.json
33
build/
44
logs/
55
workers/unity/external-default-unityclient.log
6+
workers/unity/Assets/Plugins/Improbable/Editor/Generated/
7+
workers/unity/Assets/Plugins/Improbable/Editor/Generated.meta
8+
workers/unity/Assets/Plugins/Improbable/Generated/
9+
workers/unity/Assets/Plugins/Improbable/Generated.meta
10+
workers/unity/Assets/Plugins/Improbable/EntityPrefabs/
11+
workers/unity/Assets/Plugins/Improbable/EntityPrefabs.meta
12+
workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Generated.Code.*

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
**Note: This project runs on SpatialOS version 12.2.1 and not the latest version which is 13.0.0.**
2-
31
# PiratesTutorial
42

53
![Pirates Screenshot](pirates-screenshot.jpg)

spatialos.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "your_project_name_here",
33
"project_version": "1.0.0",
4-
"sdk_version": "12.2.1",
4+
"sdk_version": "13.0.0",
55
"dependencies": [
6-
{"name": "standard_library", "version": "12.2.1"}
6+
{"name": "standard_library", "version": "13.0.0"}
77
]
88
}

workers/unity/.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
# Improbable Unity Ignores
22
.spatialos/
33
spatialos_worker_packages.json
4-
build.json
54
.invoke.log
65
zip_toolbelt.log
76
external-default-unityclient.log
87
external-default-unityworker.log
9-
Improbable.meta
108
Assets/Improbable
11-
Assets/Plugins/Improbable
129
Assets/Plugins/x86/Improbable
1310
Assets/Plugins/x86.meta
1411
Assets/Plugins/x86_64/Improbable

workers/unity/Assets/Plugins/Improbable.meta

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem.meta

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor/Configuration.meta

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) Improbable Worlds Ltd, All Rights Reserved
2+
3+
namespace Improbable.Unity.MinimalBuildSystem.Configuration
4+
{
5+
public enum BuildEnvironment
6+
{
7+
Local,
8+
Cloud
9+
}
10+
}

workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor/Configuration/BuildEnvironment.cs.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)