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

Commit 8246e2a

Browse files
committed
upgraded to SpatialOS 12.0.0
1 parent cdcc241 commit 8246e2a

File tree

6 files changed

+38
-29
lines changed

6 files changed

+38
-29
lines changed

snapshots/default.snapshot

5 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": "1.0.0",
4-
"sdk_version": "11.1.1",
4+
"sdk_version": "12.0.0",
55
"dependencies": [
6-
{"name": "standard_library", "version": "11.1.1"}
6+
{"name": "standard_library", "version": "12.0.0"}
77
]
88
}

workers/unity/Assets/Gamelogic/Core/Bootstrap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public class Bootstrap : MonoBehaviour
1717
// Called when the Play button is pressed in Unity.
1818
public void Start()
1919
{
20-
SceneManager.LoadScene(BuildSettings.SplashScreenScene, LoadSceneMode.Additive);
2120

2221
SpatialOS.ApplyConfiguration(Configuration);
2322

@@ -34,6 +33,7 @@ public void Start()
3433
case WorkerPlatform.UnityClient:
3534
Application.targetFrameRate = SimulationSettings.TargetClientFramerate;
3635
SpatialOS.OnConnected += CreatePlayer;
36+
SceneManager.LoadScene(BuildSettings.SplashScreenScene, LoadSceneMode.Additive);
3737
break;
3838
}
3939
}

workers/unity/Assets/Gamelogic/Pirates/Behaviours/SinkingBehaviour.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ public class SinkingBehaviour : MonoBehaviour
1111
[SerializeField]
1212
private Animation SinkingAnimation;
1313

14-
private GameObject ShipWashVfx;
15-
1614
private void OnEnable()
1715
{
1816
}
@@ -24,10 +22,6 @@ private void OnDisable()
2422
private void VisualiseSinking()
2523
{
2624
SinkingAnimation.Play();
27-
if (ShipWashVfx != null)
28-
{
29-
ShipWashVfx.SetActive(false);
30-
}
3125
}
3226
}
33-
}
27+
}

workers/unity/Assets/Gamelogic/Pirates/Behaviours/TransformReceiver.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Improbable.Core;
33
using Improbable.Unity.Visualizer;
44
using UnityEngine;
5+
using Improbable.Worker;
56

67
namespace Assets.Gamelogic.Pirates.Behaviours
78
{
@@ -39,7 +40,7 @@ void OnPositionUpdated(Position.Update update)
3940
* This synchronises the entity's local representation on the worker with that of the entity on
4041
* whichever worker is authoritative over its Position and is responsible for its movement.
4142
*/
42-
if (!PositionReader.HasAuthority)
43+
if (PositionReader.Authority == Authority.NotAuthoritative)
4344
{
4445
if (update.coords.HasValue)
4546
{
@@ -57,7 +58,7 @@ void OnRotationUpdated(Rotation.Update update)
5758
* This synchronises the entity's local representation on the worker with that of the entity on
5859
* whichever worker is authoritative over its Rotation and is responsible for its movement.
5960
*/
60-
if (!RotationReader.HasAuthority)
61+
if (RotationReader.Authority == Authority.NotAuthoritative)
6162
{
6263
if (update.rotation.HasValue)
6364
{

workers/unity/Assets/UnityClient.unity

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 7
16+
serializedVersion: 8
1717
m_Fog: 0
1818
m_FogColor: {r: 0.43137258, g: 0.6313726, b: 0.75294125, a: 1}
1919
m_FogMode: 3
@@ -25,6 +25,7 @@ RenderSettings:
2525
m_AmbientGroundColor: {r: 0.4433391, g: 0.6386469, b: 0.7352941, a: 1}
2626
m_AmbientIntensity: 1
2727
m_AmbientMode: 1
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
2829
m_SkyboxMaterial: {fileID: 2100000, guid: 925f4e0b7fad9984caa1376cadaaa5ee, type: 2}
2930
m_HaloStrength: 0.5
3031
m_FlareStrength: 1
@@ -41,7 +42,7 @@ RenderSettings:
4142
--- !u!157 &4
4243
LightmapSettings:
4344
m_ObjectHideFlags: 0
44-
serializedVersion: 7
45+
serializedVersion: 9
4546
m_GIWorkflowMode: 1
4647
m_GISettings:
4748
serializedVersion: 2
@@ -53,7 +54,7 @@ LightmapSettings:
5354
m_EnableBakedLightmaps: 0
5455
m_EnableRealtimeLightmaps: 0
5556
m_LightmapEditorSettings:
56-
serializedVersion: 4
57+
serializedVersion: 8
5758
m_Resolution: 1
5859
m_BakeResolution: 50
5960
m_TextureWidth: 1024
@@ -66,13 +67,27 @@ LightmapSettings:
6667
m_LightmapParameters: {fileID: 0}
6768
m_LightmapsBakeMode: 1
6869
m_TextureCompression: 0
69-
m_DirectLightInLightProbes: 1
7070
m_FinalGather: 0
7171
m_FinalGatherFiltering: 1
7272
m_FinalGatherRayCount: 1024
7373
m_ReflectionCompression: 2
74+
m_MixedBakeMode: 1
75+
m_BakeBackend: 0
76+
m_PVRSampling: 1
77+
m_PVRDirectSampleCount: 32
78+
m_PVRSampleCount: 500
79+
m_PVRBounces: 2
80+
m_PVRFiltering: 0
81+
m_PVRFilteringMode: 1
82+
m_PVRCulling: 1
83+
m_PVRFilteringGaussRadiusDirect: 1
84+
m_PVRFilteringGaussRadiusIndirect: 5
85+
m_PVRFilteringGaussRadiusAO: 2
86+
m_PVRFilteringAtrousColorSigma: 1
87+
m_PVRFilteringAtrousNormalSigma: 1
88+
m_PVRFilteringAtrousPositionSigma: 1
7489
m_LightingDataAsset: {fileID: 0}
75-
m_RuntimeCPUUsage: 25
90+
m_ShadowMaskMode: 2
7691
--- !u!196 &5
7792
NavMeshSettings:
7893
serializedVersion: 2
@@ -89,6 +104,8 @@ NavMeshSettings:
89104
minRegionArea: 2
90105
manualCellSize: 0
91106
cellSize: 0.16666666
107+
manualTileSize: 0
108+
tileSize: 256
92109
accuratePlacement: 0
93110
m_NavMeshData: {fileID: 0}
94111
--- !u!1 &316372568
@@ -402,16 +419,6 @@ MonoBehaviour:
402419
m_Script: {fileID: 11500000, guid: 3a2cc0470930c264f9d5dfaaaa9c0ec8, type: 3}
403420
m_Name:
404421
m_EditorClassIdentifier:
405-
waterMode: 2
406-
disablePixelLights: 1
407-
textureSize: 512
408-
clipPlaneOffset: 0.1
409-
reflectLayers:
410-
serializedVersion: 2
411-
m_Bits: 4294967295
412-
refractLayers:
413-
serializedVersion: 2
414-
m_Bits: 4294967295
415422
--- !u!23 &775891228
416423
MeshRenderer:
417424
m_ObjectHideFlags: 0
@@ -442,6 +449,7 @@ MeshRenderer:
442449
m_AutoUVMaxAngle: 89
443450
m_LightmapParameters: {fileID: 0}
444451
m_SortingLayerID: 0
452+
m_SortingLayer: 0
445453
m_SortingOrder: 0
446454
--- !u!33 &775891230
447455
MeshFilter:
@@ -473,7 +481,7 @@ Light:
473481
m_PrefabInternal: {fileID: 0}
474482
m_GameObject: {fileID: 899184180}
475483
m_Enabled: 1
476-
serializedVersion: 7
484+
serializedVersion: 8
477485
m_Type: 1
478486
m_Color: {r: 0.9411765, g: 0.899654, b: 0.899654, a: 1}
479487
m_Intensity: 0.9
@@ -498,6 +506,8 @@ Light:
498506
m_Lightmapping: 4
499507
m_AreaSize: {x: 1, y: 1}
500508
m_BounceIntensity: 1
509+
m_ColorTemperature: 6570
510+
m_UseColorTemperature: 0
501511
m_ShadowRadius: 0
502512
m_ShadowAngle: 0
503513
--- !u!4 &899184182
@@ -574,6 +584,7 @@ MeshRenderer:
574584
m_AutoUVMaxAngle: 89
575585
m_LightmapParameters: {fileID: 0}
576586
m_SortingLayerID: 0
587+
m_SortingLayer: 0
577588
m_SortingOrder: 0
578589
--- !u!64 &905501885
579590
MeshCollider:
@@ -671,6 +682,8 @@ Camera:
671682
m_TargetDisplay: 0
672683
m_TargetEye: 3
673684
m_HDR: 0
685+
m_AllowMSAA: 1
686+
m_ForceIntoRT: 0
674687
m_OcclusionCulling: 1
675688
m_StereoConvergence: 10
676689
m_StereoSeparation: 0.022
@@ -1007,7 +1020,7 @@ Canvas:
10071020
m_PrefabInternal: {fileID: 0}
10081021
m_GameObject: {fileID: 1858188679}
10091022
m_Enabled: 1
1010-
serializedVersion: 2
1023+
serializedVersion: 3
10111024
m_RenderMode: 0
10121025
m_Camera: {fileID: 0}
10131026
m_PlaneDistance: 100
@@ -1016,6 +1029,7 @@ Canvas:
10161029
m_OverrideSorting: 0
10171030
m_OverridePixelPerfect: 0
10181031
m_SortingBucketNormalizedSize: 0
1032+
m_AdditionalShaderChannelsFlag: 25
10191033
m_SortingLayerID: 0
10201034
m_SortingOrder: 0
10211035
m_TargetDisplay: 0

0 commit comments

Comments
 (0)