Commit da9f279f authored by Christopher Benes's avatar Christopher Benes
Browse files

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it

parents ba3a4a43 888bafc5
......@@ -12,14 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 353b156b7c59b1c45a8767d7500b31fb, type: 3}
m_Name: PlayerState
m_EditorClassIdentifier:
currentInfusedElement: 1
currentInfusedElement: 0
currentMoveState:
jumpForce: 15
smoothing: 0.03
airControl: 1
canSwim: 1
moveSpeed: 20
maxJumpCount: 2
moveSpeed: 30
maxJumpCount: 1
mass: 1
gravity: 3
movementStates: {fileID: 11400000, guid: c757aad6925b37a46b916f609fa9012b, type: 2}
......
fileFormatVersion: 2
guid: df22061a1ae2ea04da52179196f747a4
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
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: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ed602ea5cd2f2824e9c01e116a1d7787
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
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: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Graphics/Sprite/HUD/Luft_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_1.png
Assets/_Game/Graphics/Sprite/HUD/Luft_1.png
Assets/_Game/Graphics/Sprite/HUD/Luft_1.png
Assets/_Game/Graphics/Sprite/HUD/Luft_1.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/Luft_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_2.png
Assets/_Game/Graphics/Sprite/HUD/Luft_2.png
Assets/_Game/Graphics/Sprite/HUD/Luft_2.png
Assets/_Game/Graphics/Sprite/HUD/Luft_2.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/Luft_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_3.png
Assets/_Game/Graphics/Sprite/HUD/Luft_3.png
Assets/_Game/Graphics/Sprite/HUD/Luft_3.png
Assets/_Game/Graphics/Sprite/HUD/Luft_3.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/Luft_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_4.png
Assets/_Game/Graphics/Sprite/HUD/Luft_4.png
Assets/_Game/Graphics/Sprite/HUD/Luft_4.png
Assets/_Game/Graphics/Sprite/HUD/Luft_4.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/Luft_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/Luft_5.png
Assets/_Game/Graphics/Sprite/HUD/Luft_5.png
Assets/_Game/Graphics/Sprite/HUD/Luft_5.png
Assets/_Game/Graphics/Sprite/HUD/Luft_5.png
  • 2-up
  • Swipe
  • Onion skin
fileFormatVersion: 2
guid: c1e3ffb5baa9daa44a8e96a1707f043f
guid: 327b7295867d04a409011baf97cc325c
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
......
fileFormatVersion: 2
guid: c5088d79e0ded2e45a653b76e584ce41
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
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: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Graphics/Sprite/HUD/erde_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_1.png
Assets/_Game/Graphics/Sprite/HUD/erde_1.png
Assets/_Game/Graphics/Sprite/HUD/erde_1.png
Assets/_Game/Graphics/Sprite/HUD/erde_1.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/erde_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_2.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_2.png
Assets/_Game/Graphics/Sprite/HUD/erde_2.png
Assets/_Game/Graphics/Sprite/HUD/erde_2.png
Assets/_Game/Graphics/Sprite/HUD/erde_2.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/erde_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_3.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_3.png
Assets/_Game/Graphics/Sprite/HUD/erde_3.png
Assets/_Game/Graphics/Sprite/HUD/erde_3.png
Assets/_Game/Graphics/Sprite/HUD/erde_3.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/erde_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_4.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_4.png
Assets/_Game/Graphics/Sprite/HUD/erde_4.png
Assets/_Game/Graphics/Sprite/HUD/erde_4.png
Assets/_Game/Graphics/Sprite/HUD/erde_4.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/erde_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_5.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/erde_5.png
Assets/_Game/Graphics/Sprite/HUD/erde_5.png
Assets/_Game/Graphics/Sprite/HUD/erde_5.png
Assets/_Game/Graphics/Sprite/HUD/erde_5.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/fire_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_1.png

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_1.png
Assets/_Game/Graphics/Sprite/HUD/fire_1.png
Assets/_Game/Graphics/Sprite/HUD/fire_1.png
Assets/_Game/Graphics/Sprite/HUD/fire_1.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment