diff --git a/Assets/Example/Characters.meta b/Assets/Example/Characters.meta deleted file mode 100644 index 4ce39cf0..00000000 --- a/Assets/Example/Characters.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: ae652ae6bf0344fadbacc8e0f37ce535 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Example/Characters/Ciara.prefab b/Assets/Example/Characters/Ciara.prefab deleted file mode 100644 index 3a05b82d..00000000 Binary files a/Assets/Example/Characters/Ciara.prefab and /dev/null differ diff --git a/Assets/Example/Characters/Ciara.prefab.meta b/Assets/Example/Characters/Ciara.prefab.meta deleted file mode 100644 index 915c9c6a..00000000 --- a/Assets/Example/Characters/Ciara.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 211b4d79191e74f759aee0ffc1011aaf -NativeFormatImporter: - userData: diff --git a/Assets/Example/Characters/Shay.prefab b/Assets/Example/Characters/Shay.prefab deleted file mode 100644 index 1003cddf..00000000 Binary files a/Assets/Example/Characters/Shay.prefab and /dev/null differ diff --git a/Assets/Example/Characters/Shay.prefab.meta b/Assets/Example/Characters/Shay.prefab.meta deleted file mode 100644 index 62b59520..00000000 --- a/Assets/Example/Characters/Shay.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 1c597b2bba1ea4ab0b505f29307dfe5c -NativeFormatImporter: - userData: diff --git a/Assets/Example/Characters/Skipper.prefab.meta b/Assets/Example/Characters/Skipper.prefab.meta deleted file mode 100644 index 5da437f8..00000000 --- a/Assets/Example/Characters/Skipper.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 1a6ae8948ffd6480e83b5774d9f1b2ae -NativeFormatImporter: - userData: diff --git a/Assets/Example/Dialogs.meta b/Assets/Example/Dialogs.meta deleted file mode 100644 index db4f1277..00000000 --- a/Assets/Example/Dialogs.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 3c106739e85e1461e8eb294ef107958c -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Example/Fonts.meta b/Assets/Example/Fonts.meta deleted file mode 100644 index 6c9894f9..00000000 --- a/Assets/Example/Fonts.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 3f3de448b81d0430596ef4d6ca0bdd00 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Example/Scenes/Example.unity b/Assets/Example/Scenes/Example.unity index 3060c85d..51ade5f2 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 index 256fdc0e..91d7f796 100644 --- a/Assets/Example/Sprites/Attribution.txt +++ b/Assets/Example/Sprites/Attribution.txt @@ -2,7 +2,6 @@ Creative Commons / Public Domain artwork used with permission. Mnay thanks to the authors for sharing! http://denmanrooke.com/creativecommons/ -https://openclipart.org/detail/191869/up-button-arrow-by-haxxorsaurus-191869 http://syntetyc.deviantart.com/art/Waterfall-forest-214723814 http://syntetyc.deviantart.com/art/Green-Forest-206321928 http://syntetyc.deviantart.com/art/Sanctuary-Forest-207795795 diff --git a/Assets/Fungus/Dialog/Editor/ChooseEditor.cs b/Assets/Fungus/Dialog/Editor/ChooseEditor.cs index af131492..ee8e6d8a 100644 --- a/Assets/Fungus/Dialog/Editor/ChooseEditor.cs +++ b/Assets/Fungus/Dialog/Editor/ChooseEditor.cs @@ -43,7 +43,30 @@ namespace Fungus SayEditor.DrawTagHelpLabel(); } + EditorGUILayout.BeginHorizontal(); + EditorGUILayout.PropertyField(chooseTextProp); + + Choose t = target as Choose; + + if (t.character != null && + t.character.profileSprite != null && + t.character.profileSprite.texture != null) + { + Texture2D characterTexture = t.character.profileSprite.texture; + + float aspect = (float)characterTexture.width / (float)characterTexture.height; + Rect previewRect = GUILayoutUtility.GetAspectRect(aspect, GUILayout.Width(50), GUILayout.ExpandWidth(false)); + CharacterEditor characterEditor = Editor.CreateEditor(t.character) as CharacterEditor; + if (characterEditor != null) + { + characterEditor.DrawPreview(previewRect, characterTexture); + } + } + + EditorGUILayout.EndHorizontal(); + + EditorGUILayout.Separator(); CommandEditor.ObjectField(characterProp, new GUIContent("Character", "Character to display in dialog"), diff --git a/Assets/Example/Fonts/amaranth.meta b/Assets/Fungus/Dialog/Fonts/Amaranth.meta similarity index 100% rename from Assets/Example/Fonts/amaranth.meta rename to Assets/Fungus/Dialog/Fonts/Amaranth.meta diff --git a/Assets/Example/Fonts/amaranth/Amaranth-Bold.otf b/Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Bold.otf similarity index 100% rename from Assets/Example/Fonts/amaranth/Amaranth-Bold.otf rename to Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Bold.otf diff --git a/Assets/Example/Fonts/amaranth/Amaranth-Bold.otf.meta b/Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Bold.otf.meta similarity index 100% rename from Assets/Example/Fonts/amaranth/Amaranth-Bold.otf.meta rename to Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Bold.otf.meta diff --git a/Assets/Example/Fonts/amaranth/Amaranth-BoldItalic.otf b/Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-BoldItalic.otf similarity index 100% rename from Assets/Example/Fonts/amaranth/Amaranth-BoldItalic.otf rename to Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-BoldItalic.otf diff --git a/Assets/Example/Fonts/amaranth/Amaranth-BoldItalic.otf.meta b/Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-BoldItalic.otf.meta similarity index 100% rename from Assets/Example/Fonts/amaranth/Amaranth-BoldItalic.otf.meta rename to Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-BoldItalic.otf.meta diff --git a/Assets/Example/Fonts/amaranth/Amaranth-Italic.otf b/Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Italic.otf similarity index 100% rename from Assets/Example/Fonts/amaranth/Amaranth-Italic.otf rename to Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Italic.otf diff --git a/Assets/Example/Fonts/amaranth/Amaranth-Italic.otf.meta b/Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Italic.otf.meta similarity index 100% rename from Assets/Example/Fonts/amaranth/Amaranth-Italic.otf.meta rename to Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Italic.otf.meta diff --git a/Assets/Example/Fonts/amaranth/Amaranth-Regular.otf b/Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Regular.otf similarity index 100% rename from Assets/Example/Fonts/amaranth/Amaranth-Regular.otf rename to Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Regular.otf diff --git a/Assets/Example/Fonts/amaranth/Amaranth-Regular.otf.meta b/Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Regular.otf.meta similarity index 100% rename from Assets/Example/Fonts/amaranth/Amaranth-Regular.otf.meta rename to Assets/Fungus/Dialog/Fonts/Amaranth/Amaranth-Regular.otf.meta diff --git a/Assets/Example/Fonts/amaranth/SIL Open Font License.txt b/Assets/Fungus/Dialog/Fonts/Amaranth/SIL Open Font License.txt similarity index 100% rename from Assets/Example/Fonts/amaranth/SIL Open Font License.txt rename to Assets/Fungus/Dialog/Fonts/Amaranth/SIL Open Font License.txt diff --git a/Assets/Example/Fonts/amaranth/SIL Open Font License.txt.meta b/Assets/Fungus/Dialog/Fonts/Amaranth/SIL Open Font License.txt.meta similarity index 100% rename from Assets/Example/Fonts/amaranth/SIL Open Font License.txt.meta rename to Assets/Fungus/Dialog/Fonts/Amaranth/SIL Open Font License.txt.meta diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro.meta deleted file mode 100644 index a4f99dd6..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 4dae98786fda548fba135bed70721da9 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SIL Open Font License.txt b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SIL Open Font License.txt deleted file mode 100755 index 295975a5..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SIL Open Font License.txt +++ /dev/null @@ -1,43 +0,0 @@ -Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. - -The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the copyright statement(s). - -"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. - -"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. - -5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Black.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Black.otf deleted file mode 100755 index 492661cb..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Black.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Black.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Black.otf.meta deleted file mode 100644 index 0aeeaa6c..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Black.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 2476a4240664e4159afe950add7d56db -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf deleted file mode 100755 index 2fbb1d1a..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf.meta deleted file mode 100644 index db2bd6ba..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: e25a04addeb8c4f5cb3623ac7c5d49ed -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Bold.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Bold.otf deleted file mode 100755 index 597072f5..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Bold.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Bold.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Bold.otf.meta deleted file mode 100644 index 8dabcb0f..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Bold.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 7e2cdd9eb2f7d432fb31e0f15e7f6d99 -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf deleted file mode 100755 index 56bdfacc..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf.meta deleted file mode 100644 index 999681d9..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 35f91c060adcc4c79a8496f283a241e9 -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf deleted file mode 100755 index 20a21c63..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf.meta deleted file mode 100644 index 3109cc49..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: cf49e0d5d8e99438ea7ba0fd7907d340 -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf deleted file mode 100755 index 787bfcfa..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf.meta deleted file mode 100644 index e6026a8f..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 85c1f25873d3e485da462111bfe80d2e -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-It.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-It.otf deleted file mode 100755 index 7ab613d4..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-It.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-It.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-It.otf.meta deleted file mode 100644 index ee07f26c..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-It.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 9695cb2874bb74d2e85caccd83bba3b4 -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Light.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Light.otf deleted file mode 100755 index 4a8eafd7..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Light.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Light.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Light.otf.meta deleted file mode 100644 index cc65e239..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Light.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 156ce441319be4dbc9d48426098a5f61 -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-LightIt.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-LightIt.otf deleted file mode 100755 index c5b8ca86..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-LightIt.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-LightIt.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-LightIt.otf.meta deleted file mode 100644 index 87fa4c7b..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-LightIt.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 71e43db1d59924c6abe336b7981f4e03 -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Regular.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Regular.otf deleted file mode 100755 index 38941ae7..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Regular.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Regular.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Regular.otf.meta deleted file mode 100644 index 724d1e93..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Regular.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 8d630015d16754b69b3f9f54d6469b16 -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Semibold.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Semibold.otf deleted file mode 100755 index fd41bcf1..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Semibold.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Semibold.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Semibold.otf.meta deleted file mode 100644 index 80e686cf..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Semibold.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: a9278ab5839e04955acf321f6c34af2f -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf deleted file mode 100755 index 447ff80b..00000000 Binary files a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf and /dev/null differ diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf.meta deleted file mode 100644 index b7822e71..00000000 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 58532ea5c40b04df3a2489b70f515021 -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - customCharacters: - fontRenderingMode: 0 - userData: diff --git a/Assets/Example/Characters/Skipper.prefab b/Assets/Fungus/Dialog/Prefabs/Character.prefab similarity index 91% rename from Assets/Example/Characters/Skipper.prefab rename to Assets/Fungus/Dialog/Prefabs/Character.prefab index d833a433..679a9960 100644 Binary files a/Assets/Example/Characters/Skipper.prefab and b/Assets/Fungus/Dialog/Prefabs/Character.prefab differ diff --git a/Assets/Fungus/Dialog/Prefabs/DefaultDialog.prefab.meta b/Assets/Fungus/Dialog/Prefabs/Character.prefab.meta similarity index 58% rename from Assets/Fungus/Dialog/Prefabs/DefaultDialog.prefab.meta rename to Assets/Fungus/Dialog/Prefabs/Character.prefab.meta index 2499e26d..0f1ecb98 100644 --- a/Assets/Fungus/Dialog/Prefabs/DefaultDialog.prefab.meta +++ b/Assets/Fungus/Dialog/Prefabs/Character.prefab.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: 82154cf743e6440cc8ccd1456ffb664f +guid: b20518d45890e4be59ba82946f88026c NativeFormatImporter: userData: diff --git a/Assets/Example/Dialogs/ChooseDialog.prefab b/Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab similarity index 100% rename from Assets/Example/Dialogs/ChooseDialog.prefab rename to Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab diff --git a/Assets/Example/Dialogs/ChooseDialog.prefab.meta b/Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab.meta similarity index 100% rename from Assets/Example/Dialogs/ChooseDialog.prefab.meta rename to Assets/Fungus/Dialog/Prefabs/ChooseDialog.prefab.meta diff --git a/Assets/Fungus/Dialog/Prefabs/DefaultDialog.prefab b/Assets/Fungus/Dialog/Prefabs/DefaultDialog.prefab deleted file mode 100644 index 715a6b98..00000000 Binary files a/Assets/Fungus/Dialog/Prefabs/DefaultDialog.prefab and /dev/null differ diff --git a/Assets/Fungus/Dialog/Prefabs/EvilAstronaut.prefab b/Assets/Fungus/Dialog/Prefabs/EvilAstronaut.prefab deleted file mode 100644 index b87c7f83..00000000 Binary files a/Assets/Fungus/Dialog/Prefabs/EvilAstronaut.prefab and /dev/null differ diff --git a/Assets/Fungus/Dialog/Prefabs/EvilAstronaut.prefab.meta b/Assets/Fungus/Dialog/Prefabs/EvilAstronaut.prefab.meta deleted file mode 100644 index daeb7ade..00000000 --- a/Assets/Fungus/Dialog/Prefabs/EvilAstronaut.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 00ef2eb72c35f49e790cff63f0ce1804 -NativeFormatImporter: - userData: diff --git a/Assets/Fungus/Dialog/Prefabs/GoodAstronaut.prefab b/Assets/Fungus/Dialog/Prefabs/GoodAstronaut.prefab deleted file mode 100644 index 80365953..00000000 Binary files a/Assets/Fungus/Dialog/Prefabs/GoodAstronaut.prefab and /dev/null differ diff --git a/Assets/Fungus/Dialog/Prefabs/GoodAstronaut.prefab.meta b/Assets/Fungus/Dialog/Prefabs/GoodAstronaut.prefab.meta deleted file mode 100644 index 9c55e449..00000000 --- a/Assets/Fungus/Dialog/Prefabs/GoodAstronaut.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: e2cd1078c3cb246d78223afcfb058231 -NativeFormatImporter: - userData: diff --git a/Assets/Example/Dialogs/NarratorDialog.prefab b/Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab similarity index 100% rename from Assets/Example/Dialogs/NarratorDialog.prefab rename to Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab diff --git a/Assets/Example/Dialogs/NarratorDialog.prefab.meta b/Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab.meta similarity index 100% rename from Assets/Example/Dialogs/NarratorDialog.prefab.meta rename to Assets/Fungus/Dialog/Prefabs/NarratorDialog.prefab.meta diff --git a/Assets/Example/Dialogs/SayDialog.prefab b/Assets/Fungus/Dialog/Prefabs/SayDialog.prefab similarity index 100% rename from Assets/Example/Dialogs/SayDialog.prefab rename to Assets/Fungus/Dialog/Prefabs/SayDialog.prefab diff --git a/Assets/Example/Dialogs/SayDialog.prefab.meta b/Assets/Fungus/Dialog/Prefabs/SayDialog.prefab.meta similarity index 100% rename from Assets/Example/Dialogs/SayDialog.prefab.meta rename to Assets/Fungus/Dialog/Prefabs/SayDialog.prefab.meta diff --git a/Assets/Fungus/Dialog/Sprites.meta b/Assets/Fungus/Dialog/Sprites.meta index 93bf4511..cc27f5d7 100644 --- a/Assets/Fungus/Dialog/Sprites.meta +++ b/Assets/Fungus/Dialog/Sprites.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 04f39a8465c7b4c1eb3e17ea6351c43a +guid: 8bbdbd776cccc4e1985aec1a2ee202b0 folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Example/Sprites/Arrow.png b/Assets/Fungus/Dialog/Sprites/Arrow.png similarity index 100% rename from Assets/Example/Sprites/Arrow.png rename to Assets/Fungus/Dialog/Sprites/Arrow.png diff --git a/Assets/Example/Sprites/Arrow.png.meta b/Assets/Fungus/Dialog/Sprites/Arrow.png.meta similarity index 100% rename from Assets/Example/Sprites/Arrow.png.meta rename to Assets/Fungus/Dialog/Sprites/Arrow.png.meta diff --git a/Assets/Fungus/Dialog/Sprites/Attribution.txt b/Assets/Fungus/Dialog/Sprites/Attribution.txt new file mode 100644 index 00000000..bef6e41d --- /dev/null +++ b/Assets/Fungus/Dialog/Sprites/Attribution.txt @@ -0,0 +1,4 @@ +Creative Commons / Public Domain artwork used with permission. +Mnay thanks to the authors for sharing! + +https://openclipart.org/detail/191869/up-button-arrow-by-haxxorsaurus-191869 diff --git a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SIL Open Font License.txt.meta b/Assets/Fungus/Dialog/Sprites/Attribution.txt.meta similarity index 58% rename from Assets/Fungus/Dialog/Fonts/source-sans-pro/SIL Open Font License.txt.meta rename to Assets/Fungus/Dialog/Sprites/Attribution.txt.meta index 0c62b3f2..a31f0a1c 100644 --- a/Assets/Fungus/Dialog/Fonts/source-sans-pro/SIL Open Font License.txt.meta +++ b/Assets/Fungus/Dialog/Sprites/Attribution.txt.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: 625efce5048fb407782fe1f4c88aa502 +guid: 0fb50b5d6b1c043a7b956b16c6f39aa3 TextScriptImporter: userData: diff --git a/Assets/Fungus/Dialog/Sprites/BlueAlienHappy.png b/Assets/Fungus/Dialog/Sprites/BlueAlienHappy.png deleted file mode 100644 index b8249f12..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/BlueAlienHappy.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/BlueAlienHappy.png.meta b/Assets/Fungus/Dialog/Sprites/BlueAlienHappy.png.meta deleted file mode 100644 index bc0f390e..00000000 --- a/Assets/Fungus/Dialog/Sprites/BlueAlienHappy.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 3109dcfd9a13c47fb9b3b75fb156a600 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/BlueAlienSad.png b/Assets/Fungus/Dialog/Sprites/BlueAlienSad.png deleted file mode 100644 index 789f27d7..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/BlueAlienSad.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/BlueAlienSad.png.meta b/Assets/Fungus/Dialog/Sprites/BlueAlienSad.png.meta deleted file mode 100644 index 9cba32ca..00000000 --- a/Assets/Fungus/Dialog/Sprites/BlueAlienSad.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 5c1b43979efc34396b490f10158df9fd -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/ButtonBlack.psd b/Assets/Fungus/Dialog/Sprites/ButtonBlack.psd deleted file mode 100644 index 43be6471..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/ButtonBlack.psd and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/ButtonBlack.psd.meta b/Assets/Fungus/Dialog/Sprites/ButtonBlack.psd.meta deleted file mode 100644 index 4251346a..00000000 --- a/Assets/Fungus/Dialog/Sprites/ButtonBlack.psd.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 5177d6c51ac1a49ebb26f3f0c550fdc8 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/ButtonOrange.psd b/Assets/Fungus/Dialog/Sprites/ButtonOrange.psd deleted file mode 100644 index 2e3efb12..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/ButtonOrange.psd and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/ButtonOrange.psd.meta b/Assets/Fungus/Dialog/Sprites/ButtonOrange.psd.meta deleted file mode 100644 index 46f9c0aa..00000000 --- a/Assets/Fungus/Dialog/Sprites/ButtonOrange.psd.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 295b89efeb7ca4b9394a6de15b246ae1 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/Continue.psd b/Assets/Fungus/Dialog/Sprites/Continue.psd deleted file mode 100644 index e3ddd12a..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/Continue.psd and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/Continue.psd.meta b/Assets/Fungus/Dialog/Sprites/Continue.psd.meta deleted file mode 100644 index e23fea09..00000000 --- a/Assets/Fungus/Dialog/Sprites/Continue.psd.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 363331a570f304a599a78d96cb27ef9c -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/DialogBackground.psd b/Assets/Fungus/Dialog/Sprites/DialogBackground.psd deleted file mode 100644 index b74f1a02..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/DialogBackground.psd and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/DialogBackground.psd.meta b/Assets/Fungus/Dialog/Sprites/DialogBackground.psd.meta deleted file mode 100644 index 53c3e29f..00000000 --- a/Assets/Fungus/Dialog/Sprites/DialogBackground.psd.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 0975349aaf3674f38871e243a020e7f6 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/GreenAlienHappy.png b/Assets/Fungus/Dialog/Sprites/GreenAlienHappy.png deleted file mode 100644 index c2c26b9e..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/GreenAlienHappy.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/GreenAlienHappy.png.meta b/Assets/Fungus/Dialog/Sprites/GreenAlienHappy.png.meta deleted file mode 100644 index 070c1830..00000000 --- a/Assets/Fungus/Dialog/Sprites/GreenAlienHappy.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: eb694ae0efdbf4249b07f412f75eac36 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/GreenAlienSad.png b/Assets/Fungus/Dialog/Sprites/GreenAlienSad.png deleted file mode 100644 index c2f4c255..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/GreenAlienSad.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/GreenAlienSad.png.meta b/Assets/Fungus/Dialog/Sprites/GreenAlienSad.png.meta deleted file mode 100644 index ef4b70ee..00000000 --- a/Assets/Fungus/Dialog/Sprites/GreenAlienSad.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 25ad45ce587f8477eb40ee585c3d9bd7 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/Mushroom.png.meta b/Assets/Fungus/Dialog/Sprites/Mushroom.png.meta index f6a2d5f6..6bcd7daf 100644 --- a/Assets/Fungus/Dialog/Sprites/Mushroom.png.meta +++ b/Assets/Fungus/Dialog/Sprites/Mushroom.png.meta @@ -1,11 +1,13 @@ fileFormatVersion: 2 -guid: 448e1c099245748b0b678d7459c7fd9e +guid: ea8f56c43254d41728f5ac4e8299b6c9 TextureImporter: + fileIDToRecycleName: + 21300000: Mushroom serializedVersion: 2 mipmaps: mipMapMode: 0 enableMipMap: 0 - linearTexture: 1 + linearTexture: 0 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -30,7 +32,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -38,7 +40,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 - textureType: 2 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/Assets/Fungus/Dialog/Sprites/PinkAlienHappy.png b/Assets/Fungus/Dialog/Sprites/PinkAlienHappy.png deleted file mode 100644 index 5f8ae910..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/PinkAlienHappy.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/PinkAlienHappy.png.meta b/Assets/Fungus/Dialog/Sprites/PinkAlienHappy.png.meta deleted file mode 100644 index b0e3fd09..00000000 --- a/Assets/Fungus/Dialog/Sprites/PinkAlienHappy.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: a9d1d81f685ad4f6187e8fbc9741c0f7 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/PinkAlienSad.png b/Assets/Fungus/Dialog/Sprites/PinkAlienSad.png deleted file mode 100644 index 7c2e6240..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/PinkAlienSad.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/PinkAlienSad.png.meta b/Assets/Fungus/Dialog/Sprites/PinkAlienSad.png.meta deleted file mode 100644 index 659abd35..00000000 --- a/Assets/Fungus/Dialog/Sprites/PinkAlienSad.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: dfc218f95e17b40aebd7098a43eadb1c -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames.meta deleted file mode 100644 index 6860ed81..00000000 --- a/Assets/Fungus/Dialog/Sprites/TimerFrames.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 365ec981102f744e7aadd03229567f5c -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer.psd b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer.psd deleted file mode 100644 index af300fc9..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer.psd and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer.psd.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer.psd.meta deleted file mode 100644 index da8e5004..00000000 --- a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer.psd.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 5f7ee045af2534886a16662db3f7006d -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer00.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer00.png deleted file mode 100644 index 466b5d79..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer00.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer00.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer00.png.meta deleted file mode 100644 index e39828c4..00000000 --- a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer00.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: ac73b583dc1504c6491a325836ad94b1 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer01.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer01.png deleted file mode 100644 index 605151ff..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer01.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer01.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer01.png.meta deleted file mode 100644 index c4dcb818..00000000 --- a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer01.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 555662858b0934b0190253d207e5307c -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer02.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer02.png deleted file mode 100644 index 83f21343..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer02.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer02.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer02.png.meta deleted file mode 100644 index 6bfea340..00000000 --- a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer02.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: ec79ba3732a0a4a97b4a76a6c17553ff -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer03.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer03.png deleted file mode 100644 index 55cd6e99..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer03.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer03.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer03.png.meta deleted file mode 100644 index 634d9b86..00000000 --- a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer03.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: ea73cab89b59b4f9f8041f7e9cd1c67c -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer04.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer04.png deleted file mode 100644 index f07e8a60..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer04.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer04.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer04.png.meta deleted file mode 100644 index 0ede208a..00000000 --- a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer04.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 99864c2132a774486ad645356b9eb3e6 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer05.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer05.png deleted file mode 100644 index d2ffa7e9..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer05.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer05.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer05.png.meta deleted file mode 100644 index fb5f8a0f..00000000 --- a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer05.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: dfab90fb1315749dc846d15b6abd2a77 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer06.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer06.png deleted file mode 100644 index 4d6ac040..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer06.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer06.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer06.png.meta deleted file mode 100644 index 581f0070..00000000 --- a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer06.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 94135642b514c40af8c9f51c76a5f8f2 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer07.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer07.png deleted file mode 100644 index fdf757a0..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer07.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer07.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer07.png.meta deleted file mode 100644 index 24d2f003..00000000 --- a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer07.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 0b4a9c44132cf4a748b257b3c72fa778 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer08.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer08.png deleted file mode 100644 index 46201efa..00000000 Binary files a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer08.png and /dev/null differ diff --git a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer08.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer08.png.meta deleted file mode 100644 index a28c54fe..00000000 --- a/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer08.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 48617ec39d5af466b9b5bda1ec6c5fc0 -TextureImporter: - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - 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: 1024 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: diff --git a/Assets/Fungus/Dialog/Sprites/license.txt b/Assets/Fungus/Dialog/Sprites/license.txt deleted file mode 100644 index da26793c..00000000 --- a/Assets/Fungus/Dialog/Sprites/license.txt +++ /dev/null @@ -1,8 +0,0 @@ -Creative Commons Attribution -============================ - -Swipe and Continue icons by icons8 -http://www.icons8.com/ - -Buttons by BrightRetro -http://opengameart.org/content/various-gui-elements-part-2 diff --git a/Assets/Fungus/Dialog/Sprites/license.txt.meta b/Assets/Fungus/Dialog/Sprites/license.txt.meta deleted file mode 100644 index ef667693..00000000 --- a/Assets/Fungus/Dialog/Sprites/license.txt.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 7474b0aa22ca1495b829af7c559b955c -TextScriptImporter: - userData: diff --git a/Assets/Fungus/FungusScript/Sprites/Mushroom.png b/Assets/Fungus/FungusScript/Sprites/Mushroom.png deleted file mode 100644 index 7b4d51bf..00000000 Binary files a/Assets/Fungus/FungusScript/Sprites/Mushroom.png and /dev/null differ diff --git a/Assets/Fungus/FungusScript/Sprites/Mushroom.png.meta b/Assets/Fungus/FungusScript/Sprites/Mushroom.png.meta deleted file mode 100644 index 6bcd7daf..00000000 --- a/Assets/Fungus/FungusScript/Sprites/Mushroom.png.meta +++ /dev/null @@ -1,48 +0,0 @@ -fileFormatVersion: 2 -guid: ea8f56c43254d41728f5ac4e8299b6c9 -TextureImporter: - fileIDToRecycleName: - 21300000: Mushroom - 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: 1024 - 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/FungusScript/Sprites/ScriptIcon32.png b/Assets/Fungus/FungusScript/Sprites/ScriptIcon.png similarity index 100% rename from Assets/Fungus/FungusScript/Sprites/ScriptIcon32.png rename to Assets/Fungus/FungusScript/Sprites/ScriptIcon.png diff --git a/Assets/Fungus/FungusScript/Sprites/ScriptIcon32.png.meta b/Assets/Fungus/FungusScript/Sprites/ScriptIcon.png.meta similarity index 97% rename from Assets/Fungus/FungusScript/Sprites/ScriptIcon32.png.meta rename to Assets/Fungus/FungusScript/Sprites/ScriptIcon.png.meta index c34583e9..8429ce94 100644 --- a/Assets/Fungus/FungusScript/Sprites/ScriptIcon32.png.meta +++ b/Assets/Fungus/FungusScript/Sprites/ScriptIcon.png.meta @@ -3,6 +3,7 @@ guid: c22400d5bd211479099238aaacbd4852 TextureImporter: fileIDToRecycleName: 21300000: ScriptIcon32 + 21300002: ScriptIcon serializedVersion: 2 mipmaps: mipMapMode: 0