Skip to content

Commit

Permalink
Use Unity 5.3 as base for development
Browse files Browse the repository at this point in the history
  • Loading branch information
karl- committed Nov 15, 2016
1 parent e868efe commit 0912349
Show file tree
Hide file tree
Showing 13 changed files with 97 additions and 192 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 14 additions & 60 deletions Assets/GILES/Scenes/Level Editor.unity
Expand Up @@ -13,7 +13,7 @@ SceneSettings:
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 6
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
Expand All @@ -37,12 +37,12 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
--- !u!157 &4
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 6
m_GIWorkflowMode: 1
m_LightmapsMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
Expand All @@ -53,22 +53,17 @@ LightmapSettings:
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 4
serializedVersion: 3
m_Resolution: 1
m_BakeResolution: 50
m_TextureWidth: 1024
m_TextureHeight: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 0
m_CompAOExponentDirect: 0
m_Padding: 2
m_CompAOExponent: 0
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 0
m_DirectLightInLightProbes: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 1024
m_ReflectionCompression: 2
m_LightingDataAsset: {fileID: 0}
Expand Down Expand Up @@ -469,46 +464,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 103420214}
--- !u!1 &137169770
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 4: {fileID: 137169772}
- 114: {fileID: 137169771}
m_Layer: 0
m_Name: Reset Level
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &137169771
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 137169770}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7f9c62f6331a42f4f96aea165e185938, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &137169772
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 137169770}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.99, y: -0.337, z: 0.38}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
--- !u!1 &156461549
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -866,11 +821,11 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 22433108, guid: 48e80190691224640a21e8eb2f307690, type: 2}
propertyPath: m_AnchoredPosition.y
value: -0.000030517578
value: 0
objectReference: {fileID: 0}
- target: {fileID: 22484404, guid: 48e80190691224640a21e8eb2f307690, type: 2}
propertyPath: m_AnchorMin.y
value: 0.4186917
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 48e80190691224640a21e8eb2f307690, type: 2}
Expand Down Expand Up @@ -954,7 +909,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 1
--- !u!1 &355792669
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1209,7 +1164,7 @@ RectTransform:
- {fileID: 802180271}
- {fileID: 1402231888}
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 0
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
Expand Down Expand Up @@ -1242,7 +1197,7 @@ MonoBehaviour:
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 2
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
Expand Down Expand Up @@ -4222,7 +4177,7 @@ Light:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1622885554}
m_Enabled: 1
serializedVersion: 7
serializedVersion: 6
m_Type: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0.5
Expand All @@ -4232,7 +4187,6 @@ Light:
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
Expand All @@ -4245,10 +4199,10 @@ Light:
serializedVersion: 2
m_Bits: 4294967295
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
m_AreaSize: {x: 1, y: 1}
--- !u!4 &1622885556
Transform:
m_ObjectHideFlags: 0
Expand All @@ -4261,7 +4215,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 5
--- !u!1 &1631449135
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -4675,7 +4629,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 22477226, guid: ecddc44b8f1ec4c4abb9fe7c49588c05, type: 2}
propertyPath: m_SizeDelta.y
value: -160
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: ecddc44b8f1ec4c4abb9fe7c49588c05, type: 2}
Expand Down
8 changes: 3 additions & 5 deletions Assets/GILES/Shader/Grid Line.shader
@@ -1,5 +1,3 @@
// Upgrade NOTE: replaced '_Object2World' with 'unity_ObjectToWorld'

Shader "Custom/Grid Line"
{
Properties
Expand All @@ -18,7 +16,7 @@ Shader "Custom/Grid Line"
Blend SrcAlpha OneMinusSrcAlpha
ZWrite Off

Pass
Pass
{
AlphaTest Greater .25

Expand Down Expand Up @@ -54,7 +52,7 @@ Shader "Custom/Grid Line"

o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
o.uv = v.uv;
o.world = mul(unity_ObjectToWorld, v.vertex);
o.world = mul(_Object2World, v.vertex);
o.normal = UnityObjectToWorldNormal(v.normal);

return o;
Expand All @@ -74,4 +72,4 @@ Shader "Custom/Grid Line"
ENDCG
}
}
}
}
57 changes: 38 additions & 19 deletions Assets/Resources/Level Editor Prefabs/Camera.prefab
@@ -1,5 +1,23 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1897008984
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 153238}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5a61987817fbe4b45a87582bcb2be501, type: 3}
m_Name:
m_EditorClassIdentifier:
metadata:
_fileId: abf9a3c3e0f6df64ea24a34b1adc2200
_assetBundlePath:
assetBundleName:
filePath:
_assetType: 0
tags: []
--- !u!1 &153238
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -12,7 +30,8 @@ GameObject:
- 124: {fileID: 12486638}
- 92: {fileID: 9233792}
- 81: {fileID: 8102696}
- 114: {fileID: 114000013665628328}
- 114: {fileID: 11414774}
- 114: {fileID: -1897008984}
m_Layer: 0
m_Name: Camera
m_TagString: Untagged
Expand Down Expand Up @@ -81,6 +100,24 @@ Behaviour:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 153238}
m_Enabled: 1
--- !u!114 &11414774
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 153238}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5a61987817fbe4b45a87582bcb2be501, type: 3}
m_Name:
m_EditorClassIdentifier:
metadata:
_fileId: abf9a3c3e0f6df64ea24a34b1adc2200
_assetBundlePath:
assetBundleName:
filePath:
_assetType: 0
tags: []
--- !u!124 &12486638
Behaviour:
m_ObjectHideFlags: 1
Expand All @@ -99,21 +136,3 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 153238}
m_IsPrefabParent: 1
--- !u!114 &114000013665628328
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 153238}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5a61987817fbe4b45a87582bcb2be501, type: 3}
m_Name:
m_EditorClassIdentifier:
metadata:
_fileId: abf9a3c3e0f6df64ea24a34b1adc2200
_assetBundlePath:
assetBundleName:
filePath:
_assetType: 0
tags: []
7 changes: 2 additions & 5 deletions Assets/Resources/Level Editor Prefabs/Column.prefab
Expand Up @@ -40,20 +40,17 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 1
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
Expand Down
7 changes: 2 additions & 5 deletions Assets/Resources/Level Editor Prefabs/Cube.prefab
Expand Up @@ -40,20 +40,17 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 1
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
Expand Down
7 changes: 2 additions & 5 deletions Assets/Resources/Level Editor Prefabs/Flat.prefab
Expand Up @@ -40,20 +40,17 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 1
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
Expand Down
7 changes: 2 additions & 5 deletions Assets/Resources/Level Editor Prefabs/Hole.prefab
Expand Up @@ -40,20 +40,17 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 1
m_ReflectionProbeUsage: 1
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
Expand Down

0 comments on commit 0912349

Please sign in to comment.