Skip to content
This repository was archived by the owner on Oct 11, 2019. It is now read-only.

Commit 08114af

Browse files
author
Firtina Ozbalikci
authored
Merge pull request #4 from spatialos/release-1.0.0-rc-04
Improve migration guide and fix links in documentation
2 parents c1e3702 + 561cd3d commit 08114af

6 files changed

+58
-23
lines changed

Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll.meta

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml.meta

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll.meta

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml.meta

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* License: This repository is subject to [license](LICENSE.md)
88

99
Use the SpatialOS Unity SDK to create games with persistent online worlds.
10-
Together with the SpatialOS [spatial CLI](https://docs.improbable.io/reference/13.0/shared/spatial-cli/introduction), the SpatialOS Unity SDK
10+
Together with the SpatialOS [spatial CLI](https://docs.improbable.io/reference/13.0/shared/spatial-cli-introduction), the SpatialOS Unity SDK
1111
allows you to use [Unity](https://www.unity3d.com) to create games for the [SpatialOS](https://improbable.io/games) platform.
12-
To help you get started, there are [tutorials](tutorials) to follow and [example games](docs/repositories.md) to
12+
To help you get started, there are [tutorials](docs/tutorials/learning-resources.md) to follow and [example games](docs/repositories.md) to
1313
experiment with. In addition to the [SpatialOS Unity SDK documentation](docs/start-here-table-of-contents.md) in this repository, you can find out more about
1414
SpatialOS at [docs.improbable.io](https://docs.improbable.io).
1515

docs/migration.md

+48-9
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ and to replace `"spatialos.unity.worker.build.json"` with `"Improbable/build_scr
2828
1. In the root of your project, edit the `spatialos.json` file in two places so that `"version"` is `“13.0.0”`.
2929
1. Run `spatial clean` (again).
3030
1. Run `spatial worker build`.
31+
1. In your project’s root directory and `workers/unity` directory, edit the following lines in the version control system (VCS) ignore files:
32+
* Delete
33+
* `Assets/Plugins/Improbable`
34+
* `Improbable.meta`
35+
* `spatialos.*.build.json`
36+
* Add
37+
* `workers/unity/Assets/Plugins/Improbable/Editor/Generated/`
38+
* `workers/unity/Assets/Plugins/Improbable/Editor/Generated.meta`
39+
* `workers/unity/Assets/Plugins/Improbable/Generated/`
40+
* `workers/unity/Assets/Plugins/Improbable/Generated.meta`
41+
* `workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Generated.Code.*`
42+
43+
**Note:** All our starter projects the VCS ignore files are not set as above, so if your project is based on any of these starter projects, you need to edit the VCS ignore files as described in step 10.
44+
3145

3246
## Detailed guide
3347

@@ -38,23 +52,24 @@ Note: It’s very important you start by running `spatial clean`. If you don’t
3852
may cause issues with the new version.
3953

4054
### 2. Clone or download the SpatialOS Unity SDK (1.0.0)
41-
3. Get the SpatialOS Unity SDK by cloning the [SpatialOS Unity SDK GitHub repository](https://github.com/spatialos/UnitySDK).
55+
Get the SpatialOS Unity SDK by cloning the [SpatialOS Unity SDK GitHub repository](https://github.com/spatialos/UnitySDK).
4256
 
4357
Either follow the **Clone or download** instructions on the web page or clone using the command line.
4458
(See the [git-scm](https://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository) website for
4559
guidance on setting up and using command-line git.)
4660
 
61+
4762
For command-line git, in a terminal window run:
4863
`git clone github.com/spatialos/UnitySDK`
4964

5065
### 3. Upgrade your Unity project
51-
4. From the cloned repository, copy the contents of the `Assets` and `Improbable` directories into the directory
66+
1. From the cloned repository, copy the contents of the `Assets` and `Improbable` directories into the directory
5267
which contains your Unity project’s workers. (It is the directory which contains the `spatialos_worker_packages.json` file.)
5368
 
5469
For example:
5570
`~/mySpatialOSgame/workers/unity`
5671

57-
5. In the same directory, edit the `spatialos.UnityClient.worker.json` file to remove `"generated_build_scripts_type":"unity"` completely
72+
2. In the same directory, edit the `spatialos.UnityClient.worker.json` file to remove `"generated_build_scripts_type":"unity"` completely
5873
and to replace `"spatialos.unity.client.build.json"` with `"Improbable/build_script/spatialos.unity.client.build.json".`
5974
This part of the file should now look like this:
6075
```
@@ -63,7 +78,7 @@ This part of the file should now look like this:
6378
},
6479
```
6580

66-
6. In the same directory, edit the `spatialos.UnityWorker.worker.json` file to remove `"generated_build_scripts_type":"unity"` completely
81+
3. In the same directory, edit the `spatialos.UnityWorker.worker.json` file to remove `"generated_build_scripts_type":"unity"` completely
6782
and to replace `"spatialos.unity.worker.build.json"` with `"Improbable/build_script/spatialos.unity.worker.build.json".`
6883
This part of the file should now look like this:
6984
```
@@ -73,9 +88,9 @@ This part of the file should now look like this:
7388
},
7489
```
7590

76-
7. Delete `spatialos_worker_packages.json` as `spatial` no longer uses this file.
91+
4. Delete `spatialos_worker_packages.json` as `spatial` no longer uses this file.
7792

78-
8. Navigate two directories up to find the `spatialos.json` file.
93+
5. Navigate two directories up to find the `spatialos.json` file.
7994
Edit the `spatialos.json` file so that the `"version"` is `“13.0.0”` and save the file. Note that there are two
8095
places to edit the version.
8196
The file should now look similar to this:
@@ -90,10 +105,34 @@ The file should now look similar to this:
90105
}
91106
```
92107

93-
9. In the root directory of your project, run `spatial clean` (again).
108+
6. In the root directory of your project, run `spatial clean` (again).
109+
110+
### 5. Update the version control ignore files
111+
112+
Make sure your version control system (VCS) is set to; **stop ignoring** the Unity SDK directories you have copied, specifically the directories under `Assets/Plugins/Improbable`, and **ignore** some auto-generated files.
113+
1. Locate the VCS ignore files in your project’s root directory and `workers\unity` directory.
114+
* For example, the VCS ignore files to check on the Pirates project on GitHub are:
115+
* in the `workers/unity` directory - [github.com/spatialos/PiratesTutorial/blob/master/workers/unity/.gitignore](https://github.com/spatialos/PiratesTutorial/blob/master/workers/unity/.gitignore)
116+
* in the root directory - [github.com/spatialos/PiratesTutorial/blob/master/.gitignore](https://github.com/spatialos/PiratesTutorial/blob/master/.gitignore)
117+
118+
2. Delete the following lines from the ignore files:
119+
* `Assets/Plugins/Improbable`
120+
* `Improbable.meta`
121+
* `spatialos.*.build.json`
122+
123+
3. Add the following lines to the ignore files:
124+
* `workers/unity/Assets/Plugins/Improbable/Editor/Generated/`
125+
* `workers/unity/Assets/Plugins/Improbable/Editor/Generated.meta`
126+
* `workers/unity/Assets/Plugins/Improbable/Generated/`
127+
* `workers/unity/Assets/Plugins/Improbable/Generated.meta`
128+
* `workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Generated.Code.*`
129+
130+
You need to do this for every project you migrate.
131+
132+
**Note:** In all our starter projects (including Wizards and Pirates) the version control ignore files are not set as above, so if your project is based on any of these projects, you need to edit the VCS ignore files.
94133

95-
### 4. Check it worked
96-
10. In the root directory of your project, check that the upgrade and migration worked by running:
134+
### 6. Check it worked
135+
In the root directory of your project, check that the upgrade and migration worked by running:
97136
`spatial worker build`.
98137

99138
It’s worked when you see `'spatial build UnityWorker UnityClient' succeeded` (or `'spatial.exe build UnityWorker UnityClient' succeeded`).

0 commit comments

Comments
 (0)