Commit 68612963 authored by Sebastian Frey's avatar Sebastian Frey
Browse files

Merge remote-tracking branch 'origin/master'

parents 6d4e1f34 79436b70
Pipeline #2923 waiting for manual action with stages
in 8 minutes and 11 seconds
fileFormatVersion: 2
guid: f7ec8ad896f47904cb7499a6425f0c4c
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
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
Assets/_Game/Graphics/Sprite/HUD/fire_2.png

130 Bytes | W: | H:

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

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_2.png
Assets/_Game/Graphics/Sprite/HUD/fire_2.png
Assets/_Game/Graphics/Sprite/HUD/fire_2.png
Assets/_Game/Graphics/Sprite/HUD/fire_2.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/fire_3.png

130 Bytes | W: | H:

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

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_3.png
Assets/_Game/Graphics/Sprite/HUD/fire_3.png
Assets/_Game/Graphics/Sprite/HUD/fire_3.png
Assets/_Game/Graphics/Sprite/HUD/fire_3.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/fire_4.png

130 Bytes | W: | H:

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

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_4.png
Assets/_Game/Graphics/Sprite/HUD/fire_4.png
Assets/_Game/Graphics/Sprite/HUD/fire_4.png
Assets/_Game/Graphics/Sprite/HUD/fire_4.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/fire_5.png

130 Bytes | W: | H:

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

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/fire_5.png
Assets/_Game/Graphics/Sprite/HUD/fire_5.png
Assets/_Game/Graphics/Sprite/HUD/fire_5.png
Assets/_Game/Graphics/Sprite/HUD/fire_5.png
  • 2-up
  • Swipe
  • Onion skin
fileFormatVersion: 2
guid: fceda3bd95cbcc34890b77ed58b7e07e
TextureImporter:
fileIDToRecycleName: {}
fileIDToRecycleName:
21300000: fire_5_0
21300002: fire_5_1
21300004: fire_5_2
21300006: fire_5_3
21300008: fire_5_4
externalObjects: {}
serializedVersion: 9
mipmaps:
......@@ -82,11 +87,111 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
sprites:
- serializedVersion: 2
name: fire_5_0
rect:
serializedVersion: 2
x: 22
y: 14
width: 196
height: 196
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: f681a01cf01f3f541b32828838efbc82
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: fire_5_1
rect:
serializedVersion: 2
x: 244
y: 14
width: 196
height: 196
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5bf806a92fd64b64493694f7ac4f5659
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: fire_5_2
rect:
serializedVersion: 2
x: 468
y: 14
width: 196
height: 196
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8db3233c44b0e324b9bb72d620915851
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: fire_5_3
rect:
serializedVersion: 2
x: 686
y: 14
width: 196
height: 196
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: bbab3b146372cbb499453e04edf11172
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: fire_5_4
rect:
serializedVersion: 2
x: 910
y: 14
width: 196
height: 196
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: cb4ed6bcfe9c7df4eb47c41031b0204d
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID:
spriteID: fd429e4f5c3f717448192609bf7e686f
vertices: []
indices:
edges: []
......
Assets/_Game/Graphics/Sprite/HUD/wasser_1.png

130 Bytes | W: | H:

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

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_1.png
Assets/_Game/Graphics/Sprite/HUD/wasser_1.png
Assets/_Game/Graphics/Sprite/HUD/wasser_1.png
Assets/_Game/Graphics/Sprite/HUD/wasser_1.png
  • 2-up
  • Swipe
  • Onion skin
Assets/_Game/Graphics/Sprite/HUD/wasser_2.png

130 Bytes | W: | H:

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

130 Bytes | W: | H:

Assets/_Game/Graphics/Sprite/HUD/wasser_2.png
Assets/_Game/Graphics/Sprite/HUD/wasser_2.png
Assets/_Game/Graphics/Sprite/HUD/wasser_2.png
Assets/_Game/Graphics/Sprite/HUD/wasser_2.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