diff --git a/Assets/Plugins/Node_Editor/Resources/Textures/NE_Box.png.meta b/Assets/Plugins/Node_Editor/Resources/Textures/NE_Box.png.meta index dff0f7790..cbd3575e5 100644 --- a/Assets/Plugins/Node_Editor/Resources/Textures/NE_Box.png.meta +++ b/Assets/Plugins/Node_Editor/Resources/Textures/NE_Box.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: 3362057e6db2cea428eb8de4a4800db0 -timeCreated: 1453313403 -licenseType: Free TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,38 +21,71 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: 7 maxTextureSize: 32 textureSettings: + serializedVersion: 2 filterMode: 0 aniso: 1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 - rGBM: 2 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} spritePixelsToUnits: 100 + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 alphaIsTransparency: 1 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Node_Editor/Resources/Textures/NE_Button.png.meta b/Assets/Plugins/Node_Editor/Resources/Textures/NE_Button.png.meta index 41565fa6f..9c49fb927 100644 --- a/Assets/Plugins/Node_Editor/Resources/Textures/NE_Button.png.meta +++ b/Assets/Plugins/Node_Editor/Resources/Textures/NE_Button.png.meta @@ -1,17 +1,18 @@ fileFormatVersion: 2 guid: acc3252d2ced34346a4fb935f95286e3 -timeCreated: 1441568627 -licenseType: Free TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 0 linearTexture: 1 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,38 +21,71 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 32 textureSettings: + serializedVersion: 2 filterMode: 1 aniso: 1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 - rGBM: 2 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 4, y: 7, z: 4, w: 4} spritePixelsToUnits: 100 + spriteBorder: {x: 4, y: 7, z: 4, w: 4} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Node_Editor/Resources/Textures/NE_Toolbar.png.meta b/Assets/Plugins/Node_Editor/Resources/Textures/NE_Toolbar.png.meta index 4f406bbe6..68455f9ca 100644 --- a/Assets/Plugins/Node_Editor/Resources/Textures/NE_Toolbar.png.meta +++ b/Assets/Plugins/Node_Editor/Resources/Textures/NE_Toolbar.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 402e62fa352af714480f4f3e93e2296e -timeCreated: 1499001690 -licenseType: Free TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +30,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: 0 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -39,46 +45,71 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 9, y: 3, z: 9, w: 3} spritePixelsToUnits: 100 + spriteBorder: {x: 9, y: 3, z: 9, w: 3} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 0 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 32 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Standalone + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone maxTextureSize: 32 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: WebGL + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: WebGL maxTextureSize: 32 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Node_Editor/Resources/Textures/NE_ToolbarButton.png.meta b/Assets/Plugins/Node_Editor/Resources/Textures/NE_ToolbarButton.png.meta index 267eced4e..2ac3134df 100644 --- a/Assets/Plugins/Node_Editor/Resources/Textures/NE_ToolbarButton.png.meta +++ b/Assets/Plugins/Node_Editor/Resources/Textures/NE_ToolbarButton.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 7013279dd6b38b24fa8f17dcd98474f8 -timeCreated: 1499001707 -licenseType: Free TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +30,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: 0 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -39,46 +45,71 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 4, y: 0, z: 4, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 4, y: 0, z: 4, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 0 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 32 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Standalone + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone maxTextureSize: 32 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: WebGL + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: WebGL maxTextureSize: 32 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Prefabs/HUD Prefabs/PopUpBox.prefab b/Assets/Prefabs/HUD Prefabs/PopUpBox.prefab index 9b7d5fb59..3cf6314ea 100644 --- a/Assets/Prefabs/HUD Prefabs/PopUpBox.prefab +++ b/Assets/Prefabs/HUD Prefabs/PopUpBox.prefab @@ -66,8 +66,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 3d76d0baaf2d2974bb714dee40fa1523, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -142,8 +140,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: b61a630d228690b43994691751dc4395, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -208,8 +204,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &1044089125355486785 GameObject: m_ObjectHideFlags: 0 @@ -343,7 +337,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.37, y: -14} + m_AnchoredPosition: {x: 0.36999512, y: -14} m_SizeDelta: {x: -19.26, y: -52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &968225108892198943 @@ -372,8 +366,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 5bbe16f95be10da4b8863465961b6dd2, type: 3} m_FontSize: 19 @@ -451,8 +443,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0087ff109103a47428e04c089e213a16, type: 3} m_FontSize: 12 diff --git a/Assets/Scripts/Abilities/Speed.cs b/Assets/Scripts/Abilities/Speed.cs index 290bda1a9..b965cbb83 100644 --- a/Assets/Scripts/Abilities/Speed.cs +++ b/Assets/Scripts/Abilities/Speed.cs @@ -18,7 +18,7 @@ public override void SetDestroyed(bool input) var enginePower = (Core as Craft).enginePower; if (input && activated) { - (Core as Craft).enginePower = Mathf.Pow(enginePower, 1/(abilityTier/6 + 1.1F)); + (Core as Craft).enginePower += 75 * abilityTier; //Mathf.Pow(enginePower, 1/(abilityTier/6 + 1.1F)); } base.SetDestroyed(input); } @@ -28,7 +28,7 @@ protected override void Execute() var enginePower = (Core as Craft).enginePower; if(enginePower <= 1000) { activated = true; - (Core as Craft).enginePower = Mathf.Pow(enginePower, abilityTier/6 + 1.1F); + (Core as Craft).enginePower = 75 * abilityTier; } else activated = false; } diff --git a/Assets/Scripts/Game Object Definitions/SectorManager.cs b/Assets/Scripts/Game Object Definitions/SectorManager.cs index e07832f36..590041710 100644 --- a/Assets/Scripts/Game Object Definitions/SectorManager.cs +++ b/Assets/Scripts/Game Object Definitions/SectorManager.cs @@ -528,7 +528,7 @@ void loadSector() background.setColor(current.backgroundColor); //Camera.main.backgroundColor = current.backgroundColor / 2F; //sector borders - minimapSectorBorders[current].enabled = true; + if(minimapSectorBorders != null && minimapSectorBorders.ContainsKey(current)) minimapSectorBorders[current].enabled = true; sectorBorders.enabled = true; sectorBorders.SetPositions(new Vector3[]{ new Vector3(current.bounds.x, current.bounds.y, 0), diff --git a/Assets/Scripts/HUD Scripts/MapMakerScript.cs b/Assets/Scripts/HUD Scripts/MapMakerScript.cs index 129a6f4e3..698b2eb7d 100644 --- a/Assets/Scripts/HUD Scripts/MapMakerScript.cs +++ b/Assets/Scripts/HUD Scripts/MapMakerScript.cs @@ -68,14 +68,12 @@ void Draw() foreach(Sector sector in manager.sectors) { // get every sector to find their representations if(playerCore.cursave.sectorsSeen.Contains(sector.sectorName)) { - Debug.Log(player.GetComponent().cursave.sectorsSeen.Count); Image sect = Instantiate(sectorPrefab, transform, false); sect.transform.SetAsFirstSibling(); Image body = sect.GetComponentsInChildren()[1]; sect.color = sector.backgroundColor - new Color(0.2F, 0.2F, 0.2F, 0); body.color = sect.color + 0.75F * Color.white; sect.rectTransform.anchoredPosition = new Vector2(sector.bounds.x - minX, -maxY + sector.bounds.y) / zoomoutFactor; - Debug.Log(sector.bounds.w + " " +sector.bounds.h); body.rectTransform.sizeDelta = sect.rectTransform.sizeDelta = new Vector2(sector.bounds.w, sector.bounds.h) / zoomoutFactor; } } diff --git a/Assets/Scripts/HUD Scripts/Ship Builder Scripts/TipsFromTheYard.cs b/Assets/Scripts/HUD Scripts/Ship Builder Scripts/TipsFromTheYard.cs index fa26a5bf6..8d95eeb78 100644 --- a/Assets/Scripts/HUD Scripts/Ship Builder Scripts/TipsFromTheYard.cs +++ b/Assets/Scripts/HUD Scripts/Ship Builder Scripts/TipsFromTheYard.cs @@ -25,6 +25,7 @@ void Awake() { tipsList.Add("If a part is not connected in a direct line of parts to the shell, it will detach, or 'domino'. Make sure your ship design prevents this from happening!"); tipsList.Add("You can hit 'escape' to close this window too! That way you can cycle through my infinite wisdom faster!"); tipsList.Add("You can create custom ShellCores in the Sector Creator using the JSON you get from this ship builder! Share your JSON with friends and dogfight against their ShellCores!"); + tipsList.Add("If you double click the Status Menu map it switches from a draggable map to a minimap-style scroll (and vice versa)!"); colors = new Color[] {Color.green, Color.cyan, Color.magenta, Color.yellow, Color.blue}; } diff --git a/Assets/Sprites/Entity Sprites/Construct Sprites/Bunker components.png.meta b/Assets/Sprites/Entity Sprites/Construct Sprites/Bunker components.png.meta index d27309bcc..c2c9d6340 100644 --- a/Assets/Sprites/Entity Sprites/Construct Sprites/Bunker components.png.meta +++ b/Assets/Sprites/Entity Sprites/Construct Sprites/Bunker components.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: 6a0b42dbfbbcded40aaf3beaa2e211e5 TextureImporter: - fileIDToRecycleName: - 21300000: Bunker Part - 21300002: Bunker Core + internalIDToNameTable: + - first: + 213: 21300000 + second: Bunker Part + - first: + 213: 21300002 + second: Bunker Core externalObjects: {} - serializedVersion: 7 + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -60,7 +64,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,7 +75,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,6 +87,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -101,6 +107,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 31b001a1872f718428a0d8a308d91085 + internalID: 21300000 vertices: [] indices: edges: [] @@ -121,6 +128,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 489ea012150abd742b7e3d4e3c745e3f + internalID: 21300002 vertices: [] indices: edges: [] @@ -129,10 +137,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 643fcd4a96003e849857cdd330fd5b62 + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Sprites/Entity Sprites/Construct Sprites/Defense Turret.png.meta b/Assets/Sprites/Entity Sprites/Construct Sprites/Defense Turret.png.meta index 978dc5c78..5534a4e09 100644 --- a/Assets/Sprites/Entity Sprites/Construct Sprites/Defense Turret.png.meta +++ b/Assets/Sprites/Entity Sprites/Construct Sprites/Defense Turret.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: 83aa7227f415d994aae1ac83856c6f6e TextureImporter: - fileIDToRecycleName: - 21300000: Defense Turret Body - 21300002: Beam Shooter + internalIDToNameTable: + - first: + 213: 21300000 + second: Defense Turret Body + - first: + 213: 21300002 + second: Beam Shooter externalObjects: {} - serializedVersion: 7 + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -60,7 +64,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,7 +75,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,6 +87,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -101,6 +107,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: bf4a3b9931605a94e87c097a4d732fa0 + internalID: 21300000 vertices: [] indices: edges: [] @@ -121,6 +128,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ec390e9785c3d2f48a2fbe66d807e5d2 + internalID: 21300002 vertices: [] indices: edges: [] @@ -129,10 +137,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 29be375b0c01fb647895524959fea8be + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Sprites/Entity Sprites/Construct Sprites/Healer Tower Components.png.meta b/Assets/Sprites/Entity Sprites/Construct Sprites/Healer Tower Components.png.meta index bb4e0b476..3cb5613d3 100644 --- a/Assets/Sprites/Entity Sprites/Construct Sprites/Healer Tower Components.png.meta +++ b/Assets/Sprites/Entity Sprites/Construct Sprites/Healer Tower Components.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: bf353023fb29d1e49b91d1a858c67421 TextureImporter: - fileIDToRecycleName: - 21300000: Healer Tower Body - 21300002: Healer Tower Spinner + internalIDToNameTable: + - first: + 213: 21300000 + second: Healer Tower Body + - first: + 213: 21300002 + second: Healer Tower Spinner externalObjects: {} - serializedVersion: 7 + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -60,7 +64,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,7 +75,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,6 +87,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -101,6 +107,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: f6d6f3bcf88fe0144bca8392eecc01aa + internalID: 21300000 vertices: [] indices: edges: [] @@ -121,6 +128,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 8efa7e4e67d89e647a93c06f73283f17 + internalID: 21300002 vertices: [] indices: edges: [] @@ -129,10 +137,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: de742af83bf27c54e893546165b93f9d + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Sprites/Entity Sprites/Construct Sprites/Outpost Components.png.meta b/Assets/Sprites/Entity Sprites/Construct Sprites/Outpost Components.png.meta index 9b81c5eb1..5c570d482 100644 --- a/Assets/Sprites/Entity Sprites/Construct Sprites/Outpost Components.png.meta +++ b/Assets/Sprites/Entity Sprites/Construct Sprites/Outpost Components.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: c8a5f1a70cfc5b64db0863288355309e TextureImporter: - fileIDToRecycleName: - 21300000: Outpost Part - 21300002: Outpost Core + internalIDToNameTable: + - first: + 213: 21300000 + second: Outpost Part + - first: + 213: 21300002 + second: Outpost Core externalObjects: {} - serializedVersion: 7 + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -60,7 +64,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,7 +75,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,6 +87,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -101,6 +107,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 0dd3fe2498fa4804f94a6cf95a794fd7 + internalID: 21300000 vertices: [] indices: edges: [] @@ -121,6 +128,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: cbb715cdc6adeeb46b2bcba8dfb0336d + internalID: 21300002 vertices: [] indices: edges: [] @@ -129,10 +137,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 3ae2311f6e757ac4c9a4889f3df82eb6 + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Sprites/Entity Sprites/Extra/Energy rock components.png.meta b/Assets/Sprites/Entity Sprites/Extra/Energy rock components.png.meta index 08ca77ab9..339b7e5d1 100644 --- a/Assets/Sprites/Entity Sprites/Extra/Energy rock components.png.meta +++ b/Assets/Sprites/Entity Sprites/Extra/Energy rock components.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: dee01702c98ab614bb1bbbc2cabe8768 TextureImporter: - fileIDToRecycleName: - 21300000: Energy rock components_0 - 21300002: Energy rock components_1 + internalIDToNameTable: + - first: + 213: 21300000 + second: Energy rock components_0 + - first: + 213: 21300002 + second: Energy rock components_1 externalObjects: {} - serializedVersion: 7 + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -60,7 +64,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,7 +75,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,6 +87,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -101,6 +107,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 9473d343f613852459733b179e07ab2c + internalID: 21300000 vertices: [] indices: edges: [] @@ -121,6 +128,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: f7764135175bc8849b9008f534fb6c64 + internalID: 21300002 vertices: [] indices: edges: [] @@ -129,10 +137,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: bef33f7880ca05e4e938b8abd4b0dc28 + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Sprites/Entity Sprites/Shellcore Sprites/shellcoretier3greyscale.png.meta b/Assets/Sprites/Entity Sprites/Shellcore Sprites/shellcoretier3greyscale.png.meta index 3dee5b485..6f61f3d8c 100644 --- a/Assets/Sprites/Entity Sprites/Shellcore Sprites/shellcoretier3greyscale.png.meta +++ b/Assets/Sprites/Entity Sprites/Shellcore Sprites/shellcoretier3greyscale.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: 80a15280da6ac4a4e9af9dc8d732972e TextureImporter: - fileIDToRecycleName: - 21300000: shellcoretier3greyscale_0 - 21300002: shellcoretier3greyscale_1 + internalIDToNameTable: + - first: + 213: 21300000 + second: shellcoretier3greyscale_0 + - first: + 213: 21300002 + second: shellcoretier3greyscale_1 externalObjects: {} - serializedVersion: 9 + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -60,7 +64,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,7 +75,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,6 +87,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -101,6 +107,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 7b588910ed108864684b98a55bfce66c + internalID: 21300000 vertices: [] indices: edges: [] @@ -121,6 +128,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 9831b20c992ecef4d8cdad00d061c37a + internalID: 21300002 vertices: [] indices: edges: [] @@ -129,10 +137,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 42d9522989d201449a781bc08bf83c64 + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log index e6203e4d1..b4a7b628d 100644 --- a/Logs/Packages-Update.log +++ b/Logs/Packages-Update.log @@ -35,3 +35,15 @@ The following packages were updated: com.unity.package-manager-ui from version 2.0.7 to 2.2.0 com.unity.purchasing from version 2.0.3 to 2.0.6 com.unity.textmeshpro from version 1.3.0 to 2.0.0 + +=== Mon Dec 30 22:03:58 2019 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were updated: + com.unity.ide.rider from version 1.0.8 to 1.1.4 + com.unity.ide.vscode from version 1.0.7 to 1.1.3 + com.unity.test-framework from version 1.0.16 to 1.1.3 +The following packages were removed: + com.unity.package-manager-ui@2.2.0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 1538db78d..799db48f8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,11 +4,10 @@ "com.unity.2d.tilemap": "1.0.0", "com.unity.analytics": "3.3.2", "com.unity.ext.nunit": "1.0.0", - "com.unity.ide.rider": "1.0.8", + "com.unity.ide.rider": "1.1.4", "com.unity.ide.visualstudio": "1.0.11", - "com.unity.ide.vscode": "1.0.7", - "com.unity.package-manager-ui": "2.2.0", - "com.unity.test-framework": "1.0.16", + "com.unity.ide.vscode": "1.1.3", + "com.unity.test-framework": "1.1.3", "com.unity.textmeshpro": "2.0.1", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 75125e2ca..5951cd45e 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,20 +3,33 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 1 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} m_SpritePackerMode: 2 m_SpritePackerPaddingPower: 1 m_EtcTextureCompressorBehavior: 1 m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref m_ProjectGenerationRootNamespace: - m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInEditMode: 1 m_EnableTextureStreamingInPlayMode: 1 + m_AsyncShaderCompilation: 1 + m_EnterPlayModeOptionsEnabled: 0 + m_EnterPlayModeOptions: 3 + m_ShowLightmapResolutionOverlay: 1 + m_UseLegacyProbeSampleCount: 1 + m_AssetPipelineMode: 1 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8fe25eec6..f66c2e726 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.2.0b7 -m_EditorVersionWithRevision: 2019.2.0b7 (87c9ecb96495) +m_EditorVersion: 2019.3.0f3 +m_EditorVersionWithRevision: 2019.3.0f3 (6c9e2bfd6f81)