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

Commit 714ac2e

Browse files
author
Morrison Cole
committed
Upgrade to 10.0.0
1 parent d7127aa commit 714ac2e

Some content is hidden

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

47 files changed

+815
-362
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
spatial.log
2-
spatialos_worker_packages.json
32
build/
43
logs/

default_launch.json

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,42 @@
88
"dimensions": {
99
"xMeters": 8000,
1010
"zMeters": 8000
11-
},
12-
"legacyFlags": [
13-
{
14-
"name": "load_snapshot_at_startup",
15-
"value": "true"
16-
},
17-
{
18-
"name": "snapshot_storage_type",
19-
"value": "file"
20-
},
21-
{
22-
"name": "snapshot_source_file",
23-
"value": "snapshots/initial_world.snapshot"
24-
}
25-
]
11+
}
2612
},
2713
"workers": [
28-
{
29-
"worker_type": "UnityFSim",
30-
"load_balancing": {
31-
"static_hex_grid": {
32-
"worker_radius_meters": 2500.0,
33-
"grid_width": 2,
34-
"grid_height": 2
14+
{
15+
"worker_type": "UnityWorker",
16+
"permissions": [
17+
{
18+
"all": {}
19+
}
20+
],
21+
"load_balancing": {
22+
"dynamic_loadbalancer": {
23+
"worker_scaler_config": {
24+
"constant_config": {
25+
"num_workers": 2
26+
}
27+
},
28+
"worker_placer_config": {
29+
"random_params": {}
30+
},
31+
"loadbalancer_config": {
32+
"min_range_meters": 500.0,
33+
"max_range_meters": 5000.0,
34+
"speed_meters_per_second": 100.0,
35+
"expansion_time_millis": 60000
36+
}
3537
}
3638
}
39+
},
40+
{
41+
"worker_type": "UnityClient",
42+
"permissions": [
43+
{
44+
"all": {}
45+
}
46+
]
3747
}
3848
]
3949
}

deploy.json

Lines changed: 0 additions & 46 deletions
This file was deleted.

schema/improbable/player/PlayerLifecycle.schema

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ component PlayerLifecycle {
2424
uint32 player_heartbeat_interval = 3;
2525

2626
// Allow clients to request deletion of their entity when they exit
27-
command DeletePlayerRequest delete_player returns DeletePlayerResponse;
27+
command DeletePlayerResponse delete_player(DeletePlayerRequest);
2828

2929
// Used by clients to indicate they are still connected
30-
command HeartbeatRequest heartbeat returns HeartbeatResponse;
31-
}
30+
command HeartbeatResponse heartbeat(HeartbeatRequest);
31+
}

schema/improbable/player/Spawner.schema

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ component Spawner {
1717
id = 1002;
1818

1919
// Used by clients on connection to request a ship is spawned for the player
20-
command SpawnPlayerRequest spawn_player returns SpawnPlayerResponse;
21-
}
20+
command SpawnPlayerResponse spawn_player(SpawnPlayerRequest);
21+
}

snapshots/default.snapshot

154 Bytes
Binary file not shown.

snapshots/initial_world.snapshot

-154 Bytes
Binary file not shown.

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": "0.0.1",
4-
"sdk_version": "9.1.0",
4+
"sdk_version": "10.0.0",
55
"dependencies": [
6-
{"name": "WorkerSdkSchema", "version": "9.1.0"}
6+
{"name": "WorkerSdkSchema", "version": "10.0.0"}
77
]
88
}
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"tasks": [
3+
{
4+
"name": "Codegen",
5+
"steps": [
6+
{
7+
"name": "Scala",
8+
"arguments": [
9+
"process_schema",
10+
"generate",
11+
"--input=../../schema/",
12+
"--repository=../../build/dependencies/schema/",
13+
"--output=generated",
14+
"--language=scala"
15+
]
16+
}
17+
]
18+
},
19+
{
20+
"name": "Build",
21+
"steps": [
22+
{
23+
"name": "Codegen",
24+
"arguments": [
25+
"invoke-task",
26+
"Codegen"
27+
]
28+
},
29+
{
30+
"name": "scala",
31+
"arguments": [
32+
"invoke",
33+
"sbt",
34+
"workerPackage"
35+
]
36+
}
37+
]
38+
},
39+
{
40+
"name": "Clean",
41+
"steps": [
42+
{
43+
"name": "Scala",
44+
"arguments": [
45+
"invoke",
46+
"sbt",
47+
"clean"
48+
]
49+
},
50+
{
51+
"name": "Generated code",
52+
"arguments": [
53+
"process_schema",
54+
"clean",
55+
"generated"
56+
]
57+
}
58+
]
59+
}
60+
]
61+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"build": {
3-
"tasks_filename": "build.json",
3+
"tasks_filename": "spatialos.gsim.build.json",
44
"generated_build_scripts_type": "gsim"
55
}
66
}

0 commit comments

Comments
 (0)