Commit 2310da0a authored by Andrew Conn's avatar Andrew Conn
Browse files

Merge branch 'EnemyMovementHopefullyNotBrokenThisTimeIDK' into 'master'

Enemy movement hopefully not broken this time idk

See merge request !1
parents 1f1abf99 e996ef41
unityRebuildLibraryVersion: 11
unityForwardCompatibleVersion: 40
[1.0.1]
Adding Readme file
Adding local plugin importer callbacks.
Removing Bintray references in package.json
[2.0.3]
Fix bug where importing the asset store ads package would cause duiplicate symbols,
and removing the asset store ads package would cause missing symbols.
[2.0.4]
Added new description string to package.json
Fixed art assets to use no compression (fixes issue switching between iOS and PC builds)
[2.0.5] - 2018-03-29
Fix for https://fogbugz.unity3d.com/f/cases/1011363
Fixes an incorrect guid that the importer used to include/exclude the runtime assembly from the build.
[2.0.6] - 2018-03-29
Update changelog for this and 2.0.5
[2.0.7] - 2018-04-06
Fix editor assembly project file to include the importer script.
[2.0.8] - 2018-05-01
Add call to SetShouldOverridePredicate to exclude package dll when asset store dlls are present.
Update unity version attribute to support 2017.4 LTS
Fix an issue with the editor assembly to add back in some iOS platform specific code that was removed
via conditionals (which is fine for source packages, but doesn't work with precompiled assemblies)
fileFormatVersion: 2
guid: 35b4e72ca46f44581b85082c4dc21d13
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: a37e18887fa954edf92bc36bc353b879
folderAsset: yes
timeCreated: 1491945644
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7c3a5d6e39b874f468b2691537168513
folderAsset: yes
timeCreated: 1491258568
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 48986928cc2a449dbaecdd1654bc9bf6
folderAsset: yes
timeCreated: 1491258705
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f28fcced5af094cf78eb4e1109a71981
folderAsset: yes
timeCreated: 1491258705
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b32abd1c9d73a4cce8389f084ac12b11
timeCreated: 1491258710
licenseType: Pro
PluginImporter:
serializedVersion: 1
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
Editor:
enabled: 1
settings:
DefaultValueInitialized: true
data:
enabled: 0
settings: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 99ddb49592ff84811804420a1910cb89
folderAsset: yes
timeCreated: 1491258705
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 10bf81265ad87424d946598c575f45a0
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 5
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
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}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 1b32bcce201b4494ea8848326290c5d5
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 5
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
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}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 4f234578336894dc081edf696f2ff5f2
folderAsset: yes
timeCreated: 1491258705
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 2d4d46c70fdd242668a56e99799e8540
folderAsset: yes
timeCreated: 1491258705
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: eeed6954b3c264ca0b28a92aa6289bf0
folderAsset: yes
timeCreated: 1491258705
licenseType: Pro
PluginImporter:
serializedVersion: 1
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
Editor:
enabled: 1
settings:
DefaultValueInitialized: true
data:
enabled: 0
settings: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 6e7c8cfeedae74eb3a562055e069e441
folderAsset: yes
timeCreated: 1491258705
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
#import "UADSMetaData.h"
@interface UADSInAppPurchaseMetaData : UADSMetaData
- (void)setProductId:(NSString *)productId;
- (void)setPrice:(NSNumber *)price;
- (void)setCurrency:(NSString *)currency;
- (void)setReceiptPurchaseData:(NSString *)receiptPurchaseData;
- (void)setSignature:(NSString *)signature;
@end
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