From 4e561971f1acf1551ef630bbbfb496bb60ddb4b9 Mon Sep 17 00:00:00 2001 From: Kotrba Filip Date: Sat, 1 Feb 2020 14:27:10 +0100 Subject: [PATCH] Merge --- .../v16/Server/sqlite3/storage.ide-shm | Bin 0 -> 32768 bytes .../v16/Server/sqlite3/storage.ide-wal | Bin 4136512 -> 4136512 bytes Assets/Sprites/Icons.meta | 8 ++ Assets/Sprites/Icons/Ammo.png.meta | 91 ++++++++++++++++++ Assets/Sprites/Icons/Wood.png.meta | 91 ++++++++++++++++++ 5 files changed, 190 insertions(+) create mode 100644 .vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-shm create mode 100644 Assets/Sprites/Icons.meta create mode 100644 Assets/Sprites/Icons/Ammo.png.meta create mode 100644 Assets/Sprites/Icons/Wood.png.meta diff --git a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-shm b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-shm new file mode 100644 index 0000000000000000000000000000000000000000..ea927afb1d40e98c85c6cbdcdc5d1d086f86067a GIT binary patch literal 32768 zcmeI)J4ypl6b9gvr*DlKHNFzFfS@RXyAW(`EL@Bm5Zr`I2v}PP))s=jYtWNaiXi9^ zVeq@~&)j+3bI*JWn9j=}M&q;{QHf~vbAFtYldIdOVej?4d-izWxobY(Umsp>?%zCg ze)#^lcpkPh3z=r-Ek~X{jYeKwWQLhR?thRO^>LK>&9iFOsb%V!kMr;9<*Nn(0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0$&8`F&8V*`*PonA_8mCDYD#J0woq$kIfQyuXO@N1U6!; z$Z~7{NT3n(u^M}SwA+8#rV`V!6g&UrbA2ZP0t5&UD2>2WERO#gTbhP7N`L?X0)+*d z`LFPH^b6NffWTx0sxcF-*q!VqsuLhUfB*pk1PBlyK!5-N0t5&UAV7dXNd;;#8_Urx TY4_SDK!5-N0t5&UD38E9-j^wO literal 0 HcmV?d00001 diff --git a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-wal b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide-wal index 5cb61ee7bc21da66c465d1409f59ba960d17be87..24d8274f91361c3de55d42a1a426928dafef95fc 100644 GIT binary patch delta 5076 zcmeH~Yj6|S702(@T}dnLu2!;S%WumM)xjWaNqz=wz+m$zuhYe#{kFU=CpL19H-@BT8`x80|jJ!cLt-Fbaz){?BX)97J}WWtZ{lt7CGo4` zK5>y~6ZOKR@VanT=n`6mI^*AsAI2?oNE>(1Y;CT&f|1HKzM)ONfUnmdTG~Chx||~s zA$F0ms^-q_P+u@SxN}y5P{v4+yVm9PxV&C#DI>1d{r&y^a9X0>0TLEPVudP^nIn`W zR6I>CZ%tM)Ba7Pt{=GB$Xe$B{dA3MKicpx;sCRi9tOd|Xm){p02+ZgtKh?=W?CP8wdizm}n){0QYs;t?gR+*EOB|v+t1_%9npXwiS zt?qo<7YZ&nGBO zaJ&H@*Fsr0mR(sr_tR_+CT$P&g@;ycUEdY*1%ru6EH%kK_tSC>Bb%a^k2`dmDdd%6 zZ=TpEw`g7|A#A4Q?&P*zdT?y=Culh;-zV~Y)hy4TV>H@fnX+=)84mRYde;Yb54bBJ zlY`_s)wKt2w!gaLn;SZeifgBcX-v8$y(?`L?}#Ch7hV?XO=nCmNN<={%E!fFX@{^{ zzG&KJx+d3(F=?;xgz+E3&m>NIAXXWtgbCC4#rx82xk${$HVKK_=^%EJqqSRDC7tEW ziZxtBpvo6Ezjez+Rzy|nmf4t#X45jjI7 zBc({yK{PL?36tlzQd-AFtcf*$ zx^+ctFT=V*GaIG}>l(3!VqHTb0_*a6W~E?VeGYTex#rY$aS^vtc0TKBanf9Ka_LF) zSeI3>O;oY2W-}KlHKeWEM`rJq6BqwgFm`a|9ki~~c;kPzTN-buj{u$4DL4}kP;Z^f zTfeY*4lZn-3!7)^eYK;wY3E-q->dx3H%}*cb=Ky2>sL>G)HQZ=D{h`na`Wgr>Wv&=fY09u#>v~e|OSFgnDPb!4?m&UfZRgZjtnPM9X#)#iQ@{Y73;TIJCKbR)Ey(MX&)_|q``{~D{?Cqe z)z`WYEsakH&1U|f=fvTo`)ilQx0;U#^nCo;!7tA@#Ldq~4RriRh4Pnl zlJfKY^$Q#C-YzJ4Cq7aGlf75MS6|Yfn2N8wXg1saIPqNL=kAqUmbkO<7E?(`C4Vn! zp#_HL!sCmyk?ND{q66EVvFT>&$vHUr!FS(kJAL7w``SWVb{yMQeeKeiZX))|`I@Qd zSVwDC`Zs{O?AS@Zx;fh0(K75#E(cE!;mA)e5udNyAQs`A1Du5zFQp!V7#_+*05(93 zxtQ}YU;uD@0LByF03j3be-=;%d=18BIHS&=2pLuiKuqoeI2pwRNK)fn$ruZKCz*pn z=U^Pa3l!>0#+Y*pz;Vo3Gh_U*nr@BywEk1haLj1z{FLRid} zj8UK^8DrsdfLhoAG2TW?fs+8<+1SuWfLhCraUuM{q!&R5FB=wE1K_Q{B=*=UYWLy1 zX94U5YJobS9%uj>fhOQlU>UF+ OXa-u|Y_zW6g?|Hs>@c4I delta 828 zcmajcTS${(7zc3Q@B3z-^R%`(T{$h6YtB<1a?_TY5E@|SEBjg@m%(p9Fq`WlAY z2`#K(KXSaM|Iow}(;qJ_lrX&{A>+%7CYw?m)z9(imQ087Q^3rmKS}iq#2ep_&haM< zy_22tqq)@nm9Ykp#)pxir~Uc+$@duk?Y^$cN0)=&4$jGaU77!P zbp3K+fv=oJUmM)+Axw5N9>sU!;*lJTNySi8)VSoh=1mF+rfQJAOLLdY| zFoZxTh+sX4K>|_;0~v%v1ju0nY=lTqKoms7CfE!ypoA?D3o6(OYKQ|3#6tokLJ}my gHb{X~NP~3P4jG^Y9b`fl>;OINglt+M$@wAt3!^9_JOBUy diff --git a/Assets/Sprites/Icons.meta b/Assets/Sprites/Icons.meta new file mode 100644 index 0000000..a6ab7a1 --- /dev/null +++ b/Assets/Sprites/Icons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af0dfe805cc1ef541ab441ee3bf013bf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Icons/Ammo.png.meta b/Assets/Sprites/Icons/Ammo.png.meta new file mode 100644 index 0000000..af2d63b --- /dev/null +++ b/Assets/Sprites/Icons/Ammo.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 52012760a1df8ad4facb31c66d6bfaec +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Icons/Wood.png.meta b/Assets/Sprites/Icons/Wood.png.meta new file mode 100644 index 0000000..098cb83 --- /dev/null +++ b/Assets/Sprites/Icons/Wood.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 3893b3934f22d9f48b4f9371edbe6706 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: