Merge branch 'master' of https://github.com/AdronTech/GGJ_2017

Conflicts: GGJ17/Assets/Script/IsoCamera.cs
AdronTech · Jan 22, 2017 · 72fa485 · 72fa485
2 parents a3cdfff + eb28691
commit 72fa485
Show file tree

Hide file tree

Showing 8 changed files with 10,294 additions and 8,357 deletions.
diff --git a/GGJ17/Assets/Models/nest.obj b/GGJ17/Assets/Models/nest.obj
diff --git a/GGJ17/Assets/Models/nest.obj.meta b/GGJ17/Assets/Models/nest.obj.meta
diff --git a/GGJ17/Assets/Prefab/BuildingBlocks/Building_Barracks.prefab b/GGJ17/Assets/Prefab/BuildingBlocks/Building_Barracks.prefab
diff --git a/GGJ17/Assets/Prefab/BuildingBlocks/Building_EnemyLair.prefab b/GGJ17/Assets/Prefab/BuildingBlocks/Building_EnemyLair.prefab
diff --git a/GGJ17/Assets/Prefab/BuildingBlocks/Building_LandingPod.prefab b/GGJ17/Assets/Prefab/BuildingBlocks/Building_LandingPod.prefab
diff --git a/GGJ17/Assets/Prefab/GroundBlocks/Ground_Resources.prefab b/GGJ17/Assets/Prefab/GroundBlocks/Ground_Resources.prefab
diff --git a/GGJ17/Assets/Prefab/GroundBlocks/Ground_Soil.prefab b/GGJ17/Assets/Prefab/GroundBlocks/Ground_Soil.prefab
diff --git a/GGJ17/Assets/Script/IsoCamera.cs b/GGJ17/Assets/Script/IsoCamera.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 
 public class IsoCamera : MonoBehaviour {
-
+    
     public float panSpeed = 10, rotateSpeed = 100, zoomSpeed = 5;
     private const float camFocusHeight = 0;
     private Vector3 focusPoint, mousePosition;