Merge branch 'development' of http://github.com/benthemonkey/blorb

benthemonkey · Mar 16, 2015 · 12ed98c · 12ed98c
2 parents bd07162 + 52ff9eb
commit 12ed98c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/Assets/Base/Placements/Placement.cs b/Assets/Base/Placements/Placement.cs
@@ -91,7 +91,7 @@ void OnMouseExit ()
 	// Use this for initialization
 	void OnMouseDown()
     {
-        if (GUIManager.Instance.OnTutorialScreen) return;
+        if (GUIManager.Instance.OnTutorialScreen || Time.timeScale == 0) return;
 
 		BaseCohesionManager.UnMarkAllAttachments();
 

diff --git a/Assets/GUI/PauseButton.cs b/Assets/GUI/PauseButton.cs
@@ -4,6 +4,14 @@
 public class PauseButton : MonoBehaviour {
 	void OnMouseDown () {
 		WorldManager.instance.PauseButton ();
+
+        if (!GUIManager.Instance.OnTutorialScreen)
+		{
+			Placement.StopPlacement();
+			GUIManager.Instance.MouseOverUI = false;
+
+			SellingManager.Instance.SetVisibility(false);
+		}
 	}
 
 	void OnMouseEnter () {

diff --git a/Assets/Resources/Mountain.prefab b/Assets/Resources/Mountain.prefab
@@ -107,7 +107,7 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 2}
+  m_Size: {x: 1.29999995, y: 1.29999995, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &100100000
 Prefab:

diff --git a/Assets/Resources/Resource.prefab b/Assets/Resources/Resource.prefab
@@ -80,7 +80,7 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 2}
+  m_Size: {x: 1.29999995, y: 1.29999995, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &11465728
 MonoBehaviour: