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

Commit ca5cf98

Browse files
author
Firtina Ozbalikci
authored
Merge pull request #6 from spatialos/13.0.0
13.0.0
2 parents 297f56c + 457964c commit ca5cf98

File tree

609 files changed

+27264
-40
lines changed

Some content is hidden

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

609 files changed

+27264
-40
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,8 @@ spatialos_worker_packages.json
33
build/
44
logs/
55
workers/unity/external-default-unityclient.log
6+
workers/unity/Assets/Plugins/Improbable/Editor/
7+
workers/unity/Assets/Plugins/Improbable/Editor.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.*

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
# Blank Project
42
---
53

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 & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
#Improbable Unity Ignores
2-
build.json
32
.invoke.log
43
zip_toolbelt.log
5-
Improbable.meta
64
Assets/Improbable
7-
Assets/Plugins/Improbable
85
Assets/Plugins/x86/Improbable
96
Assets/Plugins/x86.meta
107
Assets/Plugins/x86_64/Improbable
@@ -16,10 +13,6 @@ Assembly-CSharp-firstpass.csproj
1613
Assembly-CSharp.csproj
1714
.spatialos
1815

19-
# Improbable Generated Build Scripts for Unity
20-
spatialos.unity.client.build.json
21-
spatialos.unity.worker.build.json
22-
2316
# Standard Unity Ignores
2417
/[Ll]ibrary/
2518
/[Tt]emp/

workers/unity/Assets/EntityPrefabs.meta

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

workers/unity/Assets/Plugins.meta

Lines changed: 3 additions & 2 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.

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/Resources/EntityPrefabs.meta renamed to workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor.meta

Lines changed: 2 additions & 2 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.

0 commit comments

Comments
 (0)