Commit 13e8717c authored by mmaluschnig's avatar mmaluschnig
Browse files

Merge branch 'mimemime' into piethrowing

* mimemime: (25 commits)
  fixed weird drop after animation
  saved all prefabs
  player walk animation works
  added walking abnimation to player in scene
  attempted fix for walk
  merged master into daytime
  now the player can have a walking animation
  updated the other characters scripts to give replies
  player responses are now spaced nicely
  added an angle meter for pie throwing
  Added platforms to place characters on.
  starting work on player replies
  fixed character interactions and the timers on the dialoue box
  random song will be played from tent when the player walks near (song randomly chosen at start)
  praise the sun
  added sky
  added cream pie texture
  tent gives visual display when ready to interact
  Added ability to get to performance from daytime scene
  Created a main menu, player can cycle through: main menu --> Daytime -->pause -->main Menu
  ...

# Conflicts:
#	RingMaster/RingMaster/Assets/Textures/John Smith-1.png.meta
#	RingMaster/RingMaster/ProjectSettings/ProjectVersion.txt
parents af0652dd 80010280
fileFormatVersion: 2
guid: 16273fbcbecb1fa40ac8b1507b002230
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: PlayerController
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Walking
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1107216517004898432}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1101036174951604076
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Walking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102218952275480054}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101711192152771518
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Walking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102214308677118360}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102214308677118360
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Player_Walk
m_Speed: 1.5
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101036174951604076}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 93c664a1a29e7ba47aacf614c29de2f5, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102218952275480054
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Player_Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101711192152771518}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 713f63ebd55dbdd41a4b46a0788c787c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107216517004898432
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102214308677118360}
m_Position: {x: 372, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102218952275480054}
m_Position: {x: 372, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102218952275480054}
fileFormatVersion: 2
guid: ab02b6cdb55ff1a488fc01228184f362
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Player_Idle
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
fileFormatVersion: 2
guid: 713f63ebd55dbdd41a4b46a0788c787c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Player_Walk
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: 811070ce6357e654ba51484483ef25c4, type: 3}
- time: 0.5
value: {fileID: 21300002, guid: 811070ce6357e654ba51484483ef25c4, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 2
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: 811070ce6357e654ba51484483ef25c4, type: 3}
- {fileID: 21300002, guid: 811070ce6357e654ba51484483ef25c4, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
fileFormatVersion: 2
guid: 93c664a1a29e7ba47aacf614c29de2f5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -63,23 +63,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1232486959068676
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224897134811953066}
- component: {fileID: 222152718266836164}
- component: {fileID: 114369037744403530}
m_Layer: 5
m_Name: PrimarySpeech
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1297585788650952
GameObject:
m_ObjectHideFlags: 1
......@@ -122,7 +105,6 @@ GameObject:
m_Component:
- component: {fileID: 4967593859512098}
- component: {fileID: 20141266176392738}
- component: {fileID: 81779262949043148}
- component: {fileID: 114609290062385056}
m_Layer: 0
m_Name: FaceCam
......@@ -288,13 +270,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 4, y: 2.57}
m_EdgeRadius: 0
--- !u!81 &81779262949043148
AudioListener:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1516274406560312}
m_Enabled: 1
--- !u!114 &114094690266867812
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -382,39 +357,6 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114369037744403530
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1232486959068676}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.01886791, g: 0.01886791, b: 0.01886791, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 7
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Didnt want to admire my glorious beard?
--- !u!114 &114430094776694032
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -427,6 +369,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1297585788650952}
isCamera: 0
--- !u!114 &114609290062385056
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -439,6 +382,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1201578362876714}
isCamera: 1
--- !u!114 &114787342697137634
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -451,9 +395,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
interactButton: {fileID: 114816900526660398}
speechBox: {fileID: 114369037744403530}
playerResponses:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
secondarySpeechBox: {fileID: 114151550790006464}
playerbutton1: {fileID: 0}
faceCam: {fileID: 20141266176392738}
--- !u!114 &114808308278263708
MonoBehaviour:
......@@ -607,13 +554,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!222 &222152718266836164
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1232486959068676}
m_CullTransparentMesh: 0
--- !u!222 &222176497958174252
CanvasRenderer:
m_ObjectHideFlags: 1
......@@ -685,7 +625,6 @@ RectTransform:
m_LocalScale: {x: 0.01, y: 0.01, z: 1}
m_Children:
- {fileID: 224018282793070894}
- {fileID: 224897134811953066}
- {fileID: 224511774531789040}
m_Father: {fileID: 4885089913599246}
m_RootOrder: 1
......@@ -706,7 +645,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224304718089781694}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -731,21 +670,3 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -21.7}
m_SizeDelta: {x: 126, y: 19.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224897134811953066
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1232486959068676}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224304718089781694}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 5}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -38,6 +38,7 @@ GameObject:
- component: {fileID: 50961624618835074}
- component: {fileID: 114569653573630594}
- component: {fileID: 70805503887653740}
- component: {fileID: 95533117904520456}
m_Layer: 9
m_Name: Player
m_TagString: Player
......@@ -104,9 +105,27 @@ CapsuleCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.12, y: -0.06}
m_Offset: {x: 0, y: -0.06}
m_Size: {x: 1.11, y: 2.52}
m_Direction: 0
--- !u!95 &95533117904520456
Animator:
serializedVersion: 3
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1417095342401676}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: ab02b6cdb55ff1a488fc01228184f362, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &114569653573630594
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -162,7 +181,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 2.56, y: 2.56}
m_Size: {x: 1.08, y: 2.4}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
......
......@@ -20,7 +20,6 @@ GameObject:
m_Component:
- component: {fileID: 4934155815108812}
- component: {fileID: 20235399982903688}
- component: {fileID: 81365263224242478}
- component: {fileID: 114572358706682802}
m_Layer: 0
m_Name: FaceCam
......@@ -288,13 +287,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 4, y: 2.11}
m_EdgeRadius: 0
--- !u!81 &81365263224242478
AudioListener:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1001696896877634}
m_Enabled: 1
--- !u!114 &114195279910367104
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -351,6 +343,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1766672496195326}
isCamera: 0
--- !u!114 &114497828420707912
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -431,6 +424,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1766672496195326}
isCamera: 1
--- !u!114 &114589071008195712
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -509,9 +503,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
interactButton: {fileID: 114497828420707912}
speechBox: {fileID: 114589071008195712}
playerResponses:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
secondarySpeechBox: {fileID: 114195279910367104}
playerbutton1: {fileID: 0}
faceCam: {fileID: 20235399982903688}
--- !u!114 &114686253410882298
MonoBehaviour:
......
......@@ -158,7 +158,6 @@ GameObject:
m_Component:
- component: {fileID: 4200239802958770}