Committing all - Caleb

Assets/Dusty Char/Text/NPC_Five_speech.txt

@@ -2,5 +2,6 @@ See Carlos, I told you that you'd get the hang of it.
 But now it gets trickier, I'm afraid they've changed the code to 
  some of the floors, but don't worry Nick, for I shall tell you   how to get ahead.  Just use your bit shifting abilities and no
    floor or wall will be matched for you!
-(Press 'Q' to use the Bit Shifting ability to temporarily phase
+(Press 'R' to use the Bit Shifting ability to temporarily phase
   through certain walls and floors) 
+

Assets/Dusty Char/Text/NPC_Four_speech.txt

@@ -4,5 +4,6 @@ Karl! Glad you made it to this level...the System's Defenses are
    these platforms.  
 Don't worry Kyle, I'm sure that after a few tries you'll get the 
  hang of it.
-(Press 'T' to use your glitching abilities and launch yourself 
+(Press 'Q' to use your GOTO abilities and launch yourself 
   forward to make it onto other platforms)
+

Assets/Dusty Char/Text/NPC_Seven_speech.txt

@@ -1 +1,4 @@
-Alright Dante, this is it...*$# moment that we've &**& waiting for.  You now have access $^ all *( your abilities but be warned.  The System has dispatched &*(#@ actual foot soldiers to stop you *(#@ *)^%, HA! Seems like they never learn Virgil, especially after last years ritual. 
+Alright Dante, this is it...*$# moment that we've &**& waiting for. 
+ You now have access $^ all *( your abilities but be warned.  The System has dispatched &*(#@ actual foot soldiers to stop you 
+ *(#@ *)^%, HA! Seems like they never learn Virgil, especially after last years ritual. 
+

Assets/Dusty Char/Text/NPC_Six_speech.txt

@@ -1,2 +1,5 @@
-Dang Eric, I think you might actually break us free from the Systems wrath this year, by how well your breaching through their security.  It's come to my knowledge Matt that the area ahead is filled with shocked charge sections.  I think it's time that you start to use your HITBOXING ability.  
-(Press 'R' to use your HITBOXING ability, which will temporarily raise your hit box above you)
+Dang Eric, I think you might actually break us free from the Systems wrath this year, by how well your breaching through their security.  
+It's come to my knowledge Matt that the area ahead is filled with shocked charge sections.  
+I think it's time that you start to use your HITBOXING ability.  
+(Press 'E' to use your HITBOXING ability, which will temporarily raise your hit box above you)
+

Assets/Resources/Prefabs/Button.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 26d7ad625ed80f3449aaabaf089f6b82
+timeCreated: 1454277134
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Scripts/ButtonScript.cs

@@ -0,0 +1,48 @@
+using UnityEngine;
+using System.Collections;
+using UnityEngine.SceneManagement;
+
+public class ButtonScript : MonoBehaviour
+{
+    public string nextLevel;
+    bool isTriggered = false;
+
+	void OnTriggerEnter2D(Collider2D other)
+    {
+        if(SceneManager.GetActiveScene().name == "Level1")
+        {
+            GameManager.gManager.SetGameStateAndLoad("Level2");
+        }
+        else if (SceneManager.GetActiveScene().name == "Level2")
+        {
+            GameManager.gManager.SetGameStateAndLoad("Level3");
+        }
+        else if (SceneManager.GetActiveScene().name == "Level3")
+        {
+            GameManager.gManager.SetGameStateAndLoad("Level4");
+        }
+        else if (SceneManager.GetActiveScene().name == "Level4")
+        {
+            Application.Quit();
+        }
+        if (other.gameObject.tag == "Scene_Object")
+        {
+            isTriggered = true;
+            SceneManager.LoadScene(nextLevel);
+        }
+    }
+
+    void Update()
+    {
+        /*if (isTriggered)
+        {
+            foreach(Transform i in this.transform)
+            {
+                if (i.tag == "Button")
+                {
+                    i.transform.position = Vector3.Lerp(i.transform.position, new Vector3(0, 0, 0), Time.deltaTime);
+                }
+            }
+        }*/
+    }
+}

Assets/Resources/Scripts/ButtonScript.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 5e3de936f17ee82459adcede9c60fa5e
+timeCreated: 1454274000
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Scripts/GManagerTestScripts/GameManager.cs

@@ -6,6 +6,7 @@ using UnityStandardAssets._2D;
 using System.Collections.Generic;
 using System.Collections;
 using UnityEngine.SceneManagement;
+using UnityStandardAssets._2D;
 
 public class GameManager : MonoBehaviour
 {
@@ -44,7 +45,11 @@ public class GameManager : MonoBehaviour
                 scene_objects[j].Initialize();
             }
             levelDictionary = new Dictionary<GameState, string>() { { GameState.TLEVELONE, "GMLevel1" },
-                                                                    { GameState.TLEVELTWO, "GMLevel2" } };
+                                                                    { GameState.TLEVELTWO, "GMLevel2" },
+                {GameState.LEVELONE, "Level1" },
+                {GameState.LEVELTWO, "Level2" },
+                { GameState.LEVELTHREE, "Level3"},
+                {GameState.LEVELFOUR, "Level4" } };
             // This will break on regular levels, handle regular levels separately.
             GameManager.gState = levelDictionary.FirstOrDefault(x => x.Value == _testLevelPrefix + SceneManager.GetActiveScene().name).Key;
             if(GameManager.m_Camera != null)
@@ -54,6 +59,11 @@ public class GameManager : MonoBehaviour
         }
     }
 
+    void OnLevelWasLoaded(int level)
+    {
+        GameManager.m_Character.transform.position = GameObject.Find("SpawnPoint").transform.position;
+    }
+
     public IEnumerator SetGameStateAndLoad(string levelName)
     {
         GameManager.gState = levelDictionary.FirstOrDefault(x => x.Value == levelName).Key;

Assets/Resources/Scripts/GManagerTestScripts/Utilities.cs

@@ -48,7 +48,11 @@ namespace GameUtils
         TITLE, // index 0
         MAINMENU, // index 1
         TLEVELONE,
-        TLEVELTWO
+        TLEVELTWO,
+        LEVELONE,
+        LEVELTWO,
+        LEVELTHREE,
+        LEVELFOUR
         // ... this goes on to define levels, most useful if kept in the same loading order that is to be used during build.
     }
 }

Assets/Resources/Scripts/PlatformScripts.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 9169f930b5e7e264081a348f5451c611
+folderAsset: yes
+timeCreated: 1454273982
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Blocks/Background2.png.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: bf916c129784cce45a371f83c91d21a5
+timeCreated: 1454276590
+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
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/PaperClip/PapeStationary_3.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 094b791ffbbb2f242b1cb2d60f6e4cc8
+timeCreated: 1454278803
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/PaperClip/PapeStationary_4.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0ccd5b1f0e18b50408d29931199cce74
+timeCreated: 1454279964
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/PaperClip/Papp.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd72cf389f9a081418828f6dd3291765
+timeCreated: 1454278803
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/PaperClip/Pappper.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a5efdbf996176d438c6e4c6b17143cd
+timeCreated: 1454279964
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Titles.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 1830ffb5b13f5d24cbceb3427e785b13
+folderAsset: yes
+timeCreated: 1454281332
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Titles/Title.psd.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: eef9ea43d6e1c384494eda6f17d4d0c4
+timeCreated: 1454281335
+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
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Titles/Title1.png.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: 2e5757c445cffc74e95dcd86a6056b47
+timeCreated: 1454281333
+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
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Titles/Title2.png.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: d72065e161a8dce40b9829ba23e26058
+timeCreated: 1454281334
+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
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Titles/Title3.png.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: a5e8c9abad5f36d45bd5a98813fc96cf
+timeCreated: 1454281334
+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
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Titles/Title_Credits.png.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: 3da1f13ba2442f44f8347b432f40bf91
+timeCreated: 1454281333
+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
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Titles/Title_Play.png.meta

@@ -0,0 +1,57 @@
+fileFormatVersion: 2
+guid: 73d904593fa14184c987405ec3b563ae
+timeCreated: 1454281333
+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
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: