Assets/Materials/UIMat_Transistion.shmat

@@ -1,8 +0,0 @@
-- VertexShader: 46580970
-  FragmentShader: 40208610
-  SubPass: UI
-  Properties:
-    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 50770098
-    data.alpha: 1
-    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UIMat_Transistion.shmat.shmeta

@@ -1,3 +0,0 @@
-Name: UIMat_Transistion
-ID: 132131066
-Type: 7

Assets/Navigation Data/Level3_NavData.shnav.shmeta

@@ -1,3 +1,3 @@
 Name: Level3_NavData
-ID: 252819653
+ID: 263362242
 Type: 15

Assets/Scenes/CreditsScene.shade

@@ -56,7 +56,6 @@
       Enabled: true
       endY: 4300
       duration: 27
-      levelTransition: 619
     - Type: SHADE_Scripting.UI.TransitToMainMenu
       Enabled: true
       timeToTransit: 27
@@ -111,64 +110,3 @@
   Scripts:
     - Type: TweenManager
       Enabled: true
-- EID: 619
-  Name: LevelTransistionCanvas
-  IsActive: true
-  NumberOfChildren: 2
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: true
-  Scripts:
-    - Type: LevelTransistion
-      Enabled: true
-      logo: 618
-      bg: 617
-      duration: 0.5
-      bgEndPositionX: 3000
-      logoEndPositionX: 3000
-      rotAndScale: false
-      rotationAmt: 360
-      scaleAmt: 631
-- EID: 618
-  Name: LevelTransistionLogo
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 631, y: 631, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 126117259
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
-- EID: 617
-  Name: LevelTransistionBG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.200000003}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 4000, y: 4000, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 132131066
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~

Assets/Scenes/CutSceneEnd.shade

@@ -1,4 +1,3 @@
-- NavData: 0
 - EID: 1
   Name: Canvas4
   IsActive: true
@@ -153,7 +152,7 @@
   Scripts:
     - Type: CutsceneEnd
       Enabled: true
-      nextScene: 97376761
+      nextScene: 92009475
       duration: 1
       skipDuration: 0.100000001
       cutscene4Points: 4
@@ -162,7 +161,6 @@
       cutscene5Pics: 15
       canvas4: 1
       canvas5: 14
-      levelTransition: 619
 - EID: 4
   Name: CutScene4Points
   IsActive: true
@@ -290,7 +288,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 250, y: -500, z: 0.300000012}
+      Translate: {x: 250, y: -500, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 50, y: 50, z: 50}
       IsActive: true
@@ -334,72 +332,3 @@
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
   Scripts: ~
-- EID: 619
-  Name: LevelTransistionCanvas
-  IsActive: true
-  NumberOfChildren: 2
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: true
-  Scripts:
-    - Type: LevelTransistion
-      Enabled: true
-      logo: 618
-      bg: 617
-      duration: 0.5
-      bgEndPositionX: 3000
-      logoEndPositionX: 3000
-      rotAndScale: false
-      rotationAmt: 360
-      scaleAmt: 631
-- EID: 618
-  Name: LevelTransistionLogo
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 631, y: 631, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 126117259
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
-- EID: 617
-  Name: LevelTransistionBG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.200000003}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 4000, y: 4000, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 132131066
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
-- EID: 616
-  Name: TweenManager
-  IsActive: true
-  NumberOfChildren: 0
-  Components: ~
-  Scripts:
-    - Type: TweenManager
-      Enabled: true

Assets/Scenes/CutSceneIntro.shade

@@ -1,4 +1,3 @@
-- NavData: 0
 - EID: 1
   Name: Canvas1
   IsActive: true
@@ -165,7 +164,6 @@
       canvas1: 1
       canvas2: 13
       canvas3: 24
-      levelTransition: 619
 - EID: 4
   Name: CutScene1Points
   IsActive: true
@@ -179,7 +177,7 @@
   Components:
     Transform Component:
       Translate: {x: -550, y: 0, z: 0.5}
-      Rotate: {x: 500.5, y: -274.5, z: 0.600000024}
+      Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
   Scripts: ~
@@ -396,7 +394,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -1375, y: 250, z: 0.899999976}
+      Translate: {x: -1375, y: 250, z: 0.5}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 982, y: 527, z: 1}
       IsActive: true
@@ -416,7 +414,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 200, y: 1200, z: 0.800000012}
+      Translate: {x: 200, y: 1200, z: 0.400000006}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 625, y: 579, z: 1}
       IsActive: true
@@ -436,7 +434,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 1700, y: 200, z: 0.699999988}
+      Translate: {x: 1700, y: 200, z: 0.300000012}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 529, y: 670, z: 1}
       IsActive: true
@@ -456,7 +454,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -1600, y: -200, z: 0.899999976}
+      Translate: {x: -1600, y: -200, z: 0.5}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1299, y: 575, z: 1}
       IsActive: true
@@ -476,7 +474,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 500, y: -1275, z: 0.899999976}
+      Translate: {x: 500, y: -1275, z: 0.5}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 866, y: 483, z: 1}
       IsActive: true
@@ -496,7 +494,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0, y: 0, z: 0.99000001}
+      Translate: {x: 0, y: 0, z: 0.699999988}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1920, y: 1080, z: 1}
       IsActive: true
@@ -516,7 +514,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 250, y: -500, z: 0.400000006}
+      Translate: {x: 250, y: -500, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 50, y: 50, z: 50}
       IsActive: true
@@ -544,7 +542,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -375, y: 250, z: 0.899999976}
+      Translate: {x: -375, y: 250, z: 0.5}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
@@ -555,7 +553,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 200, y: 200, z: 0.800000012}
+      Translate: {x: 200, y: 200, z: 0.400000006}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
@@ -566,7 +564,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 700, y: 200, z: 0.699999988}
+      Translate: {x: 700, y: 200, z: 0.300000012}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
@@ -577,7 +575,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -225, y: -200, z: 0.600000024}
+      Translate: {x: -225, y: -200, z: 0.200000003}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
@@ -588,77 +586,8 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 500, y: -275, z: 0.5}
+      Translate: {x: 500, y: -275, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
   Scripts: ~
-- EID: 619
-  Name: LevelTransistionCanvas
-  IsActive: true
-  NumberOfChildren: 2
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: true
-  Scripts:
-    - Type: LevelTransistion
-      Enabled: true
-      logo: 618
-      bg: 617
-      duration: 0.5
-      bgEndPositionX: 3000
-      logoEndPositionX: 3000
-      rotAndScale: false
-      rotationAmt: 360
-      scaleAmt: 631
-- EID: 618
-  Name: LevelTransistionLogo
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 631, y: 631, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 126117259
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
-- EID: 617
-  Name: LevelTransistionBG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.200000003}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 4000, y: 4000, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 132131066
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
-- EID: 616
-  Name: TweenManager
-  IsActive: true
-  NumberOfChildren: 0
-  Components: ~
-  Scripts:
-    - Type: TweenManager
-      Enabled: true

Assets/Scenes/Level1.shade

@@ -6864,7 +6864,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -6906,7 +6906,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -6948,7 +6948,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -6990,7 +6990,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -8812,7 +8812,7 @@
       popInDuration: 0.5
       popOutDuration: 0.075000003
       stayDuration: 1
-      rotationAmt: 360
+      rotationAmt: 1800
       scaleAmtX: 538
       scaleAmtY: 377
 - EID: 463
@@ -8831,12 +8831,11 @@
   Scripts:
     - Type: SHADE_Scripting.UI.PreviewLevel
       Enabled: true
-      levelTransistion: 619
-      endPoint1: [-5.5, 1.20000005, -2]
+      endPoint1: [-5.5, 1.5, -2]
       endPoint2: [1, 1.5, -7.5]
       endPoint3: [2.5, 1.5, -3]
       playerCamera: 65730
-      gameplayCanvas: 131271
+      gameplayCanvas: 459
       duration: 3
 - EID: 453
   Name: PreviewLevel1
@@ -8844,7 +8843,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -7.5, y: 1.20000005, z: -2}
+      Translate: {x: -7.5, y: 1.5, z: -2}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
@@ -9414,7 +9413,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0, y: 0.300000012, z: 0.699999988}
+      Translate: {x: 0, y: 0.300000012, z: 0.98999995}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 5, y: 2, z: 1}
       IsActive: true
@@ -9434,7 +9433,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0, y: -0.800000012, z: 0.600000024}
+      Translate: {x: 0, y: -0.800000012, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: false
@@ -9459,12 +9458,12 @@
   NumberOfChildren: 1
   Components:
     Transform Component:
-      Translate: {x: -800, y: 200, z: 0.600000024}
+      Translate: {x: -800, y: 200, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 50, y: 50, z: 60}
       IsActive: true
     Text Renderer Component:
-      Text: X0
+      Text: X2
       Font: 174412429
       Color: {x: 1, y: 1, z: 1, w: 1}
       Text Size: {x: 1, y: 1, z: 1}
@@ -9485,7 +9484,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0.800000012, y: 0.400000006, z: 0.699999988}
+      Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 4.26499987, y: 2, z: 1}
       IsActive: true
@@ -9507,7 +9506,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -770, y: 425, z: 0.699999988}
+      Translate: {x: -770, y: 425, z: 59.9999962}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 345.600006, y: 200, z: 60}
       IsActive: true
@@ -9520,12 +9519,7 @@
       Hovered: false
       Clicked: false
       IsActive: true
-  Scripts:
-    - Type: SHADE_Scripting.UI.SingleScaleBounce
-      Enabled: true
-      durationUp: 0.150000006
-      durationDown: 0.300000012
-      scaleSize: 1.20000005
+  Scripts: ~
 - EID: 626
   Name: Result Canvas
   IsActive: false
@@ -9544,7 +9538,6 @@
       maxCombo: 621
       finalScore: 620
       contiuneBtn: 624
-      levelTransition: 619
       nextScene: 86098106
       scoreTweenDur: 2
 - EID: 624
@@ -9688,64 +9681,3 @@
       Clicked: false
       IsActive: true
   Scripts: ~
-- EID: 619
-  Name: LevelTransistionCanvas
-  IsActive: true
-  NumberOfChildren: 2
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: true
-  Scripts:
-    - Type: LevelTransistion
-      Enabled: true
-      logo: 618
-      bg: 617
-      duration: 0.5
-      bgEndPositionX: 3000
-      logoEndPositionX: 3000
-      rotAndScale: false
-      rotationAmt: 360
-      scaleAmt: 631
-- EID: 618
-  Name: LevelTransistionLogo
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 631, y: 631, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 126117259
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
-- EID: 617
-  Name: LevelTransistionBG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.200000003}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 4000, y: 4000, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 132131066
-      IsActive: true
-    UI Component:
-      Canvas ID: 619
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~

Assets/Scenes/Level2.shade

@@ -15957,7 +15957,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -16125,7 +16125,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -17027,7 +17027,7 @@
       popInDuration: 0.5
       popOutDuration: 0.075000003
       stayDuration: 1
-      rotationAmt: 360
+      rotationAmt: 1800
       scaleAmtX: 538
       scaleAmtY: 377
 - EID: 551
@@ -17082,12 +17082,11 @@
   Scripts:
     - Type: SHADE_Scripting.UI.PreviewLevel
       Enabled: true
-      levelTransistion: 608
       endPoint1: [-3.5, 1.5, -4.5]
       endPoint2: [0, 2, 4.5]
       endPoint3: [1.14999998, 2.20000005, 2]
       playerCamera: 4
-      gameplayCanvas: 131271
+      gameplayCanvas: 199
       duration: 3
 - EID: 555
   Name: PreviewLevel1
@@ -17095,7 +17094,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -4.5, y: 1.5, z: -3.5}
+      Translate: {x: -5, y: 1.5, z: -3}
       Rotate: {x: 0, y: -2.3561945, z: 0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
@@ -17234,7 +17233,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0, y: 0.300000012, z: 0.699999988}
+      Translate: {x: 0, y: 0.300000012, z: 0.98999995}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 5, y: 2, z: 1}
       IsActive: true
@@ -17254,7 +17253,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0, y: -0.800000012, z: 0.600000024}
+      Translate: {x: 0, y: -0.800000012, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: false
@@ -17279,12 +17278,12 @@
   NumberOfChildren: 1
   Components:
     Transform Component:
-      Translate: {x: -800, y: 200, z: 0.600000024}
+      Translate: {x: -800, y: 200, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 50, y: 50, z: 60}
       IsActive: true
     Text Renderer Component:
-      Text: X0
+      Text: X2
       Font: 174412429
       Color: {x: 1, y: 1, z: 1, w: 1}
       Text Size: {x: 1, y: 1, z: 1}
@@ -17305,7 +17304,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0.800000012, y: 0.400000006, z: 0.699999988}
+      Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 4.26499987, y: 2, z: 1}
       IsActive: true
@@ -17327,7 +17326,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -770, y: 425, z: 0.699999988}
+      Translate: {x: -770, y: 425, z: 59.9999962}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 345.600006, y: 200, z: 60}
       IsActive: true
@@ -17487,8 +17486,8 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0, y: 0, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
+      Translate: {x: 0, y: 0, z: -0.329473495}
+      Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
   Scripts: ~
@@ -17510,7 +17509,6 @@
       maxCombo: 612
       finalScore: 610
       contiuneBtn: 623
-      levelTransition: 608
       nextScene: 88928066
       scoreTweenDur: 2
 - EID: 623
@@ -17654,64 +17652,3 @@
       Clicked: false
       IsActive: true
   Scripts: ~
-- EID: 608
-  Name: LevelTransistionCanvas
-  IsActive: true
-  NumberOfChildren: 2
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: true
-  Scripts:
-    - Type: LevelTransistion
-      Enabled: true
-      logo: 607
-      bg: 606
-      duration: 0.5
-      bgEndPositionX: 3000
-      logoEndPositionX: 3000
-      rotAndScale: false
-      rotationAmt: 360
-      scaleAmt: 631
-- EID: 607
-  Name: LevelTransistionLogo
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 631, y: 631, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 126117259
-      IsActive: true
-    UI Component:
-      Canvas ID: 608
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
-- EID: 606
-  Name: LevelTransistionBG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.200000003}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 4000, y: 4000, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 132131066
-      IsActive: true
-    UI Component:
-      Canvas ID: 608
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~

Assets/Scenes/Level3.shade

@@ -1,4 +1,4 @@
-- NavData: 252819653
+- NavData: 263362242
 - EID: 0
   Name: Light_Direction
   IsActive: true
@@ -6,7 +6,7 @@
   Components:
     Transform Component:
       Translate: {x: -4.64838362, y: 2.94342947, z: 0.209690213}
-      Rotate: {x: 2.99841309, y: 1.61244416, z: -0.287879944}
+      Rotate: {x: 6.41686916, y: 0.727440596, z: 2.90124035}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
     Light Component:
@@ -3626,7 +3626,7 @@
   Components:
     Transform Component:
       Translate: {x: 2.75, y: 0, z: 6.25}
-      Rotate: {x: -0, y: 0, z: -0}
+      Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 0.75, y: 0.75, z: 0.75}
       IsActive: true
     Renderable Component:
@@ -5367,7 +5367,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 3.47301221, y: 0, z: 8.17157459}
+      Translate: {x: 3.25, y: 0, z: 7.55967045}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
@@ -8802,7 +8802,7 @@
       popInDuration: 0.5
       popOutDuration: 0.075000003
       stayDuration: 1
-      rotationAmt: 360
+      rotationAmt: 1800
       scaleAmtX: 538
       scaleAmtY: 377
 - EID: 547
@@ -9380,12 +9380,11 @@
   Scripts:
     - Type: SHADE_Scripting.UI.PreviewLevel
       Enabled: true
-      levelTransistion: 229
       endPoint1: [-1.79999995, 1.5, 0.5]
       endPoint2: [5, 3.5, 0.5]
-      endPoint3: [0.5, 1.5, 0.5]
+      endPoint3: [-0.5, 1.5, 3.5]
       playerCamera: 66063
-      gameplayCanvas: 66062
+      gameplayCanvas: 526
       duration: 3
 - EID: 555
   Name: PreviewLevel1
@@ -9437,14 +9436,14 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 5.5, y: 1.5, z: 0.5}
-      Rotate: {x: 0, y: 1.57079637, z: 0}
+      Translate: {x: 3.5, y: 1.5, z: 0}
+      Rotate: {x: 0, y: 2.26892805, z: 0}
       Scale: {x: 0.999999821, y: 1, z: 0.999999821}
       IsActive: true
     Camera Component:
       Position: {x: 2.5, y: 1.5, z: -7.5}
       Pitch: 0
-      Yaw: 90
+      Yaw: 130
       Roll: 0
       Width: 1920
       Near: 0.00999999978
@@ -10590,7 +10589,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 2.91941047, y: 0.527999997, z: 8.10036278}
+      Translate: {x: 2.91941047, y: 0.527999997, z: 7.41522264}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
@@ -12825,7 +12824,7 @@
   NumberOfChildren: 8
   Components:
     Transform Component:
-      Translate: {x: 5.5, y: 0.0124755427, z: 10}
+      Translate: {x: 5.5, y: 0.300000012, z: 10}
       Rotate: {x: -0, y: -3.1415925, z: 0}
       Scale: {x: 0.999999404, y: 1, z: 0.999999404}
       IsActive: true
@@ -14465,7 +14464,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -14507,7 +14506,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -14549,7 +14548,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -14591,7 +14590,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -14794,8 +14793,8 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 3.65231538, y: 0.438600183, z: 8.16182518}
-      Rotate: {x: -0, y: 0, z: -0}
+      Translate: {x: 3.65231538, y: 0.438600183, z: 7.60280371}
+      Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
     Renderable Component:
@@ -14825,7 +14824,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -14867,7 +14866,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -14909,7 +14908,7 @@
           Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
           Friction: 0.400000006
           Bounciness: 0
-          Density: 2
+          Density: 1
           Position Offset: {x: 0, y: 0.100000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
@@ -15265,13 +15264,7 @@
       Color Decay: {x: 0, y: 0, z: 0, w: 0}
       Acceleration: {x: 0, y: -0.100000001, z: 0}
       IsActive: true
-  Scripts:
-    - Type: DecorationAudio
-      Enabled: true
-      name: spark1
-      audio: event:/Props/sparks
-      loop: false
-      timeDruation: 2.29999995
+  Scripts: ~
 - EID: 608
   Name: Light particles
   IsActive: true
@@ -15305,13 +15298,7 @@
       Color Decay: {x: 0, y: 0, z: 0, w: 0}
       Acceleration: {x: 0, y: -0.100000001, z: 0}
       IsActive: true
-  Scripts:
-    - Type: DecorationAudio
-      Enabled: true
-      name: spark2
-      audio: event:/Props/sparks
-      loop: false
-      timeDruation: 3.20000005
+  Scripts: ~
 - EID: 609
   Name: Light particles
   IsActive: true
@@ -15345,13 +15332,7 @@
       Color Decay: {x: 0, y: 0, z: 0, w: 0}
       Acceleration: {x: 0, y: -0.100000001, z: 0}
       IsActive: true
-  Scripts:
-    - Type: DecorationAudio
-      Enabled: true
-      name: spark3
-      audio: event:/Props/sparks
-      loop: false
-      timeDruation: 2.5
+  Scripts: ~
 - EID: 610
   Name: Light particles
   IsActive: true
@@ -15385,13 +15366,7 @@
       Color Decay: {x: 0, y: 0, z: 0, w: 0}
       Acceleration: {x: 0, y: -0.100000001, z: 0}
       IsActive: true
-  Scripts:
-    - Type: DecorationAudio
-      Enabled: true
-      name: spark4
-      audio: event:/Props/sparks
-      loop: false
-      timeDruation: 3.29999995
+  Scripts: ~
 - EID: 611
   Name: Water particles
   IsActive: true
@@ -15459,13 +15434,7 @@
       Color Decay: {x: 0, y: 0, z: 0, w: 0}
       Acceleration: {x: 0, y: -0.100000001, z: 0}
       IsActive: true
-  Scripts:
-    - Type: DecorationAudio
-      Enabled: true
-      name: spark5
-      audio: event:/Props/sparks
-      loop: false
-      timeDruation: 2.29999995
+  Scripts: ~
 - EID: 613
   Name: Water particles
   IsActive: true
@@ -15499,13 +15468,7 @@
       Color Decay: {x: 0, y: 0, z: 0, w: 0}
       Acceleration: {x: 0, y: -0.899999976, z: 0}
       IsActive: true
-  Scripts:
-    - Type: DecorationAudio
-      Enabled: true
-      name: water2
-      audio: event:/Props/tap_loop
-      loop: true
-      timeDruation: 0.5
+  Scripts: ~
 - EID: 615
   Name: Water particles
   IsActive: true
@@ -15670,8 +15633,8 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0, y: 0, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
+      Translate: {x: 0, y: 0, z: -0.329473495}
+      Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
   Scripts: ~
@@ -15799,12 +15762,12 @@
   NumberOfChildren: 1
   Components:
     Transform Component:
-      Translate: {x: -800, y: 200, z: 0.600000024}
+      Translate: {x: -800, y: 200, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 50, y: 50, z: 60}
       IsActive: true
     Text Renderer Component:
-      Text: X0
+      Text: X2
       Font: 174412429
       Color: {x: 1, y: 1, z: 1, w: 1}
       Text Size: {x: 1, y: 1, z: 1}
@@ -15825,7 +15788,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0.800000012, y: 0.400000006, z: 0.98999995}
+      Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 4.26499987, y: 2, z: 1}
       IsActive: true
@@ -15860,12 +15823,7 @@
       Hovered: false
       Clicked: false
       IsActive: true
-  Scripts:
-    - Type: SHADE_Scripting.UI.SingleScaleBounce
-      Enabled: true
-      durationUp: 0.150000006
-      durationDown: 0.300000012
-      scaleSize: 1.20000005
+  Scripts: ~
 - EID: 505
   Name: Result Canvas
   IsActive: false
@@ -15884,7 +15842,6 @@
       maxCombo: 484
       finalScore: 274
       contiuneBtn: 488
-      levelTransition: 229
       nextScene: 84606951
       scoreTweenDur: 2
 - EID: 488
@@ -16028,64 +15985,3 @@
       Clicked: false
       IsActive: true
   Scripts: ~
-- EID: 229
-  Name: LevelTransistionCanvas
-  IsActive: true
-  NumberOfChildren: 2
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: true
-  Scripts:
-    - Type: LevelTransistion
-      Enabled: true
-      logo: 228
-      bg: 227
-      duration: 0.5
-      bgEndPositionX: 3000
-      logoEndPositionX: 3000
-      rotAndScale: false
-      rotationAmt: 360
-      scaleAmt: 631
-- EID: 228
-  Name: LevelTransistionLogo
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 631, y: 631, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 126117259
-      IsActive: true
-    UI Component:
-      Canvas ID: 229
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
-- EID: 227
-  Name: LevelTransistionBG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.200000003}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 4000, y: 4000, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 132131066
-      IsActive: true
-    UI Component:
-      Canvas ID: 229
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~

Assets/Scenes/MainMenu.shade

@@ -55,7 +55,6 @@
       minScale: 1
       maxScale: 1.20000005
       duration: 1.5
-      isActive: true
 - EID: 54
   Name: Main Menu Button Group
   IsActive: true
@@ -1441,7 +1440,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -800, y: 450, z: 0.300000012}
+      Translate: {x: -800, y: 450, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 273, y: 100, z: 1}
       IsActive: true
@@ -1477,7 +1476,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -250, y: 400, z: 0.300000012}
+      Translate: {x: -250, y: 400, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 100, y: 100, z: 1}
       IsActive: true
@@ -1537,7 +1536,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -600, y: 0, z: 0.300000012}
+      Translate: {x: -600, y: 0, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 345, y: 800, z: 1}
       IsActive: true
@@ -1559,7 +1558,6 @@
     - Type: ChangeSceneButton
       Enabled: true
       sceneID: 91947920
-      levelTransistion: 433
     - Type: SHADE_Scripting.UI.ButtonFX
       Enabled: true
       onHoverEnterSound: event:/UI/botton_hover
@@ -1574,7 +1572,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0, y: 0, z: 0.300000012}
+      Translate: {x: 0, y: 0, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 345, y: 800, z: 1}
       IsActive: true
@@ -1596,7 +1594,6 @@
     - Type: ChangeSceneButton
       Enabled: true
       sceneID: 86098106
-      levelTransistion: 433
     - Type: SHADE_Scripting.UI.ButtonFX
       Enabled: true
       onHoverEnterSound: event:/UI/botton_hover
@@ -1611,7 +1608,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 600, y: 0, z: 0.300000012}
+      Translate: {x: 600, y: 0, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 345, y: 800, z: 1}
       IsActive: true
@@ -1633,7 +1630,6 @@
     - Type: ChangeSceneButton
       Enabled: true
       sceneID: 88928066
-      levelTransistion: 433
     - Type: SHADE_Scripting.UI.ButtonFX
       Enabled: true
       onHoverEnterSound: event:/UI/botton_hover
@@ -1644,14 +1640,14 @@
       clickScale: 0.899999976
 - EID: 450
   Name: TransitionCanvas
-  IsActive: true
+  IsActive: false
   NumberOfChildren: 1
   Components:
     Canvas Component:
       Canvas Width: 1920
       Canvas Height: 1080
       Scale by canvas width: false
-      IsActive: true
+      IsActive: false
   Scripts: ~
 - EID: 65982
   Name: Transition
@@ -1678,64 +1674,3 @@
       alphaValue: 0
       fadeInTime: 0.5
       fadeOutTime: 0.5
-- EID: 433
-  Name: LevelTransistionCanvas
-  IsActive: false
-  NumberOfChildren: 2
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: false
-  Scripts:
-    - Type: LevelTransistion
-      Enabled: true
-      logo: 431
-      bg: 432
-      duration: 0.800000012
-      bgEndPositionX: 0
-      logoEndPositionX: 0
-      rotAndScale: true
-      rotationAmt: 360
-      scaleAmt: 631
-- EID: 431
-  Name: LevelTransistionLogo
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 0, y: 0, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 126117259
-      IsActive: true
-    UI Component:
-      Canvas ID: 433
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
-- EID: 432
-  Name: LevelTransistionBG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -2500, y: 0, z: 0.200000003}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 4000, y: 4000, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 132131066
-      IsActive: true
-    UI Component:
-      Canvas ID: 433
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~

Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAttackHitbox.cs

@@ -50,15 +50,13 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
 
     protected override void onTriggerStay(CollisionInfo info)
     {
-      if (info.GameObject.GetScript<PlayerController>())
-      { 
+      if(info.GameObject.GetScript<PlayerController>())
         pc = info.GameObject.GetScript<PlayerController>();
       if (ai && ai.atk && pc)
       {
         raccoonFound = true;
       }
     }
-    }
 
 
   }

Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AlertState.cs

@@ -52,7 +52,7 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States
 				}
 				
 			}
-      SHADE.Audio.SetParameterWithLabel("PlayerDetection", "Detected");
+      
 
 		}
     public override void OnExit()

Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AttackState.cs

@@ -88,11 +88,10 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States
 
     public override void update()
     {
-      if (ai.hitboxScript.raccoonFound && machine.GetScript<HomeOwnerAI>().atk)
+      if (ai.hitboxScript.raccoonFound)
       {
         raccoonCaught = true;
 				Transform pcTransform = ai.player.GetComponent<Transform>();
-        ai.player.GetScript<PlayerController>().Caught();
 				Transform netTransform = ai.attackHitbox.GetComponentInChildren<Transform>();
 				if (pcTransform && netTransform)
 				{
@@ -128,7 +127,7 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States
       else if (seq)
       {
 
-        if (timer <= seqTime  * 0.5f)
+        if (timer <= 1.0f / 30.0f)
         {
           //ai.attackHitbox.SetActive(true);
           machine.GetScript<HomeOwnerAI>().atk = true; 

Assets/Scripts/Gameplay/Player/SC_PlayerController.cs

@@ -22,7 +22,6 @@ public class PlayerController : Script
   public Transform tranform { get; set; }
   public Camera cam { get; set; }
   public CameraArm camArm { get; set; }
-  public Collider collider { get; set; }
 
   [NonSerialized]
   public PickAndThrow pat;
@@ -125,10 +124,6 @@ public class PlayerController : Script
     if(!tranform)
       Debug.LogError("tranform is MISSING!");
 
-    collider = GetComponent<Collider>();
-    if (!collider)
-      Debug.LogError("collider is MISSING!");
-
     stateMachine = AddScript<StateMachine>();
     Dictionary<Type, BaseState> dictionary = new Dictionary<Type, BaseState>();
     dictionary.Add(typeof(PlayerIdleState), new PlayerIdleState(stateMachine));
@@ -440,14 +435,11 @@ public class PlayerController : Script
     }
 
     if (!isGrounded && rb != null && (rb.LinearVelocity.y < 0.0f || Input.GetKeyUp(Input.KeyCode.Space)))
-    {
-      if (currentState != RaccoonStates.CAUGHT)
     { 
       currentState = RaccoonStates.FALLING;
       if (stateMachine && !stateMachine.IsState(typeof(PlayerFallState)))
         stateMachine.SetState(typeof(PlayerFallState));
     }
-    }
    
   }
 
@@ -471,9 +463,6 @@ public class PlayerController : Script
 
   private void Gravity()
   {
-    if (currentState == RaccoonStates.CAUGHT)
-      return;
-
     if (rb != null)
     {
       //check player vel.y if its close to zero its on the ground
@@ -528,6 +517,7 @@ public class PlayerController : Script
 
   public void Caught()
   {
+    //Debug.Log("PlayerController: Raccoon Caught");
     currentState = RaccoonStates.CAUGHT;
     if (stateMachine && !stateMachine.IsState(typeof(PlayerCaughtState)))
       stateMachine.SetState(typeof(PlayerCaughtState));
@@ -550,26 +540,19 @@ public class PlayerController : Script
         camArm.ArmLength = pat.tpc.armLength;
       }
     }
-
-    landedOnJumpPad = false;
-    jumpPadDrop = false;
-    rb.ClearForces();
-    rb.ClearTorque();
-    rb.LinearVelocity = Vector3.Zero;
-    rb.AngularVelocity = Vector3.Zero;
-    collider.GetCollisionShape(0).IsTrigger = true;
   }
 
   public void Reset()
   {
-    if (tranform && respawnPoint)
-    {
+    //Debug.Log("PlayerController: Raccon Reset " + currentState);
 
+    if (currentState == RaccoonStates.CAUGHT && tranform && respawnPoint)
+    {
+			//Debug.Log("PlayerController: Raccon Reset inside if " + currentState);
 			currentState = RaccoonStates.IDLE;
       if (stateMachine && !stateMachine.IsState(typeof(PlayerIdleState)))
         stateMachine.SetState(typeof(PlayerIdleState));
 
-      collider.GetCollisionShape(0).IsTrigger = false;
       tranform.GlobalPosition = respawnPoint.GetComponent<Transform>().GlobalPosition;
 
       GameManager.Instance.RacoonCaught();

Assets/Scripts/Gameplay/SC_DecorationAudio.cs

@@ -1,47 +0,0 @@
-using SHADE;
-using SHADE_Scripting.Audio;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-public class DecorationAudio : Script
-{
-  public string name = "REPLACETHIS";
-  public string audio = "event:/UI/botton_hover";
-  public bool loop = true;
-  public float timeDruation = 0.5f;
-  private float timer = 0.0f;
-
-  protected override void awake()
-  {
-    if (audio != "Empty")
-    {
-      AudioHandler.audioClipHandlers[name] = Audio.CreateAudioClip(audio);
-      Audio.AttachAudioClipToObject(AudioHandler.audioClipHandlers[name], GameObject.EntityId);
-    }
-  }
-
-  protected override void start()
-  {
-    if (loop)
-      AudioHandler.audioClipHandlers[name].Play();
-
-  }
-
-  protected override void update()
-  {
-    if (!loop)
-    {
-      timer += Time.DeltaTimeF;
-      if (timer > timeDruation)
-      {
-        timer = 0.0f;
-        AudioHandler.audioClipHandlers[name].Play();
-      }
-    }
-  }
-
-}
-

Assets/Scripts/Gameplay/SC_DecorationAudio.cs.shmeta

@@ -1,3 +0,0 @@
-Name: SC_DecorationAudio
-ID: 166447267
-Type: 9

Assets/Scripts/Gameplay/SC_GameManager.cs

@@ -68,7 +68,7 @@ public class GameManager : Script
     Score = 0;
     currGameState = GameState.START;
     itemScored = false;
-    currMultiplierCombo = 0;
+    currMultiplierCombo = 1;
     currMultiplierDuration = 0;
     itemShatter = false;
     GamePause = false;
@@ -109,6 +109,9 @@ public class GameManager : Script
     AudioHandler.audioClipHandlers["KitchenAmbience"] = Audio.CreateAudioClip("event:/Ambience/roomtone_kitchen");
     AudioHandler.audioClipHandlers["KitchenAmbience"].Play();
 
+    if (SceneFadeInOut.Instance != null)
+      SceneFadeInOut.Instance.CallFadeOut();
+
     GamePause = false;
   }
 
@@ -143,7 +146,7 @@ public class GameManager : Script
         if (currMultiplierDuration >= maxMultiplierDuration)
         {
           itemScored = false;
-          currMultiplierCombo = 0;
+          currMultiplierCombo = 1;
           currMultiplierDuration = 0;
         }
       }
@@ -237,9 +240,9 @@ public class GameManager : Script
 
 
 
-/*
-    if (textBounce)
-      textBounce.ScaleBounceOnce();*/
+
+    //if (textBounce)
+    //  textBounce.ScaleBounceOnce();
 
     if (textBGBounce)
       textBGBounce.ScaleBounceOnce();

Assets/Scripts/Gameplay/SC_PreviewLevel.cs

@@ -9,7 +9,6 @@ namespace SHADE_Scripting.UI
   public class PreviewLevel : Script
   {
     private List<Camera> listOfCamera;
-    public GameObject levelTransistion;
 
     public Vector3 endPoint1;
     public Vector3 endPoint2;
@@ -57,7 +56,7 @@ namespace SHADE_Scripting.UI
 
     protected override void update()
     {
-      if (SceneFadeInOut.Instance && !levelTransistion.GetScript<LevelTransistion>().complete && !point1Done)
+      if (SceneFadeInOut.Instance && !SceneFadeInOut.Instance.FadeOutFinished() && !point1Done)
       {
         moveToEndPoint1.Reset();
         return;

Assets/Scripts/Gameplay/SC_ScoringZone.cs

@@ -22,11 +22,7 @@ public class ScoringZone : Script
   {
     if (GameManager.Instance && info.GameObject.GetScript<Item>() && info.GameObject.IsActiveSelf && !info.GameObject.GetComponent<Collider>().GetCollisionShape(0).IsTrigger )
     {
-      if (GameManager.Instance.currMultiplierCombo > 1)
       GameManager.Instance.Score += info.GameObject.GetScript<Item>().Score * GameManager.Instance.currMultiplierCombo;
-      else
-        GameManager.Instance.Score += info.GameObject.GetScript<Item>().Score;
-
       GameManager.Instance.ItemScored();
       particle.EmissionCount = startingParticleCount * GameManager.Instance.currMultiplierCombo;
       particle.Emit();

Assets/Scripts/UI/EasingHelper.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-public enum EASING_METHOD
-{
+    public enum EASING_METHOD
+    {
         EASE_IN_SINE,
         EASE_OUT_SINE,
         EASE_OUT_BOUNCE,
@@ -14,7 +14,7 @@ public enum EASING_METHOD
         EASE_OUT_CIRCLE,
         EASE_OUT_BACK,
         LINEAR
-}
+    }
 
 public static class EasingHelper
 {

Assets/Scripts/UI/SC_ButtonFX.cs

@@ -54,7 +54,7 @@ namespace SHADE_Scripting.UI
 
         protected override void start()
         {
-            thread = TweenManager.CreateTweenThread(0.1f, 0.9f, 1.0f, EASING_METHOD.EASE_OUT_BACK);
+            thread = TweenManager.CreateTweenThread(0.1f, 0.9f, 1.0f, EASING_METHOD.EASE_IN_SINE);
             
 
             Transform transform = GetComponent<Transform>();

Assets/Scripts/UI/SC_ChangeSceneButton.cs

@@ -7,8 +7,7 @@ public class ChangeSceneButton : Script
 {
     public uint sceneID = 0;
 
-  public GameObject levelTransistion;
-
+    //Whether the scene changing button has been clicked
     private bool clickedFlag;
 
     protected override void awake()
@@ -27,8 +26,9 @@ public class ChangeSceneButton : Script
                 {
                   Audio.PlaySFXOnce2D("event:/UI/success");
                   Audio.StopAllSounds();
+                  if (SceneFadeInOut.Instance != null)
+                    SceneFadeInOut.Instance.CallFadeIn();
                   clickedFlag = true;
-          levelTransistion.SetActive(true);
                 }
             });
         }
@@ -39,7 +39,7 @@ public class ChangeSceneButton : Script
     }
     protected override void update()
     {
-    if (levelTransistion.GetScript<LevelTransistion>().complete && clickedFlag)
+        if (clickedFlag && sceneID != 0 && SceneFadeInOut.Instance.FadeInFinished())
         {
             SceneManager.ChangeScene(sceneID);
         }

Assets/Scripts/UI/SC_CutSceneEnd.cs

@@ -54,9 +54,6 @@ public class CutsceneEnd : Script
   private bool cutscene4Done = false;
   private bool cutscene5Done = false;
 
-  public GameObject levelTransition;
-  private bool waiting = false;
-
   protected override void awake()
   {
     initCutscene4();
@@ -76,9 +73,6 @@ public class CutsceneEnd : Script
 
   protected override void update()
   {
-    if (!levelTransition.GetScript<LevelTransistion>().complete)
-      return;
-
     Canvas4();
     Canvas5();
 
@@ -104,13 +98,9 @@ public class CutsceneEnd : Script
 
     if (Input.GetKeyUp(Input.KeyCode.Space) && cutscene5Done && canvas5.IsActiveSelf)
     {
-      levelTransition.GetScript<LevelTransistion>().resetToLeft();
-      waiting = true;
-    }
-
-    if (levelTransition.GetScript<LevelTransistion>().complete && waiting)
       SceneManager.ChangeScene(nextScene);
     }
+  }
 
   private void Canvas4()
   {

Assets/Scripts/UI/SC_CutsceneIntro.cs

@@ -82,9 +82,6 @@ public class CutsceneIntro : Script
   private bool cutscene2Done = false;
   private bool cutscene3Done = false;
 
-  public GameObject levelTransition;
-  private bool waiting = false;
-
   protected override void awake()
   {
     initCutscene1();
@@ -112,9 +109,6 @@ public class CutsceneIntro : Script
 
   protected override void update()
   {
-    if (!levelTransition.GetScript<LevelTransistion>().complete)
-      return;
-
     Canvas1();
     Canvas2();
     Canvas3();
@@ -154,13 +148,9 @@ public class CutsceneIntro : Script
 
     if (Input.GetKeyUp(Input.KeyCode.Space) && cutscene3Done && canvas3.IsActiveSelf)
     {
-      levelTransition.GetScript<LevelTransistion>().resetToLeft();
-      waiting = true;
-    }
-
-    if (levelTransition.GetScript<LevelTransistion>().complete && waiting)
       SceneManager.ChangeScene(nextScene);
     }
+  }
 
   private void Canvas1()
   {

Assets/Scripts/UI/SC_LevelTransistion.cs

@@ -1,91 +0,0 @@
-using SHADE;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-
-public class LevelTransistion : Script
-{
-
-  public GameObject logo;
-  public GameObject bg;
-  public float duration = 2.0f;
-  public float bgEndPositionX = 2500;
-  public float logoEndPositionX = 2500;
-
-  public bool rotAndScale = true;
-  public float rotationAmt = 360;
-  public float scaleAmt = 631;
-
-  public bool complete { get; set; }
-
-  private Transform logoTran;
-  private Transform bgTran;
-
-  private TweenThread bgTween;
-  private TweenThread logoTween;
-  private TweenThread rot;
-  private TweenThread scale;
-
-  protected override void awake()
-  {
-    logoTran = logo.GetComponent<Transform>();
-    if (!logoTran)
-      Debug.LogError("MISSING LOGO TRAN");
-
-    bgTran = bg.GetComponent<Transform>();
-    if (!bgTran)
-      Debug.LogError("MISSING BG TRAN");
-
-    complete = false;
-  }
-
-  protected override void start()
-  {
-    bgTween = TweenManager.CreateTweenThread(duration, bgTran.LocalPosition.x, bgEndPositionX, EASING_METHOD.EASE_OUT_CIRCLE);
-    logoTween = TweenManager.CreateTweenThread(duration , logoTran.LocalPosition.x, logoEndPositionX, EASING_METHOD.EASE_OUT_CIRCLE);
-    rot = TweenManager.CreateTweenThread(duration , 0, rotationAmt, EASING_METHOD.EASE_OUT_BACK);
-    scale = TweenManager.CreateTweenThread(duration, 0, scaleAmt, EASING_METHOD.EASE_OUT_BACK);
-  }
-
-  protected override void update()
-  {
-    if (bgTween != null)
-      bgTran.LocalPosition = new Vector3(bgTween.GetValue(), 0, bgTran.LocalPosition.z);
-
-    if (rotAndScale)
-    {
-      logoTran.LocalScale = new Vector3(scale.GetValue(), scale.GetValue(), 1);
-      logoTran.LocalEulerAngles = new Vector3(0, 0, SHADE.Math.DegreesToRadians(rot.GetValue()));
-    }
-    else
-    {
-      logoTran.LocalPosition = new Vector3(logoTween.GetValue(), 0, logoTran.LocalPosition.z);
-    }
-
-    if (bgTween.IsCompleted() && logoTween.IsCompleted())
-      complete = true;
-  }
-
-  public void resetToLeft()
-  {
-    logoTran.LocalEulerAngles = Vector3.Zero;
-    logoTran.LocalPosition = Vector3.Zero;
-    logoTran.LocalScale = Vector3.Zero;
-    bgTween.duration = 0.8f;
-    bgTween.Reset(-3000.0f,0.0f);
-    logoTween.duration = 0.8f;
-    logoTween.Reset();
-    rot.duration = 0.8f;
-    rot.Reset();
-    scale.duration = 0.8f;
-    scale.Reset();
-    complete = false;
-    rotAndScale = true;
-  }
-
-
-}
-

Assets/Scripts/UI/SC_LevelTransistion.cs.shmeta

@@ -1,3 +0,0 @@
-Name: SC_LevelTransistion
-ID: 158044875
-Type: 9

Assets/Scripts/UI/SC_MainMenu.cs

@@ -26,7 +26,6 @@ public class MainMenu : Script
   {
     Input.SetMouseCentering(false);
     Application.IsCursorVisible = true;
-    if(SceneFadeInOut.Instance)
     SceneFadeInOut.Instance.CallFadeOut();
   }
   protected override void update()

Assets/Scripts/UI/SC_MultiplierTextFx.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace SHADE_Scripting.UI
@@ -41,13 +40,8 @@ namespace SHADE_Scripting.UI
 
     protected override void update()
     {
-
-      if (sizeThread == null || sizeInvertThread == null)
-        return;
-
       Transform transform = GetComponent<Transform>();
 
-      GetComponent<TextRenderable>().Text = $"X {GameManager.Instance.currMultiplierCombo}";
 
       if (transform != null)
       {
@@ -72,6 +66,7 @@ namespace SHADE_Scripting.UI
 
         public void ShowMultiplier(int multiplier, float duration)
         {
+            GetComponent<TextRenderable>().Text = $"X {multiplier}";
             sizeThread.duration = duration + sizeUpDuration;
 
             sizeInvertThread.Reset();

Assets/Scripts/UI/SC_Results.cs

@@ -14,7 +14,6 @@ public class Results : Script
   public GameObject maxCombo;
   public GameObject finalScore;
   public GameObject contiuneBtn;
-  public GameObject levelTransition;
   public uint nextScene;
   public float scoreTweenDur = 2.0f;
 
@@ -74,7 +73,9 @@ public class Results : Script
     {
       contiune.OnRelease.RegisterAction(() =>
       {
-        levelTransition.GetScript<LevelTransistion>().resetToLeft();
+        if (SceneFadeInOut.Instance != null)
+          SceneFadeInOut.Instance.CallFadeIn();
+
         waitForTransition = true;
 
         GameManager.Instance.GamePause = false;
@@ -92,7 +93,7 @@ public class Results : Script
 
   protected override void update()
   {
-    if (levelTransition.GetScript<LevelTransistion>().complete && waitForTransition)
+    if (SceneFadeInOut.Instance && SceneFadeInOut.Instance.FadeInFinished() && waitForTransition)
     {
       Audio.StopAllSounds();
       SceneManager.ChangeScene(nextScene);

Assets/Scripts/UI/SC_ScaleBounce.cs

@@ -1,4 +1,4 @@
-using SHADE;
+using SHADE;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,7 +27,7 @@ namespace SHADE_Scripting.UI
         {
             thread = TweenManager.CreateTweenThread(duration, minScale, maxScale, EASING_METHOD.EASE_IN_SINE);
             Transform trans = GetComponent<Transform>();
-      if (trans != null)
+            if(trans != null)
             {
                 defaultScale = trans.LocalScale;
             }
@@ -35,22 +35,20 @@ namespace SHADE_Scripting.UI
 
         protected override void update()
         {
-
             if (thread == null)
               return;
-
-      if (isActive != lastActive && isActive == true)
+            if(isActive != lastActive && isActive == true)
 			      {
               thread.Reset();
 			      }
             lastActive = isActive;
 
             Transform trans = GetComponent<Transform>();
-      if (trans != null && isActive)
+            if(trans != null && isActive)
             {
                 trans.LocalScale = defaultScale * thread.GetValue();
             }
-      if (thread.IsCompleted())
+            if(thread.IsCompleted())
             {
                 thread.ResetInvert();
             }

Assets/Scripts/UI/SC_ScrollingCredits.cs

@@ -7,12 +7,11 @@ using System.Threading.Tasks;
 
 namespace SHADE_Scripting.UI
 {
-  public class ScrollingCredits : Script
+    public class ScrollingCredits: Script
     {
 
         public float endY = 4000.0f;
         public float duration = 30.0f;
-    public GameObject levelTransition;
 
 
         [NonSerialized]
@@ -26,9 +25,10 @@ namespace SHADE_Scripting.UI
 
         protected override void start()
         {
+            base.start();
 
             Transform transform = GetComponent<Transform>();
-      if (transform != null)
+            if(transform != null)
             {
                 thread = TweenManager.CreateTweenThread(duration, transform.LocalPosition.y, endY, EASING_METHOD.LINEAR);
                 thread.SetResetOnInactive(GameObject);
@@ -37,12 +37,13 @@ namespace SHADE_Scripting.UI
 
         protected override void update()
         {
+            base.update();
 
             Transform transform = GetComponent<Transform>();
 
-      if (thread != null && transform != null)
+            if(thread != null && transform !=  null)
             {
-        transform.LocalPosition = new Vector3(transform.LocalPosition.x, thread.GetValue(), transform.LocalPosition.z);
+                transform.LocalPosition = new Vector3( transform.LocalPosition.x ,thread.GetValue() , transform.LocalPosition.z);
             }
         }
     }

Assets/Scripts/UI/SC_SingleScaleBounce.cs

@@ -38,7 +38,7 @@ namespace SHADE_Scripting.UI
     protected override void start()
     {
       
-        thread = TweenManager.CreateTweenThread(0.0f, 1.0f, 1.0f, EASING_METHOD.LINEAR);
+        thread = TweenManager.CreateTweenThread(0.0f, 1.0f, 1.0f, EASING_METHOD.EASE_IN_SINE);
     }
 
 
@@ -50,7 +50,6 @@ namespace SHADE_Scripting.UI
         {
           scaleUp = false;
           thread.duration = durationDown;
-          thread.method = EASING_METHOD.LINEAR;
           thread.ResetInvert();
         }
       }
@@ -66,7 +65,6 @@ namespace SHADE_Scripting.UI
       {
         thread.duration = durationUp;
         thread.Reset(1.0f, scaleSize);
-        thread.method = EASING_METHOD.EASE_OUT_BACK;
       }
       else
       {

Assets/Scripts/UI/SC_StealFoodPopUp.cs

@@ -35,9 +35,9 @@ public class StealFoodPopUp : Script
 
   protected override void start()
   {
-    rot = TweenManager.CreateTweenThread(popInDuration * 0.4f, 0, rotationAmt, EASING_METHOD.LINEAR);
-    scaleX = TweenManager.CreateTweenThread(popInDuration, 0, scaleAmtX, EASING_METHOD.EASE_OUT_BACK);
-    scaleY = TweenManager.CreateTweenThread(popInDuration, 0, scaleAmtY, EASING_METHOD.EASE_OUT_BACK);
+    rot = TweenManager.CreateTweenThread(popInDuration, 0, rotationAmt, EASING_METHOD.EASE_IN_SINE);
+    scaleX = TweenManager.CreateTweenThread(popInDuration, 0, scaleAmtX, EASING_METHOD.EASE_IN_SINE);
+    scaleY = TweenManager.CreateTweenThread(popInDuration, 0, scaleAmtY, EASING_METHOD.EASE_IN_SINE);
 
     tran = GetComponent<Transform>();
     if (!tran)

Assets/Shaders/UI_TRANSISTION_FS.glsl

@@ -1,41 +0,0 @@
-#version 450
-#extension GL_ARB_separate_shader_objects : enable
-#extension GL_ARB_shading_language_420pack : enable
-#extension GL_EXT_nonuniform_qualifier : require
-
-struct MatPropData
-{
-  int textureIndex;
-  float alpha;
-};
-
-layout(location = 0) in struct
-{
-  vec4 vertPos; // location 0
-  vec2 uv; // location = 1
-  vec4 normal; // location = 2
-
-} In;
-
-// material stuff
-layout(location = 3) flat in struct
-{
-  int materialIndex;
-  uint eid;
-  uint lightLayerIndex;
-} In2;
-
-layout (set = 0, binding = 1) uniform sampler2D textures[]; // for textures (global)
-layout (std430, set = 2, binding = 0) buffer MaterialProperties     // For materials 
-{
-  MatPropData data[];
-} MatProp;
-
-layout(location = 0) out vec4 fragColor;
-layout(location = 1) out uint outEntityID;
-
-void main()
-{
-  fragColor = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv);
-  outEntityID = In2.eid;
-}

Assets/Shaders/UI_TRANSISTION_FS.shshaderb.shmeta

@@ -1,3 +0,0 @@
-Name: UI_TRANSISTION_FS
-ID: 40208610
-Type: 2

Assets/Texture/UI/TX_TransistionBG.shtex.shmeta

@@ -1,3 +0,0 @@
-Name: TX_TransistionBG
-ID: 50770098
-Type: 3

SHADE_Engine/src/Graphics/Descriptors/SHVkDescriptorPool.h

@@ -47,7 +47,7 @@ namespace SHADE
             /// <summary>
             /// Maximum number of descriptor sets allowed
             /// </summary>
-            uint32_t MaxSets = 300;
+            uint32_t MaxSets = 100;
             /// <summary>
             /// Flags used to create the DescriptorPool
             /// </summary>