diff --git a/Assets/Example/Characters/Roamer.prefab b/Assets/Example/Characters/Roamer.prefab index ff6f95df..439909ae 100644 Binary files a/Assets/Example/Characters/Roamer.prefab and b/Assets/Example/Characters/Roamer.prefab differ diff --git a/Assets/Example/Characters/Skipper.prefab b/Assets/Example/Characters/Skipper.prefab index ff6f95df..eec19fd2 100644 Binary files a/Assets/Example/Characters/Skipper.prefab and b/Assets/Example/Characters/Skipper.prefab differ diff --git a/Assets/Example/Characters/Urchin Girl.prefab b/Assets/Example/Characters/Urchin Girl.prefab index ff6f95df..df0e8c40 100644 Binary files a/Assets/Example/Characters/Urchin Girl.prefab and b/Assets/Example/Characters/Urchin Girl.prefab differ diff --git a/Assets/Example/Scenes/Example.unity b/Assets/Example/Scenes/Example.unity index 5d48bb73..d978c044 100644 Binary files a/Assets/Example/Scenes/Example.unity and b/Assets/Example/Scenes/Example.unity differ diff --git a/Assets/Example/Sprites/Attribution.txt b/Assets/Example/Sprites/Attribution.txt new file mode 100644 index 00000000..68746f7e --- /dev/null +++ b/Assets/Example/Sprites/Attribution.txt @@ -0,0 +1,7 @@ +Creative Commons artwork used with permission. +Thanks to the authors for sharing! + +http://syntetyc.deviantart.com/art/Waterfall-forest-214723814 +http://syntetyc.deviantart.com/art/Green-Forest-206321928 +http://syntetyc.deviantart.com/art/Sanctuary-Forest-207795795 +http://syntetyc.deviantart.com/art/Deep-Forest-204641620 diff --git a/Assets/Example/Sprites/Attribution.txt.meta b/Assets/Example/Sprites/Attribution.txt.meta new file mode 100644 index 00000000..d11461e5 --- /dev/null +++ b/Assets/Example/Sprites/Attribution.txt.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: f35e49c61f66a4ac3a13a2f6e1424132 +TextScriptImporter: + userData: diff --git a/Assets/Example/Sprites/DeepForest.jpg b/Assets/Example/Sprites/DeepForest.jpg new file mode 100644 index 00000000..6b27e45d Binary files /dev/null and b/Assets/Example/Sprites/DeepForest.jpg differ diff --git a/Assets/Example/Sprites/DeepForest.jpg.meta b/Assets/Example/Sprites/DeepForest.jpg.meta new file mode 100644 index 00000000..169d2771 --- /dev/null +++ b/Assets/Example/Sprites/DeepForest.jpg.meta @@ -0,0 +1,48 @@ +fileFormatVersion: 2 +guid: d3b6d7e5887554602baab879da8171d7 +TextureImporter: + fileIDToRecycleName: + 21300000: DeepForest + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Example/Sprites/SanctuaryForest.jpg b/Assets/Example/Sprites/SanctuaryForest.jpg new file mode 100644 index 00000000..0f0ab3ed Binary files /dev/null and b/Assets/Example/Sprites/SanctuaryForest.jpg differ diff --git a/Assets/Example/Sprites/SanctuaryForest.jpg.meta b/Assets/Example/Sprites/SanctuaryForest.jpg.meta new file mode 100644 index 00000000..1daea5a5 --- /dev/null +++ b/Assets/Example/Sprites/SanctuaryForest.jpg.meta @@ -0,0 +1,48 @@ +fileFormatVersion: 2 +guid: 2230440f02def4c728f10bdb641df3a7 +TextureImporter: + fileIDToRecycleName: + 21300000: SanctuaryForest + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Example/Sprites/Waterfall.jpg b/Assets/Example/Sprites/Waterfall.jpg new file mode 100644 index 00000000..c23fdbd1 Binary files /dev/null and b/Assets/Example/Sprites/Waterfall.jpg differ diff --git a/Assets/Example/Sprites/Waterfall.jpg.meta b/Assets/Example/Sprites/Waterfall.jpg.meta new file mode 100644 index 00000000..be500215 --- /dev/null +++ b/Assets/Example/Sprites/Waterfall.jpg.meta @@ -0,0 +1,48 @@ +fileFormatVersion: 2 +guid: e54c2166ac91140689c6f04097cab20e +TextureImporter: + fileIDToRecycleName: + 21300000: Waterfall + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Example/Sprites/WaterfallForest.jpg b/Assets/Example/Sprites/WaterfallForest.jpg new file mode 100644 index 00000000..1b096e88 Binary files /dev/null and b/Assets/Example/Sprites/WaterfallForest.jpg differ diff --git a/Assets/Example/Sprites/WaterfallForest.jpg.meta b/Assets/Example/Sprites/WaterfallForest.jpg.meta new file mode 100644 index 00000000..d815b193 --- /dev/null +++ b/Assets/Example/Sprites/WaterfallForest.jpg.meta @@ -0,0 +1,48 @@ +fileFormatVersion: 2 +guid: abf7ee5b818ac485980005a2e5066fb0 +TextureImporter: + fileIDToRecycleName: + 21300000: WaterfallForest + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Fungus/Camera/Commands/FadeToView.cs b/Assets/Fungus/Camera/Commands/FadeToView.cs index a7883bbd..bb34fe05 100644 --- a/Assets/Fungus/Camera/Commands/FadeToView.cs +++ b/Assets/Fungus/Camera/Commands/FadeToView.cs @@ -9,7 +9,7 @@ namespace Fungus.Script "Fades the camera out and in again at a location specified by a View object.")] public class FadeToView : FungusCommand { - public float duration; + public float duration = 1f; public Fungus.View targetView; public bool waitUntilFinished = true; public Color fadeColor = Color.black;