diff --git a/.gitignore b/.gitignore index a96a1f5..2f8eb62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,62 @@ -# Created by https://www.gitignore.io + +# Created by https://www.gitignore.io/api/unity,windows ### Unity ### -[Ll]ibrary/ -[Tt]emp/ -[Oo]bj/ -[Bb]uild/ - -# Autogenerated VS/MD solution and project files -/*.csproj -/*.unityproj -/*.sln -/*.suo -/*.user -/*.userprefs -/*.pidb -/*.booproj - -#Unity3D Generated File On Crash Reports +/[Ll]ibrary/ +/[Tt]emp/ +/[Oo]bj/ +/[Bb]uild/ +/[Bb]uilds/ +/Assets/AssetStoreTools* + +# Visual Studio 2015 cache directory +/.vs/ + +# Autogenerated VS/MD/Consulo solution and project files +ExportedObj/ +.consulo/ +*.csproj +*.unityproj +*.sln +*.suo +*.tmp +*.user +*.userprefs +*.pidb +*.booproj +*.svd +*.pdb + + +# Unity3D generated meta files +*.pidb.meta + +# Unity3D Generated File On Crash Reports sysinfo.txt -#OS generated -.DS_Store -.DS_Store? -._* -.Spotlight-V100 -.Trashes -ehthumbs.db +# Builds +*.apk +*.unitypackage + +### Windows ### +# Windows thumbnail cache files Thumbs.db -unity.log +ehthumbs.db +ehthumbs_vista.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.gitignore.io/api/unity,windows diff --git a/.travis.yml b/.travis.yml index bc1da25..0626b98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,24 @@ -language: objective-c -osx_image: xcode61 -rvm: -- 2.1.2 +# Source: https://github.com/JonathanPorta/ci-build/tree/master/.travis.yml + +sudo: required +language: generic +os: + - linux + - osx +node_js: + - "6" # needed for Unity on Linux +env: + - PLATFORM=WINDOWS +# - PLATFORM=MACOS +# - PLATFORM=LINUX before_install: -- chmod a+x ./Scripts/install.sh -- chmod a+x ./Scripts/build.sh + - chmod a+x ./Scripts/install.sh + - chmod a+x ./Scripts/build.sh + - chmod a+x ./Scripts/unity_stdout.sh install: -- ./Scripts/install.sh + - ./Scripts/install.sh script: -- ./Scripts/build.sh + - ./Scripts/build.sh deploy: provider: s3 access_key_id: AKIAITEPAI7MBUKSYRMQ diff --git a/Assets/NewBehaviourScript.cs b/Assets/NewBehaviourScript.cs new file mode 100644 index 0000000..1ede95c --- /dev/null +++ b/Assets/NewBehaviourScript.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class NewBehaviourScript : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update() + { + float speed = 1.5f; + + if (Input.GetKey(KeyCode.RightArrow)) + { + transform.Translate(new Vector3(speed * Time.deltaTime, 0, 0)); + } + if (Input.GetKey(KeyCode.LeftArrow)) + { + transform.Translate(new Vector3(-speed * Time.deltaTime, 0, 0)); + } + if (Input.GetKey(KeyCode.DownArrow)) + { + transform.Translate(new Vector3(0, -speed * Time.deltaTime, 0)); + } + if (Input.GetKey(KeyCode.UpArrow)) + { + transform.Translate(new Vector3(0, speed * Time.deltaTime, 0)); + } + } +} diff --git a/Assets/NewBehaviourScript.cs.meta b/Assets/NewBehaviourScript.cs.meta new file mode 100644 index 0000000..825f2b2 --- /dev/null +++ b/Assets/NewBehaviourScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c8cafe32c26683f4b8d3ab6fee4eb583 +timeCreated: 1489931577 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/main.unity b/Assets/main.unity index 5be571c..0841ff9 100644 --- a/Assets/main.unity +++ b/Assets/main.unity @@ -1,32 +1,32 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + serializedVersion: 2 m_OcclusionBakeSettings: smallestOccluder: 5 - smallestHole: .25 + smallestHole: 0.25 backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 7 m_Fog: 0 - m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 - m_FogDensity: .00999999978 + m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} - m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} - m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 0 - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: .5 + m_SkyboxMaterial: {fileID: 10301, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 m_HaloTexture: {fileID: 0} @@ -37,15 +37,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} ---- !u!127 &3 -LevelGameManager: - m_ObjectHideFlags: 0 ---- !u!157 &4 + m_IndirectSpecularColor: {r: 0.29653108, g: 0.29655585, b: 0.29658493, a: 1} +--- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 7 m_GIWorkflowMode: 0 - m_LightmapsMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -53,52 +50,60 @@ LightmapSettings: m_AlbedoBoost: 1 m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 3 + serializedVersion: 4 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 m_TextureHeight: 1024 + m_AO: 0 m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 m_Padding: 2 - m_CompAOExponent: 0 m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 m_TextureCompression: 1 + m_DirectLightInLightProbes: 1 m_FinalGather: 0 - m_FinalGatherRayCount: 1024 - m_LightmapSnapshot: {fileID: 0} + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_LightingDataAsset: {fileID: 0} m_RuntimeCPUUsage: 25 ---- !u!196 &5 +--- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 - agentRadius: .5 + agentTypeID: 0 + agentRadius: 0.5 agentHeight: 2 agentSlope: 45 - agentClimb: .400000006 + agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: .166666672 manualCellSize: 0 + cellSize: 0.16666667 + accuratePlacement: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &1285920232 +--- !u!1 &768013272 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1285920237} - - 20: {fileID: 1285920236} - - 92: {fileID: 1285920235} - - 124: {fileID: 1285920234} - - 81: {fileID: 1285920233} + - component: {fileID: 768013277} + - component: {fileID: 768013276} + - component: {fileID: 768013275} + - component: {fileID: 768013274} + - component: {fileID: 768013273} + - component: {fileID: 768013278} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -106,44 +111,44 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &1285920233 +--- !u!81 &768013273 AudioListener: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1285920232} + m_GameObject: {fileID: 768013272} m_Enabled: 1 ---- !u!124 &1285920234 +--- !u!124 &768013274 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1285920232} + m_GameObject: {fileID: 768013272} m_Enabled: 1 ---- !u!92 &1285920235 +--- !u!92 &768013275 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1285920232} + m_GameObject: {fileID: 768013272} m_Enabled: 1 ---- !u!20 &1285920236 +--- !u!20 &768013276 Camera: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1285920232} + m_GameObject: {fileID: 768013272} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 y: 0 width: 1 height: 1 - near clip plane: .300000012 + near clip plane: 0.3 far clip plane: 1000 field of view: 60 orthographic: 0 @@ -155,48 +160,217 @@ Camera: m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 + m_TargetEye: 3 m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 - m_StereoSeparation: .0219999999 ---- !u!4 &1285920237 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!4 &768013277 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1285920232} + m_GameObject: {fileID: 768013272} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!1 &2138738478 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &768013278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 768013272} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8cafe32c26683f4b8d3ab6fee4eb583, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &812227331 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 812227332} + - component: {fileID: 812227334} + - component: {fileID: 812227333} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &812227332 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 812227331} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2054205171} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &812227333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 812227331} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: test text +--- !u!222 &812227334 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 812227331} +--- !u!1 &940499542 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 2138738480} - - 108: {fileID: 2138738479} + - component: {fileID: 940499546} + - component: {fileID: 940499545} + - component: {fileID: 940499544} + - component: {fileID: 940499543} m_Layer: 0 - m_Name: Directional Light + m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &2138738479 +--- !u!23 &940499543 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 940499542} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!65 &940499544 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 940499542} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &940499545 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 940499542} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &940499546 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 940499542} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1086560137 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1086560139} + - component: {fileID: 1086560138} + m_Layer: 0 + m_Name: Directional light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1086560138 Light: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2138738478} + m_GameObject: {fileID: 1086560137} m_Enabled: 1 - serializedVersion: 6 + serializedVersion: 7 m_Type: 1 - m_Color: {r: 1, g: .956862748, b: .839215696, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -204,9 +378,11 @@ Light: m_Shadows: m_Type: 2 m_Resolution: -1 + m_CustomResolution: -1 m_Strength: 1 - m_Bias: .0500000007 - m_NormalBias: .400000006 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -215,19 +391,113 @@ 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 &2138738480 +--- !u!4 &1086560139 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2138738478} - m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381676, w: .875426054} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_GameObject: {fileID: 1086560137} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &2054205167 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2054205171} + - component: {fileID: 2054205170} + - component: {fileID: 2054205169} + - component: {fileID: 2054205168} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2054205168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2054205167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &2054205169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2054205167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &2054205170 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2054205167} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &2054205171 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2054205167} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 812227332} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} diff --git a/Assets/main.unity.meta b/Assets/main.unity.meta index a3d4d1d..661a1da 100644 --- a/Assets/main.unity.meta +++ b/Assets/main.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: ad53bcd358e182941bfbc795e53a8c43 -timeCreated: 1425951500 +guid: ff2ddb210e81e7b429627a514999b3bc +timeCreated: 1489853536 licenseType: Free DefaultImporter: userData: diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index c7a0ae1..2c4f5a1 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -11,4 +11,6 @@ AudioManager: m_DSPBufferSize: 0 m_VirtualVoiceCount: 512 m_RealVoiceCount: 32 + m_SpatializerPlugin: m_DisableAudio: 0 + m_VirtualizeEffects: 1 diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000..e7886b2 --- /dev/null +++ b/ProjectSettings/ClusterInputManager.asset @@ -0,0 +1,6 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!236 &1 +ClusterInputManager: + m_ObjectHideFlags: 0 + m_Inputs: [] diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index dd3756e..6be6910 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -3,12 +3,16 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - m_Gravity: {x: 0, y: -9.81000042, z: 0} + serializedVersion: 3 + m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 - m_SleepThreshold: .00499999989 - m_DefaultContactOffset: .00999999978 - m_SolverIterationCount: 6 - m_RaycastsHitTriggers: 1 + m_SleepThreshold: 0.005 + m_DefaultContactOffset: 0.01 + m_DefaultSolverIterations: 6 + m_DefaultSolverVelocityIterations: 1 + m_QueriesHitBackfaces: 0 + m_QueriesHitTriggers: 1 m_EnableAdaptiveForce: 0 + m_EnablePCM: 1 m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 303edf7..7dff13c 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -6,7 +6,9 @@ EditorSettings: serializedVersion: 3 m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 - m_WebSecurityEmulationEnabled: 0 - m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d m_DefaultBehaviorMode: 0 m_SpritePackerMode: 2 + m_SpritePackerPaddingPower: 1 + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_ProjectGenerationRootNamespace: + m_UserGeneratedProjectSuffix: diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 280a9fd..0502153 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,27 +3,62 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 3 + serializedVersion: 9 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_DeferredReflections: + m_Mode: 1 + m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} + m_ScreenSpaceShadows: + m_Mode: 1 + m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} m_LegacyDeferred: m_Mode: 1 m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} + m_DepthNormals: + m_Mode: 1 + m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + m_MotionVectors: + m_Mode: 1 + m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + m_LightHalo: + m_Mode: 1 + m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} + m_LensFlare: + m_Mode: 1 + m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, + type: 0} + m_TierSettings_Tier1: + renderingPath: 1 + useCascadedShadowMaps: 1 + m_TierSettings_Tier2: + renderingPath: 1 + useCascadedShadowMaps: 1 + m_TierSettings_Tier3: + renderingPath: 1 + useCascadedShadowMaps: 1 + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] m_LightmapStripping: 0 + m_FogStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 m_LightmapKeepDirSeparate: 1 - m_LightmapKeepDynamic: 1 - m_FogStripping: 0 + m_LightmapKeepDynamicPlain: 1 + m_LightmapKeepDynamicDirCombined: 1 + m_LightmapKeepDynamicDirSeparate: 1 m_FogKeepLinear: 1 m_FogKeepExp: 1 m_FogKeepExp2: 1 diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 0a69793..17c8f53 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -14,7 +14,7 @@ InputManager: altNegativeButton: a altPositiveButton: d gravity: 3 - dead: .00100000005 + dead: 0.001 sensitivity: 3 snap: 1 invert: 0 @@ -30,7 +30,7 @@ InputManager: altNegativeButton: s altPositiveButton: w gravity: 3 - dead: .00100000005 + dead: 0.001 sensitivity: 3 snap: 1 invert: 0 @@ -46,7 +46,7 @@ InputManager: altNegativeButton: altPositiveButton: mouse 0 gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -62,7 +62,7 @@ InputManager: altNegativeButton: altPositiveButton: mouse 1 gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -74,11 +74,11 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: left cmd + positiveButton: left shift altNegativeButton: altPositiveButton: mouse 2 gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -94,7 +94,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -111,7 +111,7 @@ InputManager: altPositiveButton: gravity: 0 dead: 0 - sensitivity: .100000001 + sensitivity: 0.1 snap: 0 invert: 0 type: 1 @@ -127,7 +127,7 @@ InputManager: altPositiveButton: gravity: 0 dead: 0 - sensitivity: .100000001 + sensitivity: 0.1 snap: 0 invert: 0 type: 1 @@ -143,7 +143,7 @@ InputManager: altPositiveButton: gravity: 0 dead: 0 - sensitivity: .100000001 + sensitivity: 0.1 snap: 0 invert: 0 type: 1 @@ -158,7 +158,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 0 - dead: .189999998 + dead: 0.19 sensitivity: 1 snap: 0 invert: 0 @@ -174,7 +174,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 0 - dead: .189999998 + dead: 0.19 sensitivity: 1 snap: 0 invert: 1 @@ -190,7 +190,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -206,7 +206,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -222,7 +222,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -238,7 +238,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -254,7 +254,7 @@ InputManager: altNegativeButton: altPositiveButton: joystick button 0 gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -270,7 +270,7 @@ InputManager: altNegativeButton: altPositiveButton: space gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -286,7 +286,7 @@ InputManager: altNegativeButton: altPositiveButton: joystick button 1 gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset index a04f35c..3a99a5a 100644 --- a/ProjectSettings/NavMeshAreas.asset +++ b/ProjectSettings/NavMeshAreas.asset @@ -1,7 +1,7 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!126 &1 -NavMeshAreas: +NavMeshProjectSettings: m_ObjectHideFlags: 0 serializedVersion: 2 areas: diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index 5418c58..dd4738c 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -3,22 +3,32 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - m_Gravity: {x: 0, y: -9.81000042} + serializedVersion: 2 + m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 m_PositionIterations: 3 m_VelocityThreshold: 1 - m_MaxLinearCorrection: .200000003 + m_MaxLinearCorrection: 0.2 m_MaxAngularCorrection: 8 m_MaxTranslationSpeed: 100 m_MaxRotationSpeed: 360 - m_MinPenetrationForPenalty: .00999999978 - m_BaumgarteScale: .200000003 - m_BaumgarteTimeOfImpactScale: .75 - m_TimeToSleep: .5 - m_LinearSleepTolerance: .00999999978 + m_MinPenetrationForPenalty: 0.01 + m_BaumgarteScale: 0.2 + m_BaumgarteTimeOfImpactScale: 0.75 + m_TimeToSleep: 0.5 + m_LinearSleepTolerance: 0.01 m_AngularSleepTolerance: 2 - m_RaycastsHitTriggers: 1 - m_RaycastsStartInColliders: 1 + m_QueriesHitTriggers: 1 + m_QueriesStartInColliders: 1 m_ChangeStopsCallbacks: 0 + m_AlwaysShowColliders: 0 + m_ShowColliderSleep: 1 + m_ShowColliderContacts: 0 + m_ShowColliderAABB: 0 + m_ContactArrowScale: 0.2 + m_ColliderAwakeColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.7529412} + m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} + m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} + m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 281344d..7a643fe 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,34 +3,60 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 10 + productGUID: dd3506a4cc8f7d14391ee5dfd385ba3c AndroidProfiler: 0 defaultScreenOrientation: 4 targetDevice: 2 - targetGlesGraphics: -1 - targetIOSGraphics: -1 - targetResolution: 0 + useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: ci-build - cloudProjectId: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} + m_SplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21176471, a: 1} + m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashLogo: 1 + m_SplashScreenOverlayOpacity: 1 + m_SplashScreenAnimation: 1 + m_SplashScreenLogoStyle: 1 + m_SplashScreenDrawMode: 0 + m_SplashScreenBackgroundAnimationZoom: 1 + m_SplashScreenLogoAnimationZoom: 1 + m_SplashScreenBackgroundLandscapeAspect: 1 + m_SplashScreenBackgroundPortraitAspect: 1 + m_SplashScreenBackgroundLandscapeUvs: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + m_SplashScreenBackgroundPortraitUvs: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + m_SplashScreenLogos: [] + m_SplashScreenBackgroundLandscape: {fileID: 0} + m_SplashScreenBackgroundPortrait: {fileID: 0} + m_VirtualRealitySplashScreen: {fileID: 0} + m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 defaultScreenHeight: 768 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 - m_RenderingPath: 1 - m_MobileRenderingPath: 1 + m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 m_MobileMTRendering: 0 - m_UseDX11: 1 - m_Stereoscopic3D: 0 + m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 + tizenShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 + iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -42,7 +68,7 @@ PlayerSettings: defaultIsNativeResolution: 1 runInBackground: 0 captureSingleScreen: 0 - Override IPod Music: 0 + muteOtherAudioSources: 0 Prepare IOS For Recording: 0 submitAnalytics: 1 usePlayerLog: 1 @@ -51,23 +77,42 @@ PlayerSettings: resizableWindow: 0 useMacAppStoreValidation: 0 gpuSkinning: 0 + graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 xboxEnableKinectAutoTracking: 0 xboxEnableFitness: 0 visibleInBackground: 0 + allowFullscreenSwitch: 1 + graphicsJobMode: 0 macFullscreenMode: 2 d3d9FullscreenMode: 1 d3d11FullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 + xboxEnablePIXSampling: 0 + n3dsDisableStereoscopicView: 0 + n3dsEnableSharedListOpt: 1 + n3dsEnableVSync: 0 + uiUse16BitDepthBuffer: 0 + ignoreAlphaClear: 0 xboxOneResolution: 0 - ps3SplashScreen: {fileID: 0} + xboxOneMonoLoggingLevel: 0 + xboxOneLoggingLevel: 1 videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 + wiiUTVResolution: 0 + wiiUGamePadMSAA: 1 + wiiUSupportsNunchuk: 0 + wiiUSupportsClassicController: 0 + wiiUSupportsBalanceBoard: 0 + wiiUSupportsMotionPlus: 0 + wiiUSupportsProController: 0 + wiiUAllowScreenCapture: 1 + wiiUControllerCount: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -77,27 +122,36 @@ PlayerSettings: bundleIdentifier: com.Company.ProductName bundleVersion: 1.0 preloadedAssets: [] - metroEnableIndependentInputSource: 0 - metroEnableLowLatencyPresentationAPI: 0 + metroInputSource: 0 + m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 - productGUID: 50f5ca587430b4a47bd3192ab7c47239 + protectGraphicsMemory: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 AndroidPreferredInstallLocation: 1 aotOptions: apiCompatibilityLevel: 2 + stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 + iPhoneBuildNumber: 0 ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 preloadShaders: 0 StripUnusedMeshComponents: 0 + VertexChannelCompressionMask: + serializedVersion: 2 + m_Bits: 238 iPhoneSdkVersion: 988 - iPhoneTargetOSVersion: 22 + iOSTargetOSVersionString: + tvOSSdkVersion: 0 + tvOSRequireExtendedGameController: 0 + tvOSTargetOSVersionString: uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 + uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 @@ -111,16 +165,39 @@ PlayerSettings: iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + appleTVSplashScreen: {fileID: 0} + tvOSSmallIconLayers: [] + tvOSLargeIconLayers: [] + tvOSTopShelfImageLayers: [] + tvOSTopShelfImageWideLayers: [] iOSLaunchScreenType: 0 iOSLaunchScreenPortrait: {fileID: 0} iOSLaunchScreenLandscape: {fileID: 0} iOSLaunchScreenBackgroundColor: serializedVersion: 2 rgba: 0 - iOSLaunchScreenFillPct: 1 + iOSLaunchScreenFillPct: 100 + iOSLaunchScreenSize: 100 iOSLaunchScreenCustomXibPath: + iOSLaunchScreeniPadType: 0 + iOSLaunchScreeniPadImage: {fileID: 0} + iOSLaunchScreeniPadBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreeniPadFillPct: 100 + iOSLaunchScreeniPadSize: 100 + iOSLaunchScreeniPadCustomXibPath: + iOSDeviceRequirements: [] + iOSURLSchemes: [] + iOSBackgroundModes: 0 + iOSMetalForceHardShadows: 0 + appleDeveloperTeamID: + iOSManualSigningProvisioningProfileID: + tvOSManualSigningProvisioningProfileID: + appleEnableAutomaticSigning: 0 AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 + androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidTVCompatibility: 1 @@ -130,16 +207,41 @@ PlayerSettings: - width: 320 height: 180 banner: {fileID: 0} + androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetBatching: [] + m_BuildTargetGraphicsAPIs: [] + m_BuildTargetVRSettings: [] + openGLRequireES31: 0 + openGLRequireES31AEP: 0 webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} + wiiUTitleID: 0005000011000000 + wiiUGroupID: 00010000 + wiiUCommonSaveSize: 4096 + wiiUAccountSaveSize: 2048 + wiiUOlvAccessKey: 0 + wiiUTinCode: 0 + wiiUJoinGameId: 0 + wiiUJoinGameModeMask: 0000000000000000 + wiiUCommonBossSize: 0 + wiiUAccountBossSize: 0 + wiiUAddOnUniqueIDs: [] + wiiUMainThreadStackSize: 3072 + wiiULoaderThreadStackSize: 1024 + wiiUSystemHeapSize: 128 + wiiUTVStartupScreen: {fileID: 0} + wiiUGamePadStartupScreen: {fileID: 0} + wiiUDrcBufferDisabled: 0 + wiiUProfilerLibPath: actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 + cameraUsageDescription: locationUsageDescription: + microphoneUsageDescription: XboxTitleId: XboxImageXexPath: XboxSpaPath: @@ -150,24 +252,6 @@ PlayerSettings: xboxAdditionalTitleMemorySize: 0 xboxDeployKinectHeadOrientation: 0 xboxDeployKinectHeadPosition: 0 - ps3TitleConfigPath: - ps3DLCConfigPath: - ps3ThumbnailPath: - ps3BackgroundPath: - ps3SoundPath: - ps3NPAgeRating: 12 - ps3TrophyCommId: - ps3NpCommunicationPassphrase: - ps3TrophyPackagePath: - ps3BootCheckMaxSaveGameSizeKB: 128 - ps3TrophyCommSig: - ps3SaveGameSlots: 1 - ps3TrialMode: 0 - ps3VideoMemoryForAudio: 0 - ps3EnableVerboseMemoryStats: 0 - ps3UseSPUForUmbra: 0 - ps3EnableMoveSupport: 1 - ps3DisableDolbyEncoding: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -179,32 +263,66 @@ PlayerSettings: ps4AppType: 0 ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 - ps4VideoOutResolution: 4 + ps4VideoOutInitialWidth: 1920 + ps4VideoOutBaseModeInitialWidth: 1920 + ps4VideoOutReprojectionRate: 120 ps4PronunciationXMLPath: ps4PronunciationSIGPath: ps4BackgroundImagePath: ps4StartupImagePath: ps4SaveDataImagePath: + ps4SdkOverride: ps4BGMPath: ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 + ps4RemotePlayKeyMappingDir: + ps4PlayTogetherPlayerCount: 0 ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 ps4ApplicationParam2: 0 ps4ApplicationParam3: 0 ps4ApplicationParam4: 0 + ps4DownloadDataSize: 0 + ps4GarlicHeapSize: 2048 + ps4ProGarlicHeapSize: 2560 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ + ps4UseDebugIl2cppLibs: 0 ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 + restrictedAudioUsageRights: 0 + ps4UseResolutionFallback: 0 + ps4ReprojectionSupport: 0 + ps4UseAudio3dBackend: 0 + ps4SocialScreenEnabled: 0 + ps4ScriptOptimizationLevel: 3 + ps4Audio3dVirtualSpeakerCount: 14 + ps4attribCpuUsage: 0 + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: + ps4PatchDayOne: 0 + ps4attribUserManagement: 0 + ps4attribMoveSupport: 0 + ps4attrib3DSupport: 0 + ps4attribShareSupport: 0 + ps4attribExclusiveVR: 0 + ps4disableAutoHideSplash: 0 + ps4videoRecordingFeaturesUsed: 0 + ps4contentSearchFeaturesUsed: 0 + ps4attribEyeToEyeDistanceSettingVR: 0 + ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} psp2NPTrophyPackPath: psp2NPSupportGBMorGJP: 0 psp2NPAgeRating: 12 + psp2NPTitleDatPath: psp2NPCommsID: psp2NPCommunicationsID: psp2NPCommsPassphrase: @@ -219,6 +337,7 @@ PlayerSettings: psp2PatchOriginalPackage: psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui psp2KeystoneFile: + psp2MemoryExpansionMode: 0 psp2DRMType: 0 psp2StorageType: 0 psp2MediaCapacity: 0 @@ -245,14 +364,30 @@ PlayerSettings: psp2UseLibLocation: 0 psp2InfoBarOnStartup: 0 psp2InfoBarColor: 0 + psp2UseDebugIl2cppLibs: 0 psmSplashimage: {fileID: 0} + splashScreenBackgroundSourceLandscape: {fileID: 0} + splashScreenBackgroundSourcePortrait: {fileID: 0} spritePackerPolicy: + webGLMemorySize: 256 + webGLExceptionSupport: 1 + webGLDataCaching: 0 + webGLDebugSymbols: 0 + webGLEmscriptenArgs: + webGLModulesDirectory: + webGLTemplate: APPLICATION:Default + webGLAnalyzeBuildSize: 0 + webGLUseEmbeddedResources: 0 + webGLUseWasm: 0 + webGLCompressionFormat: 1 scriptingDefineSymbols: {} + platformArchitecture: {} + scriptingBackend: {} + incrementalIl2cppBuild: {} + additionalIl2CppArgs: + m_RenderingPath: 1 + m_MobileRenderingPath: 1 metroPackageName: ci-build - metroPackageLogo: - metroPackageLogo140: - metroPackageLogo180: - metroPackageLogo240: metroPackageVersion: metroCertificatePath: metroCertificatePassword: @@ -260,44 +395,7 @@ PlayerSettings: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: ci-build - metroStoreTileLogo80: - metroStoreTileLogo: - metroStoreTileLogo140: - metroStoreTileLogo180: - metroStoreTileWideLogo80: - metroStoreTileWideLogo: - metroStoreTileWideLogo140: - metroStoreTileWideLogo180: - metroStoreTileSmallLogo80: - metroStoreTileSmallLogo: - metroStoreTileSmallLogo140: - metroStoreTileSmallLogo180: - metroStoreSmallTile80: - metroStoreSmallTile: - metroStoreSmallTile140: - metroStoreSmallTile180: - metroStoreLargeTile80: - metroStoreLargeTile: - metroStoreLargeTile140: - metroStoreLargeTile180: - metroStoreSplashScreenImage: - metroStoreSplashScreenImage140: - metroStoreSplashScreenImage180: - metroPhoneAppIcon: - metroPhoneAppIcon140: - metroPhoneAppIcon240: - metroPhoneSmallTile: - metroPhoneSmallTile140: - metroPhoneSmallTile240: - metroPhoneMediumTile: - metroPhoneMediumTile140: - metroPhoneMediumTile240: - metroPhoneWideTile: - metroPhoneWideTile140: - metroPhoneWideTile240: - metroPhoneSplashScreenImage: - metroPhoneSplashScreenImage140: - metroPhoneSplashScreenImage240: + wsaImages: {} metroTileShortName: metroCommandLineArgsFile: metroTileShowName: 0 @@ -305,39 +403,35 @@ PlayerSettings: metroLargeTileShowName: 0 metroWideTileShowName: 0 metroDefaultTileSize: 1 - metroTileForegroundText: 1 - metroTileBackgroundColor: {r: 0, g: 0, b: 0, a: 1} - metroSplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} + metroTileForegroundText: 2 + metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} + metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, + a: 1} metroSplashScreenUseBackgroundColor: 0 platformCapabilities: {} metroFTAName: metroFTAFileTypes: [] metroProtocolName: metroCompilationOverrides: 1 - blackberryDeviceAddress: - blackberryDevicePassword: - blackberryTokenPath: - blackberryTokenExires: - blackberryTokenAuthor: - blackberryTokenAuthorId: - blackberryCskPassword: - blackberrySaveLogPath: - blackberrySharedPermissions: 0 - blackberryCameraPermissions: 0 - blackberryGPSPermissions: 0 - blackberryDeviceIDPermissions: 0 - blackberryMicrophonePermissions: 0 - blackberryGamepadSupport: 0 - blackberryBuildId: 0 - blackberryLandscapeSplashScreen: {fileID: 0} - blackberryPortraitSplashScreen: {fileID: 0} - blackberrySquareSplashScreen: {fileID: 0} tizenProductDescription: tizenProductURL: - tizenCertificatePath: - tizenCertificatePassword: + tizenSigningProfileName: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 + tizenDeploymentTarget: + tizenDeploymentTargetType: -1 + tizenMinOSVersion: 1 + n3dsUseExtSaveData: 0 + n3dsCompressStaticMem: 1 + n3dsExtSaveDataNumber: 0x12345 + n3dsStackSize: 131072 + n3dsTargetPlatform: 2 + n3dsRegion: 7 + n3dsMediaSize: 0 + n3dsLogoStyle: 3 + n3dsTitle: GameName + n3dsProductCode: + n3dsApplicationId: 0xFF3FF stvDeviceAddress: stvProductDescription: stvProductAuthor: @@ -354,38 +448,21 @@ PlayerSettings: XboxOnePackagingOverridePath: XboxOneAppManifestOverridePath: XboxOnePackageEncryption: 0 + XboxOnePackageUpdateGranularity: 2 XboxOneDescription: + XboxOneLanguage: + - enus + XboxOneCapability: [] + XboxOneGameRating: {} XboxOneIsContentPackage: 0 XboxOneEnableGPUVariability: 0 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 - intPropertyNames: - - Metro::ScriptingBackend - - WP8::ScriptingBackend - - WebGL::ScriptingBackend - - WebGL::audioCompressionFormat - - WebGL::exceptionSupport - - WebGL::memorySize - - iOS::Architecture - - iOS::ScriptingBackend - Metro::ScriptingBackend: 2 - WP8::ScriptingBackend: 2 - WebGL::ScriptingBackend: 1 - WebGL::audioCompressionFormat: 4 - WebGL::exceptionSupport: 0 - WebGL::memorySize: 256 - iOS::Architecture: 2 - iOS::ScriptingBackend: 0 - boolPropertyNames: - - WebGL::dataCaching - - XboxOne::enus - WebGL::dataCaching: 0 - XboxOne::enus: 1 - stringPropertyNames: - - WebGL::emscriptenArgs - - WebGL::template - WebGL::emscriptenArgs: - WebGL::template: APPLICATION:Default - firstStreamedLevelWithResources: 0 + vrEditorSettings: {} + cloudServicesEnabled: {} + cloudProjectId: + projectName: + organizationId: + cloudEnabled: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index b0ac510..1049cc7 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 5.0.0f4 -m_StandardAssetsVersion: 0 +m_EditorVersion: 5.5.2f1 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 60b0053..0d9af3e 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -14,8 +14,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 15 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 1 textureQuality: 1 anisotropicTextures: 0 @@ -25,9 +26,11 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 - lodBias: .300000012 + lodBias: 0.3 maximumLODLevel: 0 particleRaycastBudget: 4 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Fast @@ -37,8 +40,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 20 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 2 textureQuality: 0 anisotropicTextures: 0 @@ -48,9 +52,11 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 - lodBias: .400000006 + lodBias: 0.4 maximumLODLevel: 0 particleRaycastBudget: 16 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Simple @@ -60,8 +66,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 20 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 2 textureQuality: 0 anisotropicTextures: 1 @@ -70,10 +77,12 @@ QualitySettings: softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: .699999988 + vSyncCount: 1 + lodBias: 0.7 maximumLODLevel: 0 particleRaycastBudget: 64 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Good @@ -83,8 +92,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 2 shadowDistance: 40 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 2 textureQuality: 0 anisotropicTextures: 1 @@ -97,6 +107,8 @@ QualitySettings: lodBias: 1 maximumLODLevel: 0 particleRaycastBudget: 256 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Beautiful @@ -106,8 +118,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 2 shadowDistance: 70 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 4 textureQuality: 0 anisotropicTextures: 2 @@ -120,6 +133,8 @@ QualitySettings: lodBias: 1.5 maximumLODLevel: 0 particleRaycastBudget: 1024 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Fantastic @@ -129,8 +144,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 4 shadowDistance: 150 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 4 textureQuality: 0 anisotropicTextures: 2 @@ -143,22 +159,22 @@ QualitySettings: lodBias: 2 maximumLODLevel: 0 particleRaycastBudget: 4096 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 2 - BlackBerry: 2 - GLES Emulation: 5 - PS3: 5 + Nintendo 3DS: 5 PS4: 5 PSM: 5 - PSP2: 5 + PSP2: 2 Samsung TV: 2 Standalone: 5 Tizen: 2 - WP8: 5 Web: 5 WebGL: 3 + WiiU: 5 Windows Store Apps: 5 - XBOX360: 5 XboxOne: 5 iPhone: 2 + tvOS: 5 diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index f0e494b..558a017 100644 --- a/ProjectSettings/TimeManager.asset +++ b/ProjectSettings/TimeManager.asset @@ -3,6 +3,7 @@ --- !u!5 &1 TimeManager: m_ObjectHideFlags: 0 - Fixed Timestep: .0199999996 - Maximum Allowed Timestep: .333333343 + Fixed Timestep: 0.02 + Maximum Allowed Timestep: 0.33333334 m_TimeScale: 1 + Maximum Particle Timestep: 0.03 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset new file mode 100644 index 0000000..2943e44 --- /dev/null +++ b/ProjectSettings/UnityConnectSettings.asset @@ -0,0 +1,29 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!310 &1 +UnityConnectSettings: + m_ObjectHideFlags: 0 + m_Enabled: 0 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: + CrashReportingSettings: + m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes + m_Enabled: 0 + m_CaptureEditorExceptions: 1 + UnityPurchasingSettings: + m_Enabled: 0 + m_TestMode: 0 + UnityAnalyticsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: + UnityAdsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_EnabledPlatforms: 4294967295 + m_IosGameId: + m_AndroidGameId: diff --git a/Scripts/build.sh b/Scripts/build.sh index d577f82..899d2fd 100755 --- a/Scripts/build.sh +++ b/Scripts/build.sh @@ -1,36 +1,52 @@ -#! /bin/sh +#!/bin/bash +# Source: https://github.com/JonathanPorta/ci-build/tree/master/Scripts/build.sh -project="ci-build" +echo 'ping' +ping -c 4 core.cloud.unity3d.com -echo "Attempting to build $project for Windows" -/Applications/Unity/Unity.app/Contents/MacOS/Unity \ - -batchmode \ - -nographics \ - -silent-crashes \ - -logFile $(pwd)/unity.log \ - -projectPath $(pwd) \ - -buildWindowsPlayer "$(pwd)/Build/windows/$project.exe" \ - -quit +echo "Download unity package list" +curl -X GET 'https://core.cloud.unity3d.com/api/login' -v -echo "Attempting to build $project for OS X" -/Applications/Unity/Unity.app/Contents/MacOS/Unity \ - -batchmode \ - -nographics \ - -silent-crashes \ - -logFile $(pwd)/unity.log \ - -projectPath $(pwd) \ - -buildOSXUniversalPlayer "$(pwd)/Build/osx/$project.app" \ - -quit +project="ci-build" -echo "Attempting to build $project for Linux" -/Applications/Unity/Unity.app/Contents/MacOS/Unity \ - -batchmode \ - -nographics \ - -silent-crashes \ - -logFile $(pwd)/unity.log \ - -projectPath $(pwd) \ - -buildLinuxUniversalPlayer "$(pwd)/Build/linux/$project.exe" \ - -quit +if [[ $PLATFORM == "WINDOWS" ]]; then + echo "travis_fold:start:build_windows" + echo "Attempting to build $project for Windows" + ./Scripts/unity_stdout.sh \ + -batchmode \ + -nographics \ + -silent-crashes \ + -projectPath $(pwd) \ + -buildWindowsPlayer "$(pwd)/Build/windows/$project.exe" \ + -quit + exitcode="$?" + echo "travis_fold:end:build_windows" +elif [[ $PLATFORM == "MACOS" ]]; then + echo "travis_fold:start:build_macos" + echo "Attempting to build $project for macOS" + ./Scripts/unity_stdout.sh \ + -batchmode \ + -nographics \ + -silent-crashes \ + -projectPath $(pwd) \ + -buildOSXUniversalPlayer "$(pwd)/Build/osx/$project.app" \ + -quit + exitcode="$?" + echo "travis_fold:end:build_macos" +elif [[ $PLATFORM == "LINUX" ]]; then + echo "travis_fold:start:build_linux" + echo "Attempting to build $project for Linux" + ./Scripts/unity_stdout.sh \ + -batchmode \ + -username $unity_username \ + -password $unity_password \ + -force-opengl \ + -silent-crashes \ + -projectPath $(pwd) \ + -buildLinuxUniversalPlayer "$(pwd)/Build/linux/$project" \ + -quit + exitcode="$?" + echo "travis_fold:end:build_linux" +fi -echo 'Logs from build' -cat $(pwd)/unity.log +exit "$exitcode" diff --git a/Scripts/install.sh b/Scripts/install.sh index f872c74..a96589c 100755 --- a/Scripts/install.sh +++ b/Scripts/install.sh @@ -1,8 +1,15 @@ -#! /bin/sh +#!/bin/bash +# Source: https://github.com/JonathanPorta/ci-build/tree/master/Scripts/install.sh +# Release details and list of available packages as of 2/24/17: +# - http://download.unity3d.com/download_unity/3829d7f588f3/unity-5.5.2f1-osx.ini +# - http://download.unity3d.com/download_unity/3829d7f588f3/unity-5.5.2f1-win.ini +# - also at $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini +# Thanks to vergenzt for find this info. Writeup here: https://github.com/JonathanPorta/ci-build/pull/3#issue-132893904 +# More manual install details at https://docs.unity3d.com/Manual/InstallingUnity.html BASE_URL=http://netstorage.unity3d.com/unity -HASH=649f48bbbf0f -VERSION=5.4.1f1 +HASH=3829d7f588f3 +VERSION=5.5.2f1 download() { file=$1 @@ -17,14 +24,46 @@ install() { download "$package" echo "Installing "`basename "$package"` - sudo installer -dumplog -package `basename "$package"` -target / + if [[ $TRAVIS_OS_NAME == "osx" ]]; then + sudo installer -dumplog -package `basename "$package"` -target / + else # assume installing windows package + eval ./`basename "$package"` /S + fi } -# See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list -# of available packages, where PLATFORM is `osx` or `win` +if [[ $TRAVIS_OS_NAME == "osx" ]]; then + echo 'Installing Unity on macOS' -install "MacEditorInstaller/Unity-$VERSION.pkg" -install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" -install "MacEditorTargetInstaller/UnitySetup-Mac-Support-for-Editor-$VERSION.pkg" -install "MacEditorTargetInstaller/UnitySetup-Linux-Support-for-Editor-$VERSION.pkg" + if [[ -d "/Applications/Unity/Unity.app" ]]; then + echo 'Already installed' + else + install "MacEditorInstaller/Unity.pkg" + install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg" + install "MacEditorTargetInstaller/UnitySetup-Linux-Support-for-Editor-$VERSION.pkg" + fi +elif [[ $APPVEYOR == "True" ]]; then + echo 'Installing Unity on Windows' + install "Windows64EditorInstaller/UnitySetup64.exe" + install "TargetSupportInstaller/UnitySetup-Linux-Support-for-Editor-$VERSION.exe" + install "TargetSupportInstaller/UnitySetup-Mac-Support-for-Editor-$VERSION.exe" +elif [[ $TRAVIS_OS_NAME == "linux" ]]; then + # Linux install is a bit different + # latest Linux Unity details can be found at https://forum.unity3d.com/threads/unity-on-linux-release-notes-and-known-issues.350256/ + echo 'Installing Unity on Linux' + + echo "travis_fold:start:install_unity" + echo 'Installing Unity' + curl -o unity.deb http://beta.unity3d.com/download/b9488c3b1f9f/unity-editor_amd64-5.6.0xb10Linux.deb + sudo dpkg -i unity.deb + echo "travis_fold:end:install_unity" + + # from http://askubuntu.com/a/841240/310789 + echo "travis_fold:start:install_missing_dependencies" + echo 'Installing missing dependencies' + sudo apt-get install -f + echo "travis_fold:end:install_missing_dependencies" +else + echo 'Unsupported OS' + exit -1 +fi diff --git a/Scripts/unity_stdout.sh b/Scripts/unity_stdout.sh new file mode 100644 index 0000000..7a4e9b5 --- /dev/null +++ b/Scripts/unity_stdout.sh @@ -0,0 +1,74 @@ +#!/bin/bash +# Source: https://github.com/JonathanPorta/ci-build/tree/master/Scripts/unity_stdout.sh + +# Display Unity stdout on command line +# Run using normal options from https://docs.unity3d.com/Manual/CommandLineArguments.html like +# ./unity_stdout.sh -batchmode -quit -projectPath \"$(pwd)\" -buildWindows64Player \"build.exe\" +# Initial idea from http://answers.unity3d.com/questions/19566/command-line-feedback.html#answer-155941 + +unity_windows=/c/Program\ Files/Unity/Editor/Unity.exe +unity_mac=/Applications/Unity/Unity.app/Contents/MacOS/Unity +unity_linux=/opt/Unity/Editor/Unity + +# if UNITY not set via environment variable, set it +if [ -z ${UNITY+x} ]; then + if hash unity 2>/dev/null; then # if unity command found, use that + UNITY=unity + onpath=true + else + if [[ -f "$unity_mac" ]]; then + UNITY=$unity_mac + elif [[ -f "$unity_windows" ]]; then + UNITY=$unity_windows + else + UNITY=$unity_linux + fi + fi +else + setviaenv=true +fi + +# try to remove quotes from variable - needed if environment variable set using quotes +unitytemp=`eval printf $UNITY` + +# if unitytemp still contains Unity file set it as path +# convert to lowercase before check +if [[ ${unitytemp,,} == *"unity"* ]]; then + UNITY=$unitytemp +fi + +if [[ ! -f "$UNITY" ]] && [[ $onpath != "true" ]]; then + if [[ $setviaenv == "true" ]]; then + echo "Unity does not exist at '$UNITY'" + else + echo "Unity does not exist at '$unity_windows', '$unity_mac', or '$unity_linux'" + fi + echo "Set via UNITY environment variable (e.g. export UNITY=/path/to/Unity.exe)" + exit -1 +fi + +# if /dev/stdout is symlink use that for output otherwise use tail method +if [[ -L /dev/stdout ]]; then + echo "Using /dev/stdout" + sudo $UNITY $@ -logFile /dev/stdout + exitcode="$?" +else + # tail should only be needed on Windows + # get unique file to use for temp log file + log=`mktemp unity_stdout.XXXX.tmp -u` + echo "Using $log" + + tail -F $log 2> /dev/null & + eval "\"$UNITY\" $@ -logFile $log" + exitcode="$?" + sleep 5s # wait for tail to catchup + kill %1 # stop tailing + wait %1 2> /dev/null # hide terminated message + rm $log 2> /dev/null +fi + +if [[ $exitcode != 0 ]]; then + echo "Failed!" +fi + +exit "$exitcode" diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..582fde4 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,12 @@ +# Source: https://github.com/JonathanPorta/ci-build/tree/master/appveyor.yml + +#version: 1.0.{build} +environment: + matrix: + - PLATFORM: WINDOWS + - PLATFORM: MACOS + - PLATFORM: LINUX +install: +- cmd: bash Scripts/install.sh +build_script: +- cmd: bash Scripts/build.sh