Menu

Assets/!Scenes/Main Menu.unity

@@ -121,6 +121,8 @@ GameObject:
   serializedVersion: 4
   m_Component:
   - 4: {fileID: 41973518}
+  - 114: {fileID: 41973519}
+  - 114: {fileID: 41973517}
   m_Layer: 0
   m_Name: GameObject
   m_TagString: Untagged
@@ -128,6 +130,19 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!114 &41973517
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 41973516}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e33ba5066fe01747b2722e6f089a2ba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  MAX_PLAYER_COUNT: 3
+  InputMapperAsset: {fileID: 11400000, guid: c1d726eedc374be4fb2ebc66c9c5a740, type: 2}
 --- !u!4 &41973518
 Transform:
   m_ObjectHideFlags: 0
@@ -140,6 +155,22 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 9
+--- !u!114 &41973519
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 41973516}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 18963c1adc6e46a44945d8adbfbd4984, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  players:
+  - {fileID: 1385875579}
+  - {fileID: 1992441096}
+  - {fileID: 162809795}
+  levelIndex: 0
 --- !u!1 &73358719
 GameObject:
   m_ObjectHideFlags: 0
@@ -207,6 +238,10 @@ RectTransform:
   m_AnchoredPosition: {x: 1, y: 2.5}
   m_SizeDelta: {x: -2, y: 1}
   m_Pivot: {x: .5, y: .5}
+--- !u!1 &162809795 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 174484, guid: a764c76ab0e67034e831bc131a6fc125, type: 2}
+  m_PrefabInternal: {fileID: 1894807474}
 --- !u!1 &278495163
 GameObject:
   m_ObjectHideFlags: 0
@@ -705,6 +740,10 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 5
+--- !u!1 &1385875579 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 151258, guid: 1f33abf9b70c2cd48ad44a629a461e13, type: 2}
+  m_PrefabInternal: {fileID: 1964798505}
 --- !u!1 &1475565317
 GameObject:
   m_ObjectHideFlags: 0
@@ -815,6 +854,14 @@ Prefab:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 9503304, guid: 27ed278a18b2cff4dbb18e557bedc172, type: 2}
+      propertyPath: m_Controller
+      value: 
+      objectReference: {fileID: 9100000, guid: dbbf95160eac57b44bf280d85d0727d3, type: 2}
+    - target: {fileID: 9503304, guid: 27ed278a18b2cff4dbb18e557bedc172, type: 2}
+      propertyPath: m_ApplyRootMotion
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 14394462, guid: 27ed278a18b2cff4dbb18e557bedc172, type: 2}
     - {fileID: 11435238, guid: 27ed278a18b2cff4dbb18e557bedc172, type: 2}
@@ -907,6 +954,10 @@ Prefab:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 9573504, guid: a764c76ab0e67034e831bc131a6fc125, type: 2}
+      propertyPath: m_Controller
+      value: 
+      objectReference: {fileID: 9100000, guid: dbbf95160eac57b44bf280d85d0727d3, type: 2}
     m_RemovedComponents:
     - {fileID: 11469674, guid: a764c76ab0e67034e831bc131a6fc125, type: 2}
     - {fileID: 5440290, guid: a764c76ab0e67034e831bc131a6fc125, type: 2}
@@ -956,6 +1007,14 @@ Prefab:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 9536648, guid: 1f33abf9b70c2cd48ad44a629a461e13, type: 2}
+      propertyPath: m_Controller
+      value: 
+      objectReference: {fileID: 9100000, guid: dbbf95160eac57b44bf280d85d0727d3, type: 2}
+    - target: {fileID: 9536648, guid: 1f33abf9b70c2cd48ad44a629a461e13, type: 2}
+      propertyPath: m_ApplyRootMotion
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 14346420, guid: 1f33abf9b70c2cd48ad44a629a461e13, type: 2}
     - {fileID: 11438390, guid: 1f33abf9b70c2cd48ad44a629a461e13, type: 2}
@@ -965,6 +1024,10 @@ Prefab:
 Transform:
   m_PrefabParentObject: {fileID: 406040, guid: 1f33abf9b70c2cd48ad44a629a461e13, type: 2}
   m_PrefabInternal: {fileID: 1964798505}
+--- !u!1 &1992441096 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 177628, guid: 27ed278a18b2cff4dbb18e557bedc172, type: 2}
+  m_PrefabInternal: {fileID: 1755418034}
 --- !u!1 &1996823722
 GameObject:
   m_ObjectHideFlags: 0

Assets/ControllerMapper.asset

@@ -38,7 +38,7 @@ MonoBehaviour:
   - name: Menu
     ButtonActions:
     - name: Dash
-      XboxButtons: 
+      XboxButtons: 00000000010000000200000003000000
       KeyboardKeys: 
     AxisRanges: []
     ButtonStates: []

Assets/prefabs/characters/Source/Animator_controllers/Unity_Menu_anims.controller

@@ -5,7 +5,7 @@ AnimatorController:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_Name: Unity_Free_anims
+  m_Name: Unity_Menu_anims
   serializedVersion: 5
   m_AnimatorParameters:
   - m_Name: Walk
@@ -38,6 +38,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
+  - m_Name: Dashing
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -249,7 +255,7 @@ AnimatorStateTransition:
   m_Name: 
   m_Conditions:
   - m_ConditionMode: 1
-    m_ConditionEvent: Dash
+    m_ConditionEvent: Dashing
     m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 110291569}
@@ -272,8 +278,8 @@ AnimatorStateTransition:
   m_PrefabInternal: {fileID: 0}
   m_Name: 
   m_Conditions:
-  - m_ConditionMode: 4
+  - m_ConditionMode: 2
-    m_ConditionEvent: Walk
+    m_ConditionEvent: Dashing
     m_EventTreshold: .200000003
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 110200000}

ProjectSettings/ProjectSettings.asset

@@ -60,11 +60,23 @@ PlayerSettings:
   xboxSpeechDB: 0
   xboxEnableHeadOrientation: 0
   xboxEnableGuest: 0
+  n3dsDisableStereoscopicView: 0
+  n3dsEnableSharedListOpt: 1
+  n3dsEnableVSync: 0
   xboxOneResolution: 0
   ps3SplashScreen: {fileID: 0}
   videoMemoryForVertexBuffers: 0
   psp2PowerMode: 0
   psp2AcquireBGM: 1
+  wiiUTVResolution: 0
+  wiiUGamePadMSAA: 1
+  wiiUSupportsNunchuk: 0
+  wiiUSupportsClassicController: 0
+  wiiUSupportsBalanceBoard: 0
+  wiiUSupportsMotionPlus: 0
+  wiiUSupportsProController: 0
+  wiiUAllowScreenCapture: 1
+  wiiUControllerCount: 0
   m_SupportedAspectRatios:
     4:3: 1
     5:4: 1
@@ -77,20 +89,26 @@ PlayerSettings:
   metroEnableIndependentInputSource: 0
   metroEnableLowLatencyPresentationAPI: 0
   xboxOneDisableKinectGpuReservation: 0
+  virtualRealitySupported: 0
   productGUID: dbca7936984e94248bf9f90833bc0c3a
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 9
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   apiCompatibilityLevel: 2
+  stripEngineCode: 1
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
+  iPhoneBuildNumber: 0
   ForceInternetPermission: 0
   ForceSDCardPermission: 0
   CreateWallpaper: 0
   APKExpansionFiles: 0
   preloadShaders: 0
   StripUnusedMeshComponents: 0
+  VertexChannelCompressionMask:
+    serializedVersion: 2
+    m_Bits: 238
   iPhoneSdkVersion: 988
   iPhoneTargetOSVersion: 22
   uIPrerenderedIcon: 0
@@ -136,6 +154,23 @@ PlayerSettings:
   m_BuildTargetGraphicsAPIs: []
   webPlayerTemplate: APPLICATION:Default
   m_TemplateCustomTags: {}
+  wiiUTitleID: 0005000011000000
+  wiiUGroupID: 00010000
+  wiiUCommonSaveSize: 4096
+  wiiUAccountSaveSize: 2048
+  wiiUOlvAccessKey: 0
+  wiiUTinCode: 0
+  wiiUJoinGameId: 0
+  wiiUJoinGameModeMask: 0000000000000000
+  wiiUCommonBossSize: 0
+  wiiUAccountBossSize: 0
+  wiiUAddOnUniqueIDs: []
+  wiiUMainThreadStackSize: 3072
+  wiiULoaderThreadStackSize: 1024
+  wiiUSystemHeapSize: 128
+  wiiUTVStartupScreen: {fileID: 0}
+  wiiUGamePadStartupScreen: {fileID: 0}
+  wiiUProfilerLibPath: 
   actionOnDotNetUnhandledException: 1
   enableInternalProfiler: 0
   logObjCUncaughtExceptions: 1
@@ -186,15 +221,18 @@ PlayerSettings:
   ps4BackgroundImagePath: 
   ps4StartupImagePath: 
   ps4SaveDataImagePath: 
+  ps4SdkOverride: 
   ps4BGMPath: 
   ps4ShareFilePath: 
   ps4NPtitleDatPath: 
   ps4RemotePlayKeyAssignment: -1
+  ps4RemotePlayKeyMappingDir: 
   ps4EnterButtonAssignment: 1
   ps4ApplicationParam1: 0
   ps4ApplicationParam2: 0
   ps4ApplicationParam3: 0
   ps4ApplicationParam4: 0
+  ps4DownloadDataSize: 0
   ps4GarlicHeapSize: 2048
   ps4Passcode: 3mJ7tLHOsT9jNvqC8LNjpnotcWDQLy4O
   ps4pnSessions: 1
@@ -202,6 +240,11 @@ PlayerSettings:
   ps4pnFriends: 1
   ps4pnGameCustomData: 1
   playerPrefsSupport: 0
+  ps4ReprojectionSupport: 0
+  ps4attribUserManagement: 0
+  ps4attribMoveSupport: 0
+  ps4attrib3DSupport: 0
+  ps4attribShareSupport: 0
   monoEnv: 
   psp2Splashimage: {fileID: 0}
   psp2NPTrophyPackPath: 
@@ -250,7 +293,6 @@ PlayerSettings:
   psp2InfoBarOnStartup: 0
   psp2InfoBarColor: 0
   psmSplashimage: {fileID: 0}
-  virtualRealitySupported: 0
   spritePackerPolicy: 
   scriptingDefineSymbols: {}
   metroPackageName: GameJamProject
@@ -342,6 +384,17 @@ PlayerSettings:
   tizenSigningProfileName: 
   tizenGPSPermissions: 0
   tizenMicrophonePermissions: 0
+  n3dsUseExtSaveData: 0
+  n3dsCompressStaticMem: 1
+  n3dsExtSaveDataNumber: 0x12345
+  n3dsStackSize: 131072
+  n3dsTargetPlatform: 2
+  n3dsRegion: 7
+  n3dsMediaSize: 0
+  n3dsLogoStyle: 3
+  n3dsTitle: GameName
+  n3dsProductCode: 
+  n3dsApplicationId: 0xFF3FF
   stvDeviceAddress: 
   stvProductDescription: 
   stvProductAuthor: 
@@ -407,7 +460,6 @@ PlayerSettings:
   additionalIl2CppArgs::additionalIl2CppArgs: 
   firstStreamedSceneWithResources: 0
   cloudProjectId: 
-  projectId: 
   projectName: 
   organizationId: 
   cloudEnabled: 0

ProjectSettings/ProjectSettings.asset.orig

@@ -8,10 +8,6 @@ PlayerSettings:
   defaultScreenOrientation: 4
   targetDevice: 2
   targetResolution: 0
-<<<<<<< Updated upstream
-  useOnDemandResources: 0
-=======
->>>>>>> Stashed changes
   accelerometerFrequency: 60
   companyName: DefaultCompany
   productName: GameJamProject
@@ -64,12 +60,6 @@ PlayerSettings:
   xboxSpeechDB: 0
   xboxEnableHeadOrientation: 0
   xboxEnableGuest: 0
-<<<<<<< Updated upstream
-  n3dsDisableStereoscopicView: 0
-  n3dsEnableSharedListOpt: 1
-  n3dsEnableVSync: 0
-=======
->>>>>>> Stashed changes
   xboxOneResolution: 0
   ps3SplashScreen: {fileID: 0}
   videoMemoryForVertexBuffers: 0
@@ -212,17 +202,14 @@ PlayerSettings:
   ps4pnFriends: 1
   ps4pnGameCustomData: 1
   playerPrefsSupport: 0
-<<<<<<< Updated upstream
+<<<<<<< HEAD
   ps4ReprojectionSupport: 0
-  ps4UseAudio3dBackend: 0
-  ps4Audio3dVirtualSpeakerCount: 14
   ps4attribUserManagement: 0
   ps4attribMoveSupport: 0
   ps4attrib3DSupport: 0
   ps4attribShareSupport: 0
-  ps4IncludedModules: []
 =======
->>>>>>> Stashed changes
+>>>>>>> c9562f239ec5a9435e8dc8fd296535a6d3e0c549
   monoEnv: 
   psp2Splashimage: {fileID: 0}
   psp2NPTrophyPackPath: 
@@ -425,10 +412,7 @@ PlayerSettings:
   - additionalIl2CppArgs::additionalIl2CppArgs
   WebGL::emscriptenArgs: 
   WebGL::template: APPLICATION:Default
-<<<<<<< Updated upstream
   additionalIl2CppArgs::additionalIl2CppArgs: 
-=======
->>>>>>> Stashed changes
   firstStreamedSceneWithResources: 0
   cloudProjectId: 
   projectId: