Merge branch 'main' into DamianBranch

This commit is contained in:
2025-12-17 12:14:48 +01:00
148 changed files with 12268 additions and 3683 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 697 KiB

View File

@@ -1,21 +0,0 @@
#
# Sprite sheet data for Unity.
#
# To import these sprites into your Unity project, download "TexturePackerImporter":
# https://www.codeandweb.com/texturepacker/unity
#
# $TexturePacker:SmartUpdate:9227820b0c919eac7c2c060a13aeaab9:d87cb527b1812df69e3b147baf202d62:1aa545b7b096eff092a9600996fecc1b$
#
:format=40300
:texture=frakke_fill_scoot_15.png
:size=2048x2048
:pivotpoints=enabled
:borders=disabled
:alphahandling=ClearTransparentPixels
frakke_fill_scoot0150;1;1188;738;859; 0.44173441734417346;0.05983701979045397; 0;0;0;0
frakke_fill_scoot0151;1;1188;738;859; 0.44173441734417346;0.05983701979045397; 0;0;0;0
frakke_fill_scoot0164;741;352;738;842; 0.4444444444444444;0.0610451306413301; 0;0;0;0
frakke_fill_scoot0165;741;352;738;842; 0.4444444444444444;0.0610451306413301; 0;0;0;0
frakke_fill_scoot0166;741;1196;738;851; 0.4444444444444444;0.06039952996474729; 0;0;0;0
frakke_fill_scoot0167;1;334;738;852; 0.4444444444444444;0.060328638497652576; 0;0;0;0

View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 5041dbb53726e5049896cbbb283d6178
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 242 KiB

View File

@@ -0,0 +1,195 @@
fileFormatVersion: 2
guid: f6ff5663bea4ffc4782ba86a17dd2cb3
TextureImporter:
internalIDToNameTable:
- first:
213: -4210934427559637024
second: ramp_broken_0
- first:
213: -1543735170203784407
second: ramp_broken_1
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
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: 40
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: ramp_broken_0
rect:
serializedVersion: 2
x: 342
y: 922
width: 27
height: 10
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 0ef48d8d271cf85c0800000000000000
internalID: -4210934427559637024
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: ramp_broken_1
rect:
serializedVersion: 2
x: 4
y: 0
width: 831
height: 920
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 92be9b0ba0d839ae0800000000000000
internalID: -1543735170203784407
vertices: []
indices:
edges: []
weights: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable:
ramp_broken_0: -4210934427559637024
ramp_broken_1: -1543735170203784407
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 KiB

View File

@@ -1,7 +1,16 @@
fileFormatVersion: 2
guid: 760af81f4f2e9b545ab7294c5c1a7b87
guid: ca26d0ffb3991284b8cd96c27770e626
TextureImporter:
internalIDToNameTable: []
internalIDToNameTable:
- first:
213: -8609529648124933794
second: ramp_whole_0
- first:
213: -3188379171874586893
second: ramp_whole_1
- first:
213: -1397035483212906382
second: ramp_whole_2
externalObjects: {}
serializedVersion: 13
mipmaps:
@@ -43,12 +52,12 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 70
spritePixelsToUnits: 40
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@@ -81,7 +90,7 @@ TextureImporter:
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
@@ -107,20 +116,7 @@ TextureImporter:
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
@@ -136,133 +132,67 @@ TextureImporter:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: frakke_fill_scoot0150
name: ramp_whole_0
rect:
serializedVersion: 2
x: 1
y: 1188
width: 738
height: 859
alignment: 9
pivot: {x: 0.4417344, y: 0.05983702}
x: 342
y: 922
width: 27
height: 10
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: f2e6538dd46f6954a8ed270f487ce3f4
internalID: 1517525544
spriteID: e59c158766ec48880800000000000000
internalID: -8609529648124933794
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: frakke_fill_scoot0151
name: ramp_whole_1
rect:
serializedVersion: 2
x: 1
y: 1188
width: 738
height: 859
alignment: 9
pivot: {x: 0.4417344, y: 0.05983702}
x: 79
y: 4
width: 756
height: 916
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: c74780b180703604d962a6f2cf5bf02e
internalID: 653931177
spriteID: 3fe3923390a90c3d0800000000000000
internalID: -3188379171874586893
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: frakke_fill_scoot0164
name: ramp_whole_2
rect:
serializedVersion: 2
x: 741
y: 352
width: 738
height: 842
alignment: 9
pivot: {x: 0.44444445, y: 0.06104513}
x: 477
y: 0
width: 11
height: 10
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: 0
tessellationDetail: -1
bones: []
spriteID: f2442b4e9a5c32449830e906574b84a6
internalID: -587084742
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: frakke_fill_scoot0165
rect:
serializedVersion: 2
x: 741
y: 352
width: 738
height: 842
alignment: 9
pivot: {x: 0.44444445, y: 0.06104513}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 22128b2da50383a428773fba6241ed54
internalID: 743650652
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: frakke_fill_scoot0166
rect:
serializedVersion: 2
x: 741
y: 1196
width: 738
height: 851
alignment: 9
pivot: {x: 0.44444445, y: 0.06039953}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 4268acd59ce185e49a6b3ad135e4e338
internalID: 446094147
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: frakke_fill_scoot0167
rect:
serializedVersion: 2
x: 1
y: 334
width: 738
height: 852
alignment: 9
pivot: {x: 0.44444445, y: 0.06032864}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 929d84a2f3ba28241bfe56bf63025398
internalID: -694763967
spriteID: 2708a7c31abbc9ce0800000000000000
internalID: -1397035483212906382
vertices: []
indices:
edges: []
@@ -271,7 +201,7 @@ TextureImporter:
customData:
physicsShape: []
bones: []
spriteID: a9e548d823aa87e42be7f6a05837a00c
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
@@ -281,12 +211,9 @@ TextureImporter:
spriteCustomMetadata:
entries: []
nameFileIdTable:
frakke_fill_scoot0150: 1517525544
frakke_fill_scoot0151: 653931177
frakke_fill_scoot0164: -587084742
frakke_fill_scoot0165: 743650652
frakke_fill_scoot0166: 446094147
frakke_fill_scoot0167: -694763967
ramp_whole_0: -8609529648124933794
ramp_whole_1: -3188379171874586893
ramp_whole_2: -1397035483212906382
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData: