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

Commit 5b8a04d

Browse files
committed
upgraded to SpatialOS 12.1.0
1 parent b8b603b commit 5b8a04d

File tree

10 files changed

+15
-11
lines changed

10 files changed

+15
-11
lines changed

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.0.5",
4+
"sdk_version": "12.1.0",
55
"dependencies": [
6-
{"name": "standard_library", "version": "12.0.5"}
6+
{"name": "standard_library", "version": "12.1.0"}
77
]
88
}

workers/unity/Assets/Standard Assets/Editor/ImageEffects/BloomAndFlaresEditor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public override void OnInspectorGUI () {
7777
// display info text when screen blend mode cannot be used
7878
Camera cam = (target as BloomAndFlares).GetComponent<Camera>();
7979
if (cam != null) {
80-
if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
80+
if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
8181
EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", MessageType.Info);
8282
}
8383
}

workers/unity/Assets/Standard Assets/Editor/ImageEffects/BloomEditor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public override void OnInspectorGUI () {
8585
// display info text when screen blend mode cannot be used
8686
Camera cam = (target as Bloom).GetComponent<Camera>();
8787
if (cam != null) {
88-
if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
88+
if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
8989
EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", MessageType.Info);
9090
}
9191
}

workers/unity/Assets/Standard Assets/Editor/ImageEffects/TonemappingEditor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public override void OnInspectorGUI () {
4242

4343
Camera cam = (target as Tonemapping).GetComponent<Camera>();
4444
if (cam != null) {
45-
if (!cam.hdr) {
45+
if (!cam.allowHDR) {
4646
EditorGUILayout.HelpBox("The camera is not HDR enabled. This will likely break the Tonemapper.", MessageType.Warning);
4747
}
4848
else if (!(target as Tonemapping).validRenderTextureFormat) {

workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void OnRenderImage (RenderTexture source, RenderTexture destination)
106106

107107
doHdr = false;
108108
if (hdr == HDRBloomMode.Auto)
109-
doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent<Camera>().hdr;
109+
doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent<Camera>().allowHDR;
110110
else {
111111
doHdr = hdr == HDRBloomMode.On;
112112
}

workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void OnRenderImage(RenderTexture source, RenderTexture destination)
109109

110110
doHdr = false;
111111
if (hdr == HDRBloomMode.Auto)
112-
doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent<Camera>().hdr;
112+
doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent<Camera>().allowHDR;
113113
else
114114
{
115115
doHdr = hdr == HDRBloomMode.On;

workers/unity/Assets/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void OnRenderImage (RenderTexture source, RenderTexture destination) {
9090
sunShaftsMaterial.SetVector ("_SunThreshold", sunThreshold);
9191

9292
if (!useDepthTexture) {
93-
var format= GetComponent<Camera>().hdr ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default;
93+
var format= GetComponent<Camera>().allowHDR ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default;
9494
RenderTexture tmpBuffer = RenderTexture.GetTemporary (source.width, source.height, 0, format);
9595
RenderTexture.active = tmpBuffer;
9696
GL.ClearWithSkybox (false, GetComponent<Camera>());

workers/unity/Assets/player-build-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"UnityClient": {
1010
"Targets": [
1111
"StandaloneWindows",
12-
"StandaloneOSXIntel64"
12+
"StandaloneOSX"
1313
],
1414
"Assets": "Streaming"
1515
}

workers/unity/ProjectSettings/ProjectSettings.asset

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
--- !u!129 &1
44
PlayerSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 10
6+
serializedVersion: 14
77
productGUID: ee129e300e71f7e44b4616b3c2b3be02
88
AndroidProfiler: 0
9+
AndroidFilterTouchesWhenObscured: 0
910
defaultScreenOrientation: 0
1011
targetDevice: 2
1112
useOnDemandResources: 0
@@ -462,6 +463,9 @@ PlayerSettings:
462463
incrementalIl2cppBuild:
463464
iOS: 0
464465
additionalIl2CppArgs:
466+
scriptingRuntimeVersion: 0
467+
apiCompatibilityLevelPerPlatform:
468+
Standalone: 1
465469
m_RenderingPath: 1
466470
m_MobileRenderingPath: 1
467471
metroPackageName: Client
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
m_EditorVersion: 5.6.0f3
1+
m_EditorVersion: 2017.3.0f3

0 commit comments

Comments
 (0)