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

Commit 506699d

Browse files
authored
Merge pull request #6 from spatialos/13.0.0
Updated to SpatialOS 13.0.0
2 parents da6a242 + b2416d6 commit 506699d

File tree

613 files changed

+27276
-36
lines changed

Some content is hidden

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

613 files changed

+27276
-36
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/Sdk/Dll/Generated.Code.*
11+
workers/unity/Assets/Plugins/Improbable/EntityPrefabs/
12+
workers/unity/Assets/Plugins/Improbable/EntityPrefabs.meta

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
# Virtual Reality starter project
42

53
![Virtual Reality starter project](vrstarterproject.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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ build.json
33
.invoke.log
44
external-default-unityclient.log
55
zip_toolbelt.log
6-
Improbable.meta
76
Assets/Improbable
8-
Assets/Plugins/Improbable
97
Assets/Plugins/x86/Improbable
108
Assets/Plugins/x86.meta
119
Assets/Plugins/x86_64/Improbable
@@ -17,10 +15,6 @@ Assembly-CSharp-firstpass.csproj
1715
Assembly-CSharp.csproj
1816
.spatialos
1917

20-
# Improbable Generated Build Scripts for Unity
21-
spatialos.unity.client.build.json
22-
spatialos.unity.worker.build.json
23-
2418
# Standard Unity Ignores
2519
/[Ll]ibrary/
2620
/[Tt]emp/

workers/unity/Assets/EntityPrefabs/Armchair.prefab.meta

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

workers/unity/Assets/EntityPrefabs/Cube.prefab.meta

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

workers/unity/Assets/EntityPrefabs/Player.prefab.meta

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

workers/unity/Assets/EntityPrefabs/PlayerCreator.prefab.meta

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

workers/unity/Assets/EntityPrefabs/Spectator.prefab.meta

Lines changed: 1 addition & 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.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.

0 commit comments

Comments
 (0)