Commit 0476f5e7 authored by Sebastian Woelfel's avatar Sebastian Woelfel
Browse files

Merge branch 'master' of...

Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/sommersemester-2019/unity/baba-is-mutated

# Conflicts:
#	Assets/_Game/Animations/bloeki_normal_teleport.meta
#	Assets/_Game/Prefabs/EventSystem.prefab.meta
#	Assets/_Game/Scenes/Level 1.unity
#	Assets/_Game/Scenes/Level 2.unity
#	Assets/_Game/Sprites/Tilesets/TileSet.meta
parents 96f4c5b7 7845f7d5
fileFormatVersion: 2
guid: 5d9c531fa17515f44b7f9de1bc23a2ea
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-7861725244470691817
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2142342729161769938}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.87603307
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TeleportConnection
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1763406336816974424}
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!1107 &1763406336816974424
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 3419343595343456642}
m_Position: {x: 420, y: 100, z: 0}
- serializedVersion: 1
m_State: {fileID: 2142342729161769938}
m_Position: {x: 426.58844, y: -25.877075, 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: 3419343595343456642}
--- !u!1102 &2142342729161769938
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New State
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
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: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &3419343595343456642
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Teleport_idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -7861725244470691817}
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: 23ec9eba60e3e29448554c73c4b60057, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
fileFormatVersion: 2
guid: e1cbc4c73cd3c5a4a92120d33ad971a3
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_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Teleport_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:
- curve:
- time: 0
value: {fileID: 4253574620111100184, guid: f4c3c3c4dbbc3ca418174718e5861c0a,
type: 3}
- time: 0.21666667
value: {fileID: 5314537831131735668, guid: f4c3c3c4dbbc3ca418174718e5861c0a,
type: 3}
- time: 0.45
value: {fileID: 8702915973739090778, guid: f4c3c3c4dbbc3ca418174718e5861c0a,
type: 3}
- time: 0.6666667
value: {fileID: 8376386126931784656, guid: f4c3c3c4dbbc3ca418174718e5861c0a,
type: 3}
- time: 0.8833333
value: {fileID: -2705843602153250002, guid: f4c3c3c4dbbc3ca418174718e5861c0a,
type: 3}
- time: 1.1166667
value: {fileID: -2705843602153250002, guid: f4c3c3c4dbbc3ca418174718e5861c0a,
type: 3}
- time: 1.3333334
value: {fileID: 8376386126931784656, guid: f4c3c3c4dbbc3ca418174718e5861c0a,
type: 3}
- time: 1.55
value: {fileID: 8702915973739090778, guid: f4c3c3c4dbbc3ca418174718e5861c0a,
type: 3}
- time: 1.7833333
value: {fileID: 5314537831131735668, guid: f4c3c3c4dbbc3ca418174718e5861c0a,
type: 3}
- time: 2
value: {fileID: 4253574620111100184, guid: f4c3c3c4dbbc3ca418174718e5861c0a,
type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
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:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 4253574620111100184, guid: f4c3c3c4dbbc3ca418174718e5861c0a, type: 3}
- {fileID: 5314537831131735668, guid: f4c3c3c4dbbc3ca418174718e5861c0a, type: 3}
- {fileID: 8702915973739090778, guid: f4c3c3c4dbbc3ca418174718e5861c0a, type: 3}
- {fileID: 8376386126931784656, guid: f4c3c3c4dbbc3ca418174718e5861c0a, type: 3}
- {fileID: -2705843602153250002, guid: f4c3c3c4dbbc3ca418174718e5861c0a, type: 3}
- {fileID: -2705843602153250002, guid: f4c3c3c4dbbc3ca418174718e5861c0a, type: 3}
- {fileID: 8376386126931784656, guid: f4c3c3c4dbbc3ca418174718e5861c0a, type: 3}
- {fileID: 8702915973739090778, guid: f4c3c3c4dbbc3ca418174718e5861c0a, type: 3}
- {fileID: 5314537831131735668, guid: f4c3c3c4dbbc3ca418174718e5861c0a, type: 3}
- {fileID: 4253574620111100184, guid: f4c3c3c4dbbc3ca418174718e5861c0a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 2.0166667
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_Events: []
fileFormatVersion: 2
guid: 23ec9eba60e3e29448554c73c4b60057
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 3abeaa5f91b74ee40984ceedc6d5e3d1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: normal_teleport
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: 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_Events: []
fileFormatVersion: 2
guid: 686ee04425e5d60449457dc4330f627a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 0621ddb50f221004d97153d0c28f6dae
TextureImporter:
internalIDToNameTable:
- first:
213: -3552768961920459441
second: Teleport_player_0
- first:
213: 411895712925066613
second: Teleport_player_1
- first:
213: 7150921299977468172
second: Teleport_player_2
- first:
213: -7558261212849123246
second: Teleport_player_3
- first:
213: -7820430795522565334
second: Teleport_player_4
- first:
213: -5989383710554002659
second: Teleport_player_5
- first:
213: -6278361185477370458
second: Teleport_player_6
- first:
213: 9201877960657048106
second: Teleport_player_7
- first:
213: 6377963054575779328
second: Teleport_player_8
- first:
213: 7650842911443579628
second: Teleport_player_9
- first:
213: 91656613186247956
second: Teleport_player_10
- first:
213: 1183612224413011031
second: Teleport_player_11
- first:
213: 4003694204860578412
second: Teleport_player_12
- first:
213: -9143456138078507253
second: Teleport_player_13
- first:
213: 1247701235980005215
second: Teleport_player_14
- first:
213: 807346465925773099
second: Teleport_player_15
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 32
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: Teleport_player_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 3419914080a3d0741bdb55961fc00082
internalID: -3552768961920459441
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Teleport_player_1
rect:
serializedVersion: 2
x: 32
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: df6b65eceb967094f9173a30288bd7e1
internalID: 411895712925066613
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Teleport_player_2
rect:
serializedVersion: 2
x: 64
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 476c2f9612abc2440bc9f205d10d5f84
internalID: 7150921299977468172
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Teleport_player_3
rect:
serializedVersion: 2
x: 96
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 11108d76c9e91f54a9f1588ba9c8353a
internalID: -7558261212849123246
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Teleport_player_4
rect:
serializedVersion: 2
x: 128
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 55b321147de90db409b5ec3d35d4405d
internalID: -7820430795522565334
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Teleport_player_5
rect:
serializedVersion: 2
x: 160
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 39dc4a4efeed68c478f66b97ad94598d
internalID: -5989383710554002659
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Teleport_player_6
rect: