Committing things from last commit

Committing things from last commit that weren't saved beforehand
shieldgenerator7 · Mar 22, 2016 · ca2a4cc · ca2a4cc
1 parent f833265
commit ca2a4cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Assets/Scenes/TutScene01b.unity b/Assets/Scenes/TutScene01b.unity
@@ -14550,7 +14550,11 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 11477714, guid: 5913bd1e88aefff4988c7dfee6595611, type: 2}
       propertyPath: gravityImmuneTimeAmount
-      value: 0.2
+      value: 0.15
+      objectReference: {fileID: 0}
+    - target: {fileID: 11477714, guid: 5913bd1e88aefff4988c7dfee6595611, type: 2}
+      propertyPath: gGIDCinit
+      value: 2
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 5913bd1e88aefff4988c7dfee6595611, type: 2}

diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs
@@ -12,7 +12,7 @@ public class PlayerController : MonoBehaviour {
     public float gravityImmuneTime = 0f;//Merky is immune to gravity until this time
     public float gravityImmuneTimeAmount = 0.2f;//amount of time Merky is immune to gravity after landing (in seconds)
     private int giveGravityImmunityDelayCounter = -1;//used to delay granting gravity immunity until the next cycle
-    public int gGIDCinit = 2;
+    public int gGIDCinit = 2;//note: this may go away once the teleport lookahead detector is improved
 
     public GameObject teleportStreak;
     public GameObject teleportStar;