Merge remote-tracking branch 'origin/master'

Zookeepers Trial/Assets/Art/maps/Town2Town.jpg.meta

+fileFormatVersion: 2
+guid: 5f49e4fcbcde4414c9c327c4459bd16c
+timeCreated: 1480184754
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Zookeepers Trial/Assets/Scripts/InBetweenCamera.cs

@@ -17,12 +17,12 @@ public class InBetweenCamera : MonoBehaviour
     void Update()
     {
         //changing screen height won't screw the sprites. (mobile capatability, etc.)
-        cam.orthographicSize = (Screen.height / 100f);
+        cam.orthographicSize = (Screen.height / 80f);
 
         //Lerp parameters (from, to, how fast)
         if (follow)
         {
-            transform.position = Vector3.Lerp(transform.position, follow.position, 0.1f) + new Vector3(0, .1f, -10);
+            transform.position = Vector3.Lerp(transform.position, follow.position, 0.1f) + new Vector3(0, 0.3f, -10);
         }
     }
 }

Zookeepers Trial/Library/LastSceneManagerSetup.txt

 sceneSetups:
-- path: Assets/Scenes/shopChurch.unity
+- path: Assets/Scenes/Town01ToTown02.unity
   isLoaded: 1
   isActive: 1

Zookeepers Trial/Library/UnityAssemblies/UnityEditor.iOS.Extensions.Common.xml

+<?xml version="1.0"?>
+<doc>
+	<assembly>
+		<name>UnityEditor.iOS.Extensions.Common</name>
+	</assembly>
+	<members>
+		<member name="T:UnityEditor.iOS.BuildPipeline">
+			<summary>Lets you programmatically build players or AssetBundles which can be loaded from the web.</summary>
+		</member>
+		<member name="T:UnityEditor.iOS.DeviceType">
+			<summary>Enumeration for SystemInfo.deviceType, denotes a coarse grouping of kinds of devices.</summary>
+		</member>
+	</members>
+</doc>

Zookeepers Trial/Library/UnityAssemblies/UnityEditor.iOS.Extensions.Xcode.xml

+<?xml version="1.0"?>
+<doc>
+	<assembly>
+		<name>UnityEditor.iOS.Extensions.Xcode</name>
+	</assembly>
+	<members>
+	</members>
+</doc>

Zookeepers Trial/Library/UnityAssemblies/version.txt

@@ -3,4 +3,6 @@ StandaloneWindows
 C:/Program Files/Unity/Editor/Data/Managed/UnityEngine.dll
 C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll
 C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll
-C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.dll
+C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.dll
\ No newline at end of file
+C:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport\UnityEditor.iOS.Extensions.Xcode.dll
+C:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport\UnityEditor.iOS.Extensions.Common.dll
\ No newline at end of file