Finish* Mario1-1

This is the version of Mario1-1 that I build and submitted. It still is missing a bunch of stuff, but due dates and stuff...
mfs16101 · Mar 5, 2020 · 8abaeeb6e9d410f59dedec4b228636c1af460ef5 · 8abaeeb
1 parent 9fe572d
commit 8abaeeb6e9d410f59dedec4b228636c1af460ef5
Unified Split

Showing 17,575 changed files with 232,982 additions and 479,645 deletions.
diff --git a/...cts/Corgi1-1/Assets/CorgiEngine/Common/Scripts/Agents/CharacterAbilities/CharacterJump.cs b/...cts/Corgi1-1/Assets/CorgiEngine/Common/Scripts/Agents/CharacterAbilities/CharacterJump.cs
@@ -504,7 +504,7 @@ public virtual void ResetJumpButtonReleased()
        /// </summary>
        protected override void InitializeAnimatorParameters()
 		{
-  
-			RegisterAnimatorParameter (_jumpingAnimationParameterName, AnimatorControllerParameterType.Bool, out _jumpingAnimationParameter);
+  
+			RegisterAnimatorParameter ("Jumping", AnimatorControllerParameterType.Bool, out _jumpingAnimationParameter);
 			RegisterAnimatorParameter (_doubleJumpingAnimationParameterName, AnimatorControllerParameterType.Bool, out _doubleJumpingAnimationParameter);
 			RegisterAnimatorParameter (_hitTheGroundAnimationParameterName, AnimatorControllerParameterType.Bool, out _hitTheGroundAnimationParameter);
 		}

diff --git a/...s/Corgi1-1/Assets/CorgiEngine/Demos/Corgi2D/Animations/Environment/bonus-block.controller b/...s/Corgi1-1/Assets/CorgiEngine/Demos/Corgi2D/Animations/Environment/bonus-block.controller
@@ -3,8 +3,9 @@
 --- !u!91 &9100000
 AnimatorController:
  m_ObjectHideFlags: 0
-  
-  m_PrefabParentObject: {fileID: 0}
-  
-  m_PrefabInternal: {fileID: 0}
+  
+  m_CorrespondingSourceObject: {fileID: 0}
+  
+  m_PrefabInstance: {fileID: 0}
+  
+  m_PrefabAsset: {fileID: 0}
  m_Name: bonus-block
  serializedVersion: 5
  m_AnimatorParameters:
@@ -36,8 +37,9 @@ AnimatorController:
 --- !u!1101 &110131496
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
-  
-  m_PrefabParentObject: {fileID: 0}
-  
-  m_PrefabInternal: {fileID: 0}
+  
+  m_CorrespondingSourceObject: {fileID: 0}
+  
+  m_PrefabInstance: {fileID: 0}
+  
+  m_PrefabAsset: {fileID: 0}
  m_Name: 
  m_Conditions:
  - m_ConditionMode: 2
@@ -60,8 +62,9 @@ AnimatorStateTransition:
 --- !u!1101 &110147390
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
-  
-  m_PrefabParentObject: {fileID: 0}
-  
-  m_PrefabInternal: {fileID: 0}
+  
+  m_CorrespondingSourceObject: {fileID: 0}
+  
+  m_PrefabInstance: {fileID: 0}
+  
+  m_PrefabAsset: {fileID: 0}
  m_Name: 
  m_Conditions:
  - m_ConditionMode: 1
@@ -84,8 +87,9 @@ AnimatorStateTransition:
 --- !u!1101 &110158964
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
-  
-  m_PrefabParentObject: {fileID: 0}
-  
-  m_PrefabInternal: {fileID: 0}
+  
+  m_CorrespondingSourceObject: {fileID: 0}
+  
+  m_PrefabInstance: {fileID: 0}
+  
+  m_PrefabAsset: {fileID: 0}
  m_Name: 
  m_Conditions:
  - m_ConditionMode: 1
@@ -109,8 +113,9 @@ AnimatorStateTransition:
 AnimatorState:
  serializedVersion: 5
  m_ObjectHideFlags: 1
-  
-  m_PrefabParentObject: {fileID: 0}
-  
-  m_PrefabInternal: {fileID: 0}
+  
+  m_CorrespondingSourceObject: {fileID: 0}
+  
+  m_PrefabInstance: {fileID: 0}
+  
+  m_PrefabAsset: {fileID: 0}
  m_Name: bonus-block-off
  m_Speed: 1
  m_CycleOffset: 0
@@ -123,17 +128,20 @@ AnimatorState:
  m_SpeedParameterActive: 0
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
+  
+  m_TimeParameterActive: 0
  m_Motion: {fileID: 7400000, guid: c4ae2473d7449f74b8a751b1364db695, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
+  
+  m_TimeParameter: 
 --- !u!1102 &110249268
 AnimatorState:
  serializedVersion: 5
  m_ObjectHideFlags: 1
-  
-  m_PrefabParentObject: {fileID: 0}
-  
-  m_PrefabInternal: {fileID: 0}
+  
+  m_CorrespondingSourceObject: {fileID: 0}
+  
+  m_PrefabInstance: {fileID: 0}
+  
+  m_PrefabAsset: {fileID: 0}
  m_Name: bonus-block-idle
  m_Speed: 1
  m_CycleOffset: 0
@@ -147,17 +155,20 @@ AnimatorState:
  m_SpeedParameterActive: 0
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
+  
+  m_TimeParameterActive: 0
  m_Motion: {fileID: 7400000, guid: e838f3b74f9f14b33a00b88922b9d79d, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
+  
+  m_TimeParameter: 
 --- !u!1102 &110299584
 AnimatorState:
  serializedVersion: 5
  m_ObjectHideFlags: 1
-  
-  m_PrefabParentObject: {fileID: 0}
-  
-  m_PrefabInternal: {fileID: 0}
+  
+  m_CorrespondingSourceObject: {fileID: 0}
+  
+  m_PrefabInstance: {fileID: 0}
+  
+  m_PrefabAsset: {fileID: 0}
  m_Name: bonus-block-hit
  m_Speed: 1
  m_CycleOffset: 0
@@ -172,17 +183,20 @@ AnimatorState:
  m_SpeedParameterActive: 0
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
+  
+  m_TimeParameterActive: 0
  m_Motion: {fileID: 7400000, guid: 29846c98a0e1a42028b9c24b9b1b92f7, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
+  
+  m_TimeParameter: 
 --- !u!1107 &110701856
 AnimatorStateMachine:
  serializedVersion: 5
  m_ObjectHideFlags: 1
-  
-  m_PrefabParentObject: {fileID: 0}
-  
-  m_PrefabInternal: {fileID: 0}
+  
+  m_CorrespondingSourceObject: {fileID: 0}
+  
+  m_PrefabInstance: {fileID: 0}
+  
+  m_PrefabAsset: {fileID: 0}
  m_Name: Base Layer
  m_ChildStates:
  - serializedVersion: 1
@@ -197,10 +211,7 @@ AnimatorStateMachine:
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
-  
-  m_StateMachineTransitions:
-  
-    data:
-  
-      first: {fileID: 110701856}
-  
-      second: []
+  
+  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
  m_AnyStatePosition: {x: 50, y: 20, z: 0}
  m_EntryPosition: {x: 48, y: 84, z: 0}