Merge branch 'master' of https://github.com/bedder/Telethreat

bedder · Nov 28, 2014 · 45bb1f3 · 45bb1f3
2 parents 2ca894c + c00583b
commit 45bb1f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Assets/Prefab/Map/Objects/Obstacle.prefab b/Assets/Prefab/Map/Objects/Obstacle.prefab
@@ -507,8 +507,8 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 100000}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: .5, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 2}
   m_Children:
   - {fileID: 400058}
   - {fileID: 400050}

diff --git a/Assets/Scripts/PlayerGUI.cs b/Assets/Scripts/PlayerGUI.cs
@@ -200,7 +200,8 @@ void updateValues() {
             healthbarActual.width = 0;
             drawText(new Rect(0, 0, Screen.width, Screen.height), "You died.\nPress R to restart\nor Escape to exit", deathMessageStyle, 4);
             if (Input.GetButton("Restart")) {
-                Application.LoadLevel(Application.loadedLevel);
+                gameController.nextLevel--;
+                Application.LoadLevel(gameController.nextLevel);
             }
             if (Input.GetButton("Exit")) {
                 Application.LoadLevel(0);

diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset
@@ -153,7 +153,7 @@ InputManager:
     descriptiveName: 
     descriptiveNegativeName: 
     negativeButton: 
-    positiveButton: return
+    positiveButton: e
     altNegativeButton: 
     altPositiveButton: 
     gravity: 3