diff --git a/Assets/Fungus.meta b/Assets/Fungus.meta index b8729a60..163520c3 100644 --- a/Assets/Fungus.meta +++ b/Assets/Fungus.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 72452d0189a95436fb93c2ec54d83801 +guid: 120b23b5240c94aee960b7434706811c folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Audio.meta b/Assets/Fungus/Audio.meta index e8e429c6..ebac8dcd 100644 --- a/Assets/Fungus/Audio.meta +++ b/Assets/Fungus/Audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d9780867e1f2c456a9bd67af4ed5e2e4 +guid: 50aeb1f91c7cf484e85d48c7370e926f folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Docs.meta b/Assets/Fungus/Audio/Audio.meta similarity index 63% rename from Assets/Fungus/Docs.meta rename to Assets/Fungus/Audio/Audio.meta index ee98a9ec..891fd621 100644 --- a/Assets/Fungus/Docs.meta +++ b/Assets/Fungus/Audio/Audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b2a1842979c244113ac31b4b37744a1d +guid: 0c0251f25261847649112eb90bdc787c folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Audio/Click.wav b/Assets/Fungus/Audio/Audio/Click.wav similarity index 100% rename from Assets/Fungus/Audio/Click.wav rename to Assets/Fungus/Audio/Audio/Click.wav diff --git a/Assets/Fungus/Audio/Click.wav.meta b/Assets/Fungus/Audio/Audio/Click.wav.meta similarity index 100% rename from Assets/Fungus/Audio/Click.wav.meta rename to Assets/Fungus/Audio/Audio/Click.wav.meta diff --git a/Assets/Fungus/Scripts.meta b/Assets/Fungus/Audio/Scripts.meta similarity index 63% rename from Assets/Fungus/Scripts.meta rename to Assets/Fungus/Audio/Scripts.meta index 6d227248..6faf3c67 100644 --- a/Assets/Fungus/Scripts.meta +++ b/Assets/Fungus/Audio/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f9ded1304c85a430bbc6c65f025cf4dc +guid: 3dd9a7f66888345859cf2db40ceee354 folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Scripts/MusicManager.cs b/Assets/Fungus/Audio/Scripts/MusicManager.cs similarity index 100% rename from Assets/Fungus/Scripts/MusicManager.cs rename to Assets/Fungus/Audio/Scripts/MusicManager.cs diff --git a/Assets/Fungus/Scripts/MusicManager.cs.meta b/Assets/Fungus/Audio/Scripts/MusicManager.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/MusicManager.cs.meta rename to Assets/Fungus/Audio/Scripts/MusicManager.cs.meta diff --git a/Assets/Fungus2/Camera.meta b/Assets/Fungus/Camera.meta similarity index 100% rename from Assets/Fungus2/Camera.meta rename to Assets/Fungus/Camera.meta diff --git a/Assets/Fungus/Editor.meta b/Assets/Fungus/Camera/Editor.meta similarity index 63% rename from Assets/Fungus/Editor.meta rename to Assets/Fungus/Camera/Editor.meta index 324319b9..d57a3c7e 100644 --- a/Assets/Fungus/Editor.meta +++ b/Assets/Fungus/Camera/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7cb2aa1c114f44b89b82bc527e85bab +guid: 3d2b8d81dbfb54c02a92a0966802a55a folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Editor/ViewEditor.cs b/Assets/Fungus/Camera/Editor/ViewEditor.cs similarity index 100% rename from Assets/Fungus/Editor/ViewEditor.cs rename to Assets/Fungus/Camera/Editor/ViewEditor.cs diff --git a/Assets/Fungus/Editor/ViewEditor.cs.meta b/Assets/Fungus/Camera/Editor/ViewEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/ViewEditor.cs.meta rename to Assets/Fungus/Camera/Editor/ViewEditor.cs.meta diff --git a/Assets/Fungus/Editor/Utilities.meta b/Assets/Fungus/Camera/Prefabs.meta similarity index 63% rename from Assets/Fungus/Editor/Utilities.meta rename to Assets/Fungus/Camera/Prefabs.meta index f7b6491a..603b1f70 100644 --- a/Assets/Fungus/Editor/Utilities.meta +++ b/Assets/Fungus/Camera/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e5b842381bd124899be70e0726dd4505 +guid: 10dcdae42763d4e44af47c20af580910 folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Prefabs/View.prefab b/Assets/Fungus/Camera/Prefabs/View.prefab similarity index 77% rename from Assets/Fungus/Prefabs/View.prefab rename to Assets/Fungus/Camera/Prefabs/View.prefab index 86d5bff2..34e88893 100644 Binary files a/Assets/Fungus/Prefabs/View.prefab and b/Assets/Fungus/Camera/Prefabs/View.prefab differ diff --git a/Assets/Fungus/Prefabs/View.prefab.meta b/Assets/Fungus/Camera/Prefabs/View.prefab.meta similarity index 100% rename from Assets/Fungus/Prefabs/View.prefab.meta rename to Assets/Fungus/Camera/Prefabs/View.prefab.meta diff --git a/Assets/Fungus/Editor/FungusScript.meta b/Assets/Fungus/Camera/Scripts.meta similarity index 63% rename from Assets/Fungus/Editor/FungusScript.meta rename to Assets/Fungus/Camera/Scripts.meta index 5c0b8668..737e540f 100644 --- a/Assets/Fungus/Editor/FungusScript.meta +++ b/Assets/Fungus/Camera/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0e5d6e3773e9346a29da44131b1f4881 +guid: e3391e010f66a4399adbe2bd0de43a83 folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Scripts/CameraController.cs b/Assets/Fungus/Camera/Scripts/CameraController.cs similarity index 100% rename from Assets/Fungus/Scripts/CameraController.cs rename to Assets/Fungus/Camera/Scripts/CameraController.cs diff --git a/Assets/Fungus/Scripts/CameraController.cs.meta b/Assets/Fungus/Camera/Scripts/CameraController.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/CameraController.cs.meta rename to Assets/Fungus/Camera/Scripts/CameraController.cs.meta diff --git a/Assets/Fungus/Scripts/View.cs b/Assets/Fungus/Camera/Scripts/View.cs similarity index 100% rename from Assets/Fungus/Scripts/View.cs rename to Assets/Fungus/Camera/Scripts/View.cs diff --git a/Assets/Fungus/Scripts/View.cs.meta b/Assets/Fungus/Camera/Scripts/View.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/View.cs.meta rename to Assets/Fungus/Camera/Scripts/View.cs.meta diff --git a/Assets/Fungus/Sprites.meta b/Assets/Fungus/Camera/Sprites.meta similarity index 63% rename from Assets/Fungus/Sprites.meta rename to Assets/Fungus/Camera/Sprites.meta index 6614a1fa..61d895b7 100644 --- a/Assets/Fungus/Sprites.meta +++ b/Assets/Fungus/Camera/Sprites.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 46997c16617ca413c9b5d94fd22aeb52 +guid: 8dea678f784954ce3b1e6b1845374ef0 folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Textures/ScreenFade.png b/Assets/Fungus/Camera/Sprites/ScreenFade.png similarity index 100% rename from Assets/Fungus/Textures/ScreenFade.png rename to Assets/Fungus/Camera/Sprites/ScreenFade.png diff --git a/Assets/Fungus/Textures/ScreenFade.png.meta b/Assets/Fungus/Camera/Sprites/ScreenFade.png.meta similarity index 100% rename from Assets/Fungus/Textures/ScreenFade.png.meta rename to Assets/Fungus/Camera/Sprites/ScreenFade.png.meta diff --git a/Assets/Fungus/Textures/SwipePanIcon.png b/Assets/Fungus/Camera/Sprites/SwipePanIcon.png similarity index 100% rename from Assets/Fungus/Textures/SwipePanIcon.png rename to Assets/Fungus/Camera/Sprites/SwipePanIcon.png diff --git a/Assets/Fungus/Textures/SwipePanIcon.png.meta b/Assets/Fungus/Camera/Sprites/SwipePanIcon.png.meta similarity index 100% rename from Assets/Fungus/Textures/SwipePanIcon.png.meta rename to Assets/Fungus/Camera/Sprites/SwipePanIcon.png.meta diff --git a/Assets/Fungus/Dialog.meta b/Assets/Fungus/Dialog.meta new file mode 100644 index 00000000..f43ca986 --- /dev/null +++ b/Assets/Fungus/Dialog.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 382433a04f0cc44d1b777c359b0242a3 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Fonts.meta b/Assets/Fungus/Dialog/Fonts.meta similarity index 63% rename from Assets/Fungus/Fonts.meta rename to Assets/Fungus/Dialog/Fonts.meta index c5ec497b..42a4ef06 100644 --- a/Assets/Fungus/Fonts.meta +++ b/Assets/Fungus/Dialog/Fonts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9baefe3bcf2e94f17b5feaeb1c07e77e +guid: a316c7b38ecb7431a8e6e953b048ba66 folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Fonts/source-sans-pro.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SIL Open Font License.txt b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SIL Open Font License.txt similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SIL Open Font License.txt rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SIL Open Font License.txt diff --git a/Assets/Fungus/Fonts/source-sans-pro/SIL Open Font License.txt.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SIL Open Font License.txt.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SIL Open Font License.txt.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SIL Open Font License.txt.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Black.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Black.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Black.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Black.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Black.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Black.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Black.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Black.otf.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BlackIt.otf.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Bold.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Bold.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Bold.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Bold.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Bold.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Bold.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Bold.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Bold.otf.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-BoldIt.otf.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLight.otf.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-It.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-It.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-It.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-It.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-It.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-It.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-It.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-It.otf.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Light.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Light.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Light.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Light.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Light.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Light.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Light.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Light.otf.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-LightIt.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-LightIt.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-LightIt.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-LightIt.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-LightIt.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-LightIt.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-LightIt.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-LightIt.otf.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Regular.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Regular.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Regular.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Regular.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Regular.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Regular.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Regular.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Regular.otf.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Semibold.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Semibold.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Semibold.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Semibold.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Semibold.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Semibold.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-Semibold.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-Semibold.otf.meta diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf diff --git a/Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf.meta b/Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf.meta similarity index 100% rename from Assets/Fungus/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf.meta rename to Assets/Fungus/Dialog/Fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf.meta diff --git a/Assets/Fungus/Dialog/Prefabs.meta b/Assets/Fungus/Dialog/Prefabs.meta new file mode 100644 index 00000000..6aa2b926 --- /dev/null +++ b/Assets/Fungus/Dialog/Prefabs.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 5dc9fe37d5aec4305a124d133294994f +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Prefabs/Dialog.prefab b/Assets/Fungus/Dialog/Prefabs/Dialog.prefab similarity index 100% rename from Assets/Fungus/Prefabs/Dialog.prefab rename to Assets/Fungus/Dialog/Prefabs/Dialog.prefab diff --git a/Assets/Fungus/Prefabs/Dialog.prefab.meta b/Assets/Fungus/Dialog/Prefabs/Dialog.prefab.meta similarity index 100% rename from Assets/Fungus/Prefabs/Dialog.prefab.meta rename to Assets/Fungus/Dialog/Prefabs/Dialog.prefab.meta diff --git a/Assets/Fungus/Dialog/Scripts.meta b/Assets/Fungus/Dialog/Scripts.meta new file mode 100644 index 00000000..8b8aebec --- /dev/null +++ b/Assets/Fungus/Dialog/Scripts.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 04b9ccf7cc1a64058ad9340ed03b4a8b +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Scripts/Dialog.cs b/Assets/Fungus/Dialog/Scripts/Dialog.cs similarity index 100% rename from Assets/Fungus/Scripts/Dialog.cs rename to Assets/Fungus/Dialog/Scripts/Dialog.cs diff --git a/Assets/Fungus/Scripts/Dialog.cs.meta b/Assets/Fungus/Dialog/Scripts/Dialog.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/Dialog.cs.meta rename to Assets/Fungus/Dialog/Scripts/Dialog.cs.meta diff --git a/Assets/Fungus/Dialog/Sprites.meta b/Assets/Fungus/Dialog/Sprites.meta new file mode 100644 index 00000000..93bf4511 --- /dev/null +++ b/Assets/Fungus/Dialog/Sprites.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 04f39a8465c7b4c1eb3e17ea6351c43a +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Textures/BlueAlienHappy.png b/Assets/Fungus/Dialog/Sprites/BlueAlienHappy.png similarity index 100% rename from Assets/Fungus/Textures/BlueAlienHappy.png rename to Assets/Fungus/Dialog/Sprites/BlueAlienHappy.png diff --git a/Assets/Fungus/Textures/BlueAlienHappy.png.meta b/Assets/Fungus/Dialog/Sprites/BlueAlienHappy.png.meta similarity index 100% rename from Assets/Fungus/Textures/BlueAlienHappy.png.meta rename to Assets/Fungus/Dialog/Sprites/BlueAlienHappy.png.meta diff --git a/Assets/Fungus/Textures/BlueAlienSad.png b/Assets/Fungus/Dialog/Sprites/BlueAlienSad.png similarity index 100% rename from Assets/Fungus/Textures/BlueAlienSad.png rename to Assets/Fungus/Dialog/Sprites/BlueAlienSad.png diff --git a/Assets/Fungus/Textures/BlueAlienSad.png.meta b/Assets/Fungus/Dialog/Sprites/BlueAlienSad.png.meta similarity index 100% rename from Assets/Fungus/Textures/BlueAlienSad.png.meta rename to Assets/Fungus/Dialog/Sprites/BlueAlienSad.png.meta diff --git a/Assets/Fungus/Textures/ButtonBlack.psd b/Assets/Fungus/Dialog/Sprites/ButtonBlack.psd similarity index 100% rename from Assets/Fungus/Textures/ButtonBlack.psd rename to Assets/Fungus/Dialog/Sprites/ButtonBlack.psd diff --git a/Assets/Fungus/Textures/ButtonBlack.psd.meta b/Assets/Fungus/Dialog/Sprites/ButtonBlack.psd.meta similarity index 100% rename from Assets/Fungus/Textures/ButtonBlack.psd.meta rename to Assets/Fungus/Dialog/Sprites/ButtonBlack.psd.meta diff --git a/Assets/Fungus/Textures/ButtonOrange.psd b/Assets/Fungus/Dialog/Sprites/ButtonOrange.psd similarity index 100% rename from Assets/Fungus/Textures/ButtonOrange.psd rename to Assets/Fungus/Dialog/Sprites/ButtonOrange.psd diff --git a/Assets/Fungus/Textures/ButtonOrange.psd.meta b/Assets/Fungus/Dialog/Sprites/ButtonOrange.psd.meta similarity index 100% rename from Assets/Fungus/Textures/ButtonOrange.psd.meta rename to Assets/Fungus/Dialog/Sprites/ButtonOrange.psd.meta diff --git a/Assets/Fungus/Textures/Continue.psd b/Assets/Fungus/Dialog/Sprites/Continue.psd similarity index 100% rename from Assets/Fungus/Textures/Continue.psd rename to Assets/Fungus/Dialog/Sprites/Continue.psd diff --git a/Assets/Fungus/Textures/Continue.psd.meta b/Assets/Fungus/Dialog/Sprites/Continue.psd.meta similarity index 100% rename from Assets/Fungus/Textures/Continue.psd.meta rename to Assets/Fungus/Dialog/Sprites/Continue.psd.meta diff --git a/Assets/Fungus/Textures/DialogBackground.psd b/Assets/Fungus/Dialog/Sprites/DialogBackground.psd similarity index 100% rename from Assets/Fungus/Textures/DialogBackground.psd rename to Assets/Fungus/Dialog/Sprites/DialogBackground.psd diff --git a/Assets/Fungus/Textures/DialogBackground.psd.meta b/Assets/Fungus/Dialog/Sprites/DialogBackground.psd.meta similarity index 100% rename from Assets/Fungus/Textures/DialogBackground.psd.meta rename to Assets/Fungus/Dialog/Sprites/DialogBackground.psd.meta diff --git a/Assets/Fungus/Textures/GreenAlienHappy.png b/Assets/Fungus/Dialog/Sprites/GreenAlienHappy.png similarity index 100% rename from Assets/Fungus/Textures/GreenAlienHappy.png rename to Assets/Fungus/Dialog/Sprites/GreenAlienHappy.png diff --git a/Assets/Fungus/Textures/GreenAlienHappy.png.meta b/Assets/Fungus/Dialog/Sprites/GreenAlienHappy.png.meta similarity index 100% rename from Assets/Fungus/Textures/GreenAlienHappy.png.meta rename to Assets/Fungus/Dialog/Sprites/GreenAlienHappy.png.meta diff --git a/Assets/Fungus/Textures/GreenAlienSad.png b/Assets/Fungus/Dialog/Sprites/GreenAlienSad.png similarity index 100% rename from Assets/Fungus/Textures/GreenAlienSad.png rename to Assets/Fungus/Dialog/Sprites/GreenAlienSad.png diff --git a/Assets/Fungus/Textures/GreenAlienSad.png.meta b/Assets/Fungus/Dialog/Sprites/GreenAlienSad.png.meta similarity index 100% rename from Assets/Fungus/Textures/GreenAlienSad.png.meta rename to Assets/Fungus/Dialog/Sprites/GreenAlienSad.png.meta diff --git a/Assets/Fungus/Sprites/Mushroom.png b/Assets/Fungus/Dialog/Sprites/Mushroom.png similarity index 100% rename from Assets/Fungus/Sprites/Mushroom.png rename to Assets/Fungus/Dialog/Sprites/Mushroom.png diff --git a/Assets/Fungus/Textures/Mushroom.png.meta b/Assets/Fungus/Dialog/Sprites/Mushroom.png.meta similarity index 100% rename from Assets/Fungus/Textures/Mushroom.png.meta rename to Assets/Fungus/Dialog/Sprites/Mushroom.png.meta diff --git a/Assets/Fungus/Textures/PinkAlienHappy.png b/Assets/Fungus/Dialog/Sprites/PinkAlienHappy.png similarity index 100% rename from Assets/Fungus/Textures/PinkAlienHappy.png rename to Assets/Fungus/Dialog/Sprites/PinkAlienHappy.png diff --git a/Assets/Fungus/Textures/PinkAlienHappy.png.meta b/Assets/Fungus/Dialog/Sprites/PinkAlienHappy.png.meta similarity index 100% rename from Assets/Fungus/Textures/PinkAlienHappy.png.meta rename to Assets/Fungus/Dialog/Sprites/PinkAlienHappy.png.meta diff --git a/Assets/Fungus/Textures/PinkAlienSad.png b/Assets/Fungus/Dialog/Sprites/PinkAlienSad.png similarity index 100% rename from Assets/Fungus/Textures/PinkAlienSad.png rename to Assets/Fungus/Dialog/Sprites/PinkAlienSad.png diff --git a/Assets/Fungus/Textures/PinkAlienSad.png.meta b/Assets/Fungus/Dialog/Sprites/PinkAlienSad.png.meta similarity index 100% rename from Assets/Fungus/Textures/PinkAlienSad.png.meta rename to Assets/Fungus/Dialog/Sprites/PinkAlienSad.png.meta diff --git a/Assets/Fungus/Textures/TimerFrames.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames.meta similarity index 100% rename from Assets/Fungus/Textures/TimerFrames.meta rename to Assets/Fungus/Dialog/Sprites/TimerFrames.meta diff --git a/Assets/Fungus/Textures/TimerFrames/Timer.psd b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer.psd similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer.psd rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer.psd diff --git a/Assets/Fungus/Textures/TimerFrames/Timer.psd.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer.psd.meta similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer.psd.meta rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer.psd.meta diff --git a/Assets/Fungus/Textures/TimerFrames/Timer00.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer00.png similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer00.png rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer00.png diff --git a/Assets/Fungus/Textures/TimerFrames/Timer00.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer00.png.meta similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer00.png.meta rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer00.png.meta diff --git a/Assets/Fungus/Textures/TimerFrames/Timer01.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer01.png similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer01.png rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer01.png diff --git a/Assets/Fungus/Textures/TimerFrames/Timer01.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer01.png.meta similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer01.png.meta rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer01.png.meta diff --git a/Assets/Fungus/Textures/TimerFrames/Timer02.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer02.png similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer02.png rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer02.png diff --git a/Assets/Fungus/Textures/TimerFrames/Timer02.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer02.png.meta similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer02.png.meta rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer02.png.meta diff --git a/Assets/Fungus/Textures/TimerFrames/Timer03.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer03.png similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer03.png rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer03.png diff --git a/Assets/Fungus/Textures/TimerFrames/Timer03.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer03.png.meta similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer03.png.meta rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer03.png.meta diff --git a/Assets/Fungus/Textures/TimerFrames/Timer04.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer04.png similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer04.png rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer04.png diff --git a/Assets/Fungus/Textures/TimerFrames/Timer04.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer04.png.meta similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer04.png.meta rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer04.png.meta diff --git a/Assets/Fungus/Textures/TimerFrames/Timer05.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer05.png similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer05.png rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer05.png diff --git a/Assets/Fungus/Textures/TimerFrames/Timer05.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer05.png.meta similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer05.png.meta rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer05.png.meta diff --git a/Assets/Fungus/Textures/TimerFrames/Timer06.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer06.png similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer06.png rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer06.png diff --git a/Assets/Fungus/Textures/TimerFrames/Timer06.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer06.png.meta similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer06.png.meta rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer06.png.meta diff --git a/Assets/Fungus/Textures/TimerFrames/Timer07.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer07.png similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer07.png rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer07.png diff --git a/Assets/Fungus/Textures/TimerFrames/Timer07.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer07.png.meta similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer07.png.meta rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer07.png.meta diff --git a/Assets/Fungus/Textures/TimerFrames/Timer08.png b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer08.png similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer08.png rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer08.png diff --git a/Assets/Fungus/Textures/TimerFrames/Timer08.png.meta b/Assets/Fungus/Dialog/Sprites/TimerFrames/Timer08.png.meta similarity index 100% rename from Assets/Fungus/Textures/TimerFrames/Timer08.png.meta rename to Assets/Fungus/Dialog/Sprites/TimerFrames/Timer08.png.meta diff --git a/Assets/Fungus/Textures/license.txt b/Assets/Fungus/Dialog/Sprites/license.txt similarity index 100% rename from Assets/Fungus/Textures/license.txt rename to Assets/Fungus/Dialog/Sprites/license.txt diff --git a/Assets/Fungus/Textures/license.txt.meta b/Assets/Fungus/Dialog/Sprites/license.txt.meta similarity index 100% rename from Assets/Fungus/Textures/license.txt.meta rename to Assets/Fungus/Dialog/Sprites/license.txt.meta diff --git a/Assets/Fungus/Docs/Logo.png b/Assets/Fungus/Docs/Logo.png deleted file mode 100644 index e1a018d1..00000000 Binary files a/Assets/Fungus/Docs/Logo.png and /dev/null differ diff --git a/Assets/Fungus/Docs/Logo.png.meta b/Assets/Fungus/Docs/Logo.png.meta deleted file mode 100644 index b41ee928..00000000 --- a/Assets/Fungus/Docs/Logo.png.meta +++ /dev/null @@ -1,46 +0,0 @@ -fileFormatVersion: 2 -guid: 0b3589cf3d9d642afb8cfd46c86a1762 -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: -3 - maxTextureSize: 2048 - 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/Docs/_0_mainpage.md b/Assets/Fungus/Docs/_0_mainpage.md deleted file mode 100755 index afdafafd..00000000 --- a/Assets/Fungus/Docs/_0_mainpage.md +++ /dev/null @@ -1,10 +0,0 @@ -Main Page {#mainpage} -========= - -Fungus is an open source library for Unity 3D for creating interactive fiction / visual novel style games. It has been designed to be easy to use and customize, and is a useful tool for people learning to make games in Unity 3D for the first time. - -It was created and is maintained by Chris Gregan from [Snozbot.com](http://www.snozbot.com/). - -- See the [GameController](@ref Fungus.GameController) class for a full list of supported commands. -- See http://fungus.snozbot.com for more information about the Fungus project. - diff --git a/Assets/Fungus/Docs/_0_mainpage.md.meta b/Assets/Fungus/Docs/_0_mainpage.md.meta deleted file mode 100644 index 9d3bf488..00000000 --- a/Assets/Fungus/Docs/_0_mainpage.md.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 57663d9287fa64d3db27a3f8ec4411f7 -DefaultImporter: - userData: diff --git a/Assets/Fungus2/FungusCommands.meta b/Assets/Fungus/FungusCommands.meta similarity index 100% rename from Assets/Fungus2/FungusCommands.meta rename to Assets/Fungus/FungusCommands.meta diff --git a/Assets/Fungus/FungusCommands/Scripts.meta b/Assets/Fungus/FungusCommands/Scripts.meta new file mode 100644 index 00000000..bf223d18 --- /dev/null +++ b/Assets/Fungus/FungusCommands/Scripts.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: b7cacfabea94e487ea051fd27c5f7410 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/VisualScripting/FadeSprite.cs b/Assets/Fungus/FungusCommands/Scripts/FadeSprite.cs similarity index 100% rename from Assets/Fungus/VisualScripting/FadeSprite.cs rename to Assets/Fungus/FungusCommands/Scripts/FadeSprite.cs diff --git a/Assets/Fungus/VisualScripting/FadeSprite.cs.meta b/Assets/Fungus/FungusCommands/Scripts/FadeSprite.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/FadeSprite.cs.meta rename to Assets/Fungus/FungusCommands/Scripts/FadeSprite.cs.meta diff --git a/Assets/Fungus/VisualScripting/Option.cs b/Assets/Fungus/FungusCommands/Scripts/Option.cs similarity index 100% rename from Assets/Fungus/VisualScripting/Option.cs rename to Assets/Fungus/FungusCommands/Scripts/Option.cs diff --git a/Assets/Fungus/VisualScripting/Option.cs.meta b/Assets/Fungus/FungusCommands/Scripts/Option.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/Option.cs.meta rename to Assets/Fungus/FungusCommands/Scripts/Option.cs.meta diff --git a/Assets/Fungus/VisualScripting/Say.cs b/Assets/Fungus/FungusCommands/Scripts/Say.cs similarity index 100% rename from Assets/Fungus/VisualScripting/Say.cs rename to Assets/Fungus/FungusCommands/Scripts/Say.cs diff --git a/Assets/Fungus/VisualScripting/Say.cs.meta b/Assets/Fungus/FungusCommands/Scripts/Say.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/Say.cs.meta rename to Assets/Fungus/FungusCommands/Scripts/Say.cs.meta diff --git a/Assets/Fungus/VisualScripting/View.cs b/Assets/Fungus/FungusCommands/Scripts/View.cs similarity index 100% rename from Assets/Fungus/VisualScripting/View.cs rename to Assets/Fungus/FungusCommands/Scripts/View.cs diff --git a/Assets/Fungus/VisualScripting/View.cs.meta b/Assets/Fungus/FungusCommands/Scripts/View.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/View.cs.meta rename to Assets/Fungus/FungusCommands/Scripts/View.cs.meta diff --git a/Assets/Fungus2/FungusScript.meta b/Assets/Fungus/FungusScript.meta similarity index 100% rename from Assets/Fungus2/FungusScript.meta rename to Assets/Fungus/FungusScript.meta diff --git a/Assets/Fungus/FungusScript/Editor.meta b/Assets/Fungus/FungusScript/Editor.meta new file mode 100644 index 00000000..8b7ba371 --- /dev/null +++ b/Assets/Fungus/FungusScript/Editor.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: ef11f1c72b929498e835aa270145bf96 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Editor/FungusScript/CallEditor.cs b/Assets/Fungus/FungusScript/Editor/CallEditor.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/CallEditor.cs rename to Assets/Fungus/FungusScript/Editor/CallEditor.cs diff --git a/Assets/Fungus/Editor/FungusScript/CallEditor.cs.meta b/Assets/Fungus/FungusScript/Editor/CallEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/CallEditor.cs.meta rename to Assets/Fungus/FungusScript/Editor/CallEditor.cs.meta diff --git a/Assets/Fungus/Editor/Utilities/EditorExtensions.cs b/Assets/Fungus/FungusScript/Editor/EditorExtensions.cs similarity index 100% rename from Assets/Fungus/Editor/Utilities/EditorExtensions.cs rename to Assets/Fungus/FungusScript/Editor/EditorExtensions.cs diff --git a/Assets/Fungus/Editor/Utilities/EditorExtensions.cs.meta b/Assets/Fungus/FungusScript/Editor/EditorExtensions.cs.meta similarity index 100% rename from Assets/Fungus/Editor/Utilities/EditorExtensions.cs.meta rename to Assets/Fungus/FungusScript/Editor/EditorExtensions.cs.meta diff --git a/Assets/Fungus/Editor/FungusScript/FungusCommandEditor.cs b/Assets/Fungus/FungusScript/Editor/FungusCommandEditor.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/FungusCommandEditor.cs rename to Assets/Fungus/FungusScript/Editor/FungusCommandEditor.cs diff --git a/Assets/Fungus/Editor/FungusScript/FungusCommandEditor.cs.meta b/Assets/Fungus/FungusScript/Editor/FungusCommandEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/FungusCommandEditor.cs.meta rename to Assets/Fungus/FungusScript/Editor/FungusCommandEditor.cs.meta diff --git a/Assets/Fungus/Editor/FungusScript/FungusScriptEditor.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/FungusScriptEditor.cs rename to Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs diff --git a/Assets/Fungus/Editor/FungusScript/FungusScriptEditor.cs.meta b/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/FungusScriptEditor.cs.meta rename to Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs.meta diff --git a/Assets/Fungus/Editor/FungusScript/FungusScriptWindow.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/FungusScriptWindow.cs rename to Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs diff --git a/Assets/Fungus/Editor/FungusScript/FungusScriptWindow.cs.meta b/Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/FungusScriptWindow.cs.meta rename to Assets/Fungus/FungusScript/Editor/FungusScriptWindow.cs.meta diff --git a/Assets/Fungus/Editor/FungusScript/FungusVariableEditor.cs b/Assets/Fungus/FungusScript/Editor/FungusVariableEditor.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/FungusVariableEditor.cs rename to Assets/Fungus/FungusScript/Editor/FungusVariableEditor.cs diff --git a/Assets/Fungus/Editor/FungusScript/FungusVariableEditor.cs.meta b/Assets/Fungus/FungusScript/Editor/FungusVariableEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/FungusVariableEditor.cs.meta rename to Assets/Fungus/FungusScript/Editor/FungusVariableEditor.cs.meta diff --git a/Assets/Fungus/Editor/FungusScript/FungusVariableListAdaptor.cs b/Assets/Fungus/FungusScript/Editor/FungusVariableListAdaptor.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/FungusVariableListAdaptor.cs rename to Assets/Fungus/FungusScript/Editor/FungusVariableListAdaptor.cs diff --git a/Assets/Fungus/Editor/FungusScript/FungusVariableListAdaptor.cs.meta b/Assets/Fungus/FungusScript/Editor/FungusVariableListAdaptor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/FungusVariableListAdaptor.cs.meta rename to Assets/Fungus/FungusScript/Editor/FungusVariableListAdaptor.cs.meta diff --git a/Assets/Fungus/Editor/Utilities/GLDraw.cs b/Assets/Fungus/FungusScript/Editor/GLDraw.cs similarity index 100% rename from Assets/Fungus/Editor/Utilities/GLDraw.cs rename to Assets/Fungus/FungusScript/Editor/GLDraw.cs diff --git a/Assets/Fungus/Editor/Utilities/GLDraw.cs.meta b/Assets/Fungus/FungusScript/Editor/GLDraw.cs.meta similarity index 100% rename from Assets/Fungus/Editor/Utilities/GLDraw.cs.meta rename to Assets/Fungus/FungusScript/Editor/GLDraw.cs.meta diff --git a/Assets/Fungus/Editor/Icons.meta b/Assets/Fungus/FungusScript/Editor/Icons.meta similarity index 100% rename from Assets/Fungus/Editor/Icons.meta rename to Assets/Fungus/FungusScript/Editor/Icons.meta diff --git a/Assets/Fungus/Editor/Icons/ResizeHandle.png b/Assets/Fungus/FungusScript/Editor/Icons/ResizeHandle.png similarity index 100% rename from Assets/Fungus/Editor/Icons/ResizeHandle.png rename to Assets/Fungus/FungusScript/Editor/Icons/ResizeHandle.png diff --git a/Assets/Fungus/Editor/Icons/ResizeHandle.png.meta b/Assets/Fungus/FungusScript/Editor/Icons/ResizeHandle.png.meta similarity index 100% rename from Assets/Fungus/Editor/Icons/ResizeHandle.png.meta rename to Assets/Fungus/FungusScript/Editor/Icons/ResizeHandle.png.meta diff --git a/Assets/Fungus/Editor/FungusScript/IfEditor.cs b/Assets/Fungus/FungusScript/Editor/IfEditor.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/IfEditor.cs rename to Assets/Fungus/FungusScript/Editor/IfEditor.cs diff --git a/Assets/Fungus/Editor/FungusScript/IfEditor.cs.meta b/Assets/Fungus/FungusScript/Editor/IfEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/IfEditor.cs.meta rename to Assets/Fungus/FungusScript/Editor/IfEditor.cs.meta diff --git a/Assets/Fungus/Editor/FungusScript/OptionEditor.cs b/Assets/Fungus/FungusScript/Editor/OptionEditor.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/OptionEditor.cs rename to Assets/Fungus/FungusScript/Editor/OptionEditor.cs diff --git a/Assets/Fungus/Editor/FungusScript/OptionEditor.cs.meta b/Assets/Fungus/FungusScript/Editor/OptionEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/OptionEditor.cs.meta rename to Assets/Fungus/FungusScript/Editor/OptionEditor.cs.meta diff --git a/Assets/Fungus/Editor/FungusScript/SayEditor.cs b/Assets/Fungus/FungusScript/Editor/SayEditor.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/SayEditor.cs rename to Assets/Fungus/FungusScript/Editor/SayEditor.cs diff --git a/Assets/Fungus/Editor/FungusScript/SayEditor.cs.meta b/Assets/Fungus/FungusScript/Editor/SayEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/SayEditor.cs.meta rename to Assets/Fungus/FungusScript/Editor/SayEditor.cs.meta diff --git a/Assets/Fungus/Editor/FungusScript/SequenceEditor.cs b/Assets/Fungus/FungusScript/Editor/SequenceEditor.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/SequenceEditor.cs rename to Assets/Fungus/FungusScript/Editor/SequenceEditor.cs diff --git a/Assets/Fungus/Editor/FungusScript/SequenceEditor.cs.meta b/Assets/Fungus/FungusScript/Editor/SequenceEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/SequenceEditor.cs.meta rename to Assets/Fungus/FungusScript/Editor/SequenceEditor.cs.meta diff --git a/Assets/Fungus/Editor/FungusScript/SetEditor.cs b/Assets/Fungus/FungusScript/Editor/SetEditor.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/SetEditor.cs rename to Assets/Fungus/FungusScript/Editor/SetEditor.cs diff --git a/Assets/Fungus/Editor/FungusScript/SetEditor.cs.meta b/Assets/Fungus/FungusScript/Editor/SetEditor.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/SetEditor.cs.meta rename to Assets/Fungus/FungusScript/Editor/SetEditor.cs.meta diff --git a/Assets/Fungus/Editor/FungusScript/VariablesWindow.cs b/Assets/Fungus/FungusScript/Editor/VariablesWindow.cs similarity index 100% rename from Assets/Fungus/Editor/FungusScript/VariablesWindow.cs rename to Assets/Fungus/FungusScript/Editor/VariablesWindow.cs diff --git a/Assets/Fungus/Editor/FungusScript/VariablesWindow.cs.meta b/Assets/Fungus/FungusScript/Editor/VariablesWindow.cs.meta similarity index 100% rename from Assets/Fungus/Editor/FungusScript/VariablesWindow.cs.meta rename to Assets/Fungus/FungusScript/Editor/VariablesWindow.cs.meta diff --git a/Assets/Fungus/FungusScript/Scripts.meta b/Assets/Fungus/FungusScript/Scripts.meta new file mode 100644 index 00000000..2a6bae06 --- /dev/null +++ b/Assets/Fungus/FungusScript/Scripts.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 791c611829c954bc8bacad62f4ed4b71 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/VisualScripting/BooleanVariable.cs b/Assets/Fungus/FungusScript/Scripts/BooleanVariable.cs similarity index 100% rename from Assets/Fungus/VisualScripting/BooleanVariable.cs rename to Assets/Fungus/FungusScript/Scripts/BooleanVariable.cs diff --git a/Assets/Fungus/VisualScripting/BooleanVariable.cs.meta b/Assets/Fungus/FungusScript/Scripts/BooleanVariable.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/BooleanVariable.cs.meta rename to Assets/Fungus/FungusScript/Scripts/BooleanVariable.cs.meta diff --git a/Assets/Fungus/VisualScripting/Call.cs b/Assets/Fungus/FungusScript/Scripts/Call.cs similarity index 100% rename from Assets/Fungus/VisualScripting/Call.cs rename to Assets/Fungus/FungusScript/Scripts/Call.cs diff --git a/Assets/Fungus/VisualScripting/Call.cs.meta b/Assets/Fungus/FungusScript/Scripts/Call.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/Call.cs.meta rename to Assets/Fungus/FungusScript/Scripts/Call.cs.meta diff --git a/Assets/Fungus/VisualScripting/FloatVariable.cs b/Assets/Fungus/FungusScript/Scripts/FloatVariable.cs similarity index 100% rename from Assets/Fungus/VisualScripting/FloatVariable.cs rename to Assets/Fungus/FungusScript/Scripts/FloatVariable.cs diff --git a/Assets/Fungus/VisualScripting/FloatVariable.cs.meta b/Assets/Fungus/FungusScript/Scripts/FloatVariable.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/FloatVariable.cs.meta rename to Assets/Fungus/FungusScript/Scripts/FloatVariable.cs.meta diff --git a/Assets/Fungus/VisualScripting/FungusCommand.cs b/Assets/Fungus/FungusScript/Scripts/FungusCommand.cs similarity index 100% rename from Assets/Fungus/VisualScripting/FungusCommand.cs rename to Assets/Fungus/FungusScript/Scripts/FungusCommand.cs diff --git a/Assets/Fungus/VisualScripting/FungusCommand.cs.meta b/Assets/Fungus/FungusScript/Scripts/FungusCommand.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/FungusCommand.cs.meta rename to Assets/Fungus/FungusScript/Scripts/FungusCommand.cs.meta diff --git a/Assets/Fungus/VisualScripting/FungusScript.cs b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs similarity index 100% rename from Assets/Fungus/VisualScripting/FungusScript.cs rename to Assets/Fungus/FungusScript/Scripts/FungusScript.cs diff --git a/Assets/Fungus/VisualScripting/FungusScript.cs.meta b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/FungusScript.cs.meta rename to Assets/Fungus/FungusScript/Scripts/FungusScript.cs.meta diff --git a/Assets/Fungus/VisualScripting/FungusVariable.cs b/Assets/Fungus/FungusScript/Scripts/FungusVariable.cs similarity index 100% rename from Assets/Fungus/VisualScripting/FungusVariable.cs rename to Assets/Fungus/FungusScript/Scripts/FungusVariable.cs diff --git a/Assets/Fungus/VisualScripting/FungusVariable.cs.meta b/Assets/Fungus/FungusScript/Scripts/FungusVariable.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/FungusVariable.cs.meta rename to Assets/Fungus/FungusScript/Scripts/FungusVariable.cs.meta diff --git a/Assets/Fungus2/FungusScript/GlobalVariables.cs b/Assets/Fungus/FungusScript/Scripts/GlobalVariables.cs similarity index 100% rename from Assets/Fungus2/FungusScript/GlobalVariables.cs rename to Assets/Fungus/FungusScript/Scripts/GlobalVariables.cs diff --git a/Assets/Fungus2/FungusScript/GlobalVariables.cs.meta b/Assets/Fungus/FungusScript/Scripts/GlobalVariables.cs.meta similarity index 100% rename from Assets/Fungus2/FungusScript/GlobalVariables.cs.meta rename to Assets/Fungus/FungusScript/Scripts/GlobalVariables.cs.meta diff --git a/Assets/Fungus/VisualScripting/If.cs b/Assets/Fungus/FungusScript/Scripts/If.cs similarity index 100% rename from Assets/Fungus/VisualScripting/If.cs rename to Assets/Fungus/FungusScript/Scripts/If.cs diff --git a/Assets/Fungus/VisualScripting/If.cs.meta b/Assets/Fungus/FungusScript/Scripts/If.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/If.cs.meta rename to Assets/Fungus/FungusScript/Scripts/If.cs.meta diff --git a/Assets/Fungus/VisualScripting/IntegerVariable.cs b/Assets/Fungus/FungusScript/Scripts/IntegerVariable.cs similarity index 100% rename from Assets/Fungus/VisualScripting/IntegerVariable.cs rename to Assets/Fungus/FungusScript/Scripts/IntegerVariable.cs diff --git a/Assets/Fungus/VisualScripting/IntegerVariable.cs.meta b/Assets/Fungus/FungusScript/Scripts/IntegerVariable.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/IntegerVariable.cs.meta rename to Assets/Fungus/FungusScript/Scripts/IntegerVariable.cs.meta diff --git a/Assets/Fungus/Scripts/SceneLoader.cs b/Assets/Fungus/FungusScript/Scripts/SceneLoader.cs similarity index 100% rename from Assets/Fungus/Scripts/SceneLoader.cs rename to Assets/Fungus/FungusScript/Scripts/SceneLoader.cs diff --git a/Assets/Fungus/Scripts/SceneLoader.cs.meta b/Assets/Fungus/FungusScript/Scripts/SceneLoader.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/SceneLoader.cs.meta rename to Assets/Fungus/FungusScript/Scripts/SceneLoader.cs.meta diff --git a/Assets/Fungus/VisualScripting/Sequence.cs b/Assets/Fungus/FungusScript/Scripts/Sequence.cs similarity index 100% rename from Assets/Fungus/VisualScripting/Sequence.cs rename to Assets/Fungus/FungusScript/Scripts/Sequence.cs diff --git a/Assets/Fungus/VisualScripting/Sequence.cs.meta b/Assets/Fungus/FungusScript/Scripts/Sequence.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/Sequence.cs.meta rename to Assets/Fungus/FungusScript/Scripts/Sequence.cs.meta diff --git a/Assets/Fungus/VisualScripting/Set.cs b/Assets/Fungus/FungusScript/Scripts/Set.cs similarity index 100% rename from Assets/Fungus/VisualScripting/Set.cs rename to Assets/Fungus/FungusScript/Scripts/Set.cs diff --git a/Assets/Fungus/VisualScripting/Set.cs.meta b/Assets/Fungus/FungusScript/Scripts/Set.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/Set.cs.meta rename to Assets/Fungus/FungusScript/Scripts/Set.cs.meta diff --git a/Assets/Fungus/VisualScripting/StringVariable.cs b/Assets/Fungus/FungusScript/Scripts/StringVariable.cs similarity index 100% rename from Assets/Fungus/VisualScripting/StringVariable.cs rename to Assets/Fungus/FungusScript/Scripts/StringVariable.cs diff --git a/Assets/Fungus/VisualScripting/StringVariable.cs.meta b/Assets/Fungus/FungusScript/Scripts/StringVariable.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/StringVariable.cs.meta rename to Assets/Fungus/FungusScript/Scripts/StringVariable.cs.meta diff --git a/Assets/Fungus/Scripts/StringsParser.cs b/Assets/Fungus/FungusScript/Scripts/StringsParser.cs similarity index 100% rename from Assets/Fungus/Scripts/StringsParser.cs rename to Assets/Fungus/FungusScript/Scripts/StringsParser.cs diff --git a/Assets/Fungus/Scripts/StringsParser.cs.meta b/Assets/Fungus/FungusScript/Scripts/StringsParser.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/StringsParser.cs.meta rename to Assets/Fungus/FungusScript/Scripts/StringsParser.cs.meta diff --git a/Assets/Fungus/VisualScripting/Wait.cs b/Assets/Fungus/FungusScript/Scripts/Wait.cs similarity index 100% rename from Assets/Fungus/VisualScripting/Wait.cs rename to Assets/Fungus/FungusScript/Scripts/Wait.cs diff --git a/Assets/Fungus/VisualScripting/Wait.cs.meta b/Assets/Fungus/FungusScript/Scripts/Wait.cs.meta similarity index 100% rename from Assets/Fungus/VisualScripting/Wait.cs.meta rename to Assets/Fungus/FungusScript/Scripts/Wait.cs.meta diff --git a/Assets/Fungus/Legacy.meta b/Assets/Fungus/Legacy.meta new file mode 100644 index 00000000..67f10d66 --- /dev/null +++ b/Assets/Fungus/Legacy.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: aa3f588da95e04a38bc546ee65bbd724 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Scripts/Game.cs b/Assets/Fungus/Legacy/Game.cs similarity index 100% rename from Assets/Fungus/Scripts/Game.cs rename to Assets/Fungus/Legacy/Game.cs diff --git a/Assets/Fungus/Scripts/Game.cs.meta b/Assets/Fungus/Legacy/Game.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/Game.cs.meta rename to Assets/Fungus/Legacy/Game.cs.meta diff --git a/Assets/Fungus/Prefabs.meta b/Assets/Fungus/Legacy/Prefabs.meta similarity index 100% rename from Assets/Fungus/Prefabs.meta rename to Assets/Fungus/Legacy/Prefabs.meta diff --git a/Assets/Fungus/Prefabs/Game.prefab b/Assets/Fungus/Legacy/Prefabs/Game.prefab similarity index 100% rename from Assets/Fungus/Prefabs/Game.prefab rename to Assets/Fungus/Legacy/Prefabs/Game.prefab diff --git a/Assets/Fungus/Prefabs/Game.prefab.meta b/Assets/Fungus/Legacy/Prefabs/Game.prefab.meta similarity index 100% rename from Assets/Fungus/Prefabs/Game.prefab.meta rename to Assets/Fungus/Legacy/Prefabs/Game.prefab.meta diff --git a/Assets/Fungus/Prefabs/ScriptingRoom.prefab b/Assets/Fungus/Prefabs/ScriptingRoom.prefab deleted file mode 100644 index 4ab33aad..00000000 Binary files a/Assets/Fungus/Prefabs/ScriptingRoom.prefab and /dev/null differ diff --git a/Assets/Fungus/Prefabs/ScriptingRoom.prefab.meta b/Assets/Fungus/Prefabs/ScriptingRoom.prefab.meta deleted file mode 100644 index 7fa08f64..00000000 --- a/Assets/Fungus/Prefabs/ScriptingRoom.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 6e8f8f59ed030466b99184bf0fb44954 -NativeFormatImporter: - userData: diff --git a/Assets/Fungus2/Sprite.meta b/Assets/Fungus/Sprite.meta similarity index 100% rename from Assets/Fungus2/Sprite.meta rename to Assets/Fungus/Sprite.meta diff --git a/Assets/Fungus/Scripts/AnimationListener.cs b/Assets/Fungus/Sprite/AnimationListener.cs similarity index 100% rename from Assets/Fungus/Scripts/AnimationListener.cs rename to Assets/Fungus/Sprite/AnimationListener.cs diff --git a/Assets/Fungus/Scripts/AnimationListener.cs.meta b/Assets/Fungus/Sprite/AnimationListener.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/AnimationListener.cs.meta rename to Assets/Fungus/Sprite/AnimationListener.cs.meta diff --git a/Assets/Fungus/Scripts/Button.cs b/Assets/Fungus/Sprite/Button.cs similarity index 100% rename from Assets/Fungus/Scripts/Button.cs rename to Assets/Fungus/Sprite/Button.cs diff --git a/Assets/Fungus/Scripts/Button.cs.meta b/Assets/Fungus/Sprite/Button.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/Button.cs.meta rename to Assets/Fungus/Sprite/Button.cs.meta diff --git a/Assets/Fungus/Scripts/GUIButton.cs b/Assets/Fungus/Sprite/GUIButton.cs similarity index 100% rename from Assets/Fungus/Scripts/GUIButton.cs rename to Assets/Fungus/Sprite/GUIButton.cs diff --git a/Assets/Fungus/Scripts/GUIButton.cs.meta b/Assets/Fungus/Sprite/GUIButton.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/GUIButton.cs.meta rename to Assets/Fungus/Sprite/GUIButton.cs.meta diff --git a/Assets/Fungus/Scripts/Parallax.cs b/Assets/Fungus/Sprite/Parallax.cs similarity index 100% rename from Assets/Fungus/Scripts/Parallax.cs rename to Assets/Fungus/Sprite/Parallax.cs diff --git a/Assets/Fungus/Scripts/Parallax.cs.meta b/Assets/Fungus/Sprite/Parallax.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/Parallax.cs.meta rename to Assets/Fungus/Sprite/Parallax.cs.meta diff --git a/Assets/Fungus/Sprite/Prefabs.meta b/Assets/Fungus/Sprite/Prefabs.meta new file mode 100644 index 00000000..5c9b6119 --- /dev/null +++ b/Assets/Fungus/Sprite/Prefabs.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 2c8a8211b1b944debacc99b17624670e +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Prefabs/Button.prefab b/Assets/Fungus/Sprite/Prefabs/Button.prefab similarity index 85% rename from Assets/Fungus/Prefabs/Button.prefab rename to Assets/Fungus/Sprite/Prefabs/Button.prefab index 03d96669..f830536d 100644 Binary files a/Assets/Fungus/Prefabs/Button.prefab and b/Assets/Fungus/Sprite/Prefabs/Button.prefab differ diff --git a/Assets/Fungus/Prefabs/Button.prefab.meta b/Assets/Fungus/Sprite/Prefabs/Button.prefab.meta similarity index 100% rename from Assets/Fungus/Prefabs/Button.prefab.meta rename to Assets/Fungus/Sprite/Prefabs/Button.prefab.meta diff --git a/Assets/Fungus/Prefabs/GUIButton.prefab b/Assets/Fungus/Sprite/Prefabs/GUIButton.prefab similarity index 98% rename from Assets/Fungus/Prefabs/GUIButton.prefab rename to Assets/Fungus/Sprite/Prefabs/GUIButton.prefab index 13ee5f41..4d49a346 100644 Binary files a/Assets/Fungus/Prefabs/GUIButton.prefab and b/Assets/Fungus/Sprite/Prefabs/GUIButton.prefab differ diff --git a/Assets/Fungus/Prefabs/GUIButton.prefab.meta b/Assets/Fungus/Sprite/Prefabs/GUIButton.prefab.meta similarity index 100% rename from Assets/Fungus/Prefabs/GUIButton.prefab.meta rename to Assets/Fungus/Sprite/Prefabs/GUIButton.prefab.meta diff --git a/Assets/Fungus/Prefabs/ParallaxSprite.prefab b/Assets/Fungus/Sprite/Prefabs/ParallaxSprite.prefab similarity index 87% rename from Assets/Fungus/Prefabs/ParallaxSprite.prefab rename to Assets/Fungus/Sprite/Prefabs/ParallaxSprite.prefab index ffab647b..b14e85f7 100644 Binary files a/Assets/Fungus/Prefabs/ParallaxSprite.prefab and b/Assets/Fungus/Sprite/Prefabs/ParallaxSprite.prefab differ diff --git a/Assets/Fungus/Prefabs/ParallaxSprite.prefab.meta b/Assets/Fungus/Sprite/Prefabs/ParallaxSprite.prefab.meta similarity index 100% rename from Assets/Fungus/Prefabs/ParallaxSprite.prefab.meta rename to Assets/Fungus/Sprite/Prefabs/ParallaxSprite.prefab.meta diff --git a/Assets/Fungus/Scripts/SpriteFader.cs b/Assets/Fungus/Sprite/SpriteFader.cs similarity index 100% rename from Assets/Fungus/Scripts/SpriteFader.cs rename to Assets/Fungus/Sprite/SpriteFader.cs diff --git a/Assets/Fungus/Scripts/SpriteFader.cs.meta b/Assets/Fungus/Sprite/SpriteFader.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/SpriteFader.cs.meta rename to Assets/Fungus/Sprite/SpriteFader.cs.meta diff --git a/Assets/Fungus/Sprite/Sprites.meta b/Assets/Fungus/Sprite/Sprites.meta new file mode 100644 index 00000000..31aba49d --- /dev/null +++ b/Assets/Fungus/Sprite/Sprites.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 95007f6e545624b21a39aa21c579dcee +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Sprites/Button.psd b/Assets/Fungus/Sprite/Sprites/Button.psd similarity index 100% rename from Assets/Fungus/Sprites/Button.psd rename to Assets/Fungus/Sprite/Sprites/Button.psd diff --git a/Assets/Fungus/Sprites/Button.psd.meta b/Assets/Fungus/Sprite/Sprites/Button.psd.meta similarity index 100% rename from Assets/Fungus/Sprites/Button.psd.meta rename to Assets/Fungus/Sprite/Sprites/Button.psd.meta diff --git a/Assets/Fungus/Sprites/Fungus.png b/Assets/Fungus/Sprite/Sprites/Fungus.png similarity index 100% rename from Assets/Fungus/Sprites/Fungus.png rename to Assets/Fungus/Sprite/Sprites/Fungus.png diff --git a/Assets/Fungus/Sprites/Fungus.png.meta b/Assets/Fungus/Sprite/Sprites/Fungus.png.meta similarity index 100% rename from Assets/Fungus/Sprites/Fungus.png.meta rename to Assets/Fungus/Sprite/Sprites/Fungus.png.meta diff --git a/Assets/Fungus/Textures/Mushroom.png b/Assets/Fungus/Sprite/Sprites/Mushroom.png similarity index 100% rename from Assets/Fungus/Textures/Mushroom.png rename to Assets/Fungus/Sprite/Sprites/Mushroom.png diff --git a/Assets/Fungus/Sprites/Mushroom.png.meta b/Assets/Fungus/Sprite/Sprites/Mushroom.png.meta similarity index 100% rename from Assets/Fungus/Sprites/Mushroom.png.meta rename to Assets/Fungus/Sprite/Sprites/Mushroom.png.meta diff --git a/Assets/Fungus/Sprites/ScriptIcon.png b/Assets/Fungus/Sprite/Sprites/ScriptIcon.png similarity index 100% rename from Assets/Fungus/Sprites/ScriptIcon.png rename to Assets/Fungus/Sprite/Sprites/ScriptIcon.png diff --git a/Assets/Fungus/Sprites/ScriptIcon.png.meta b/Assets/Fungus/Sprite/Sprites/ScriptIcon.png.meta similarity index 100% rename from Assets/Fungus/Sprites/ScriptIcon.png.meta rename to Assets/Fungus/Sprite/Sprites/ScriptIcon.png.meta diff --git a/Assets/Fungus/Textures.meta b/Assets/Fungus/Textures.meta deleted file mode 100644 index 509cf7e4..00000000 --- a/Assets/Fungus/Textures.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: cf85925068af94b348277e4f112490c1 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Fungus/Thirdparty.meta b/Assets/Fungus/Thirdparty.meta index a728c87b..9bc96c9b 100644 --- a/Assets/Fungus/Thirdparty.meta +++ b/Assets/Fungus/Thirdparty.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 480b070201a224941aa71ed609c4a6b6 +guid: aa9883c4a47464bd48b50f71c90587c9 folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Thirdparty/Reorderable List Field.meta b/Assets/Fungus/Thirdparty/ReorderableListField.meta similarity index 100% rename from Assets/Fungus/Thirdparty/Reorderable List Field.meta rename to Assets/Fungus/Thirdparty/ReorderableListField.meta diff --git a/Assets/Fungus/Thirdparty/Reorderable List Field/Editor.meta b/Assets/Fungus/Thirdparty/ReorderableListField/Editor.meta similarity index 100% rename from Assets/Fungus/Thirdparty/Reorderable List Field/Editor.meta rename to Assets/Fungus/Thirdparty/ReorderableListField/Editor.meta diff --git a/Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.dll b/Assets/Fungus/Thirdparty/ReorderableListField/Editor/Editor.ReorderableList.dll similarity index 100% rename from Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.dll rename to Assets/Fungus/Thirdparty/ReorderableListField/Editor/Editor.ReorderableList.dll diff --git a/Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.dll.meta b/Assets/Fungus/Thirdparty/ReorderableListField/Editor/Editor.ReorderableList.dll.meta similarity index 100% rename from Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.dll.meta rename to Assets/Fungus/Thirdparty/ReorderableListField/Editor/Editor.ReorderableList.dll.meta diff --git a/Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.xml b/Assets/Fungus/Thirdparty/ReorderableListField/Editor/Editor.ReorderableList.xml similarity index 100% rename from Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.xml rename to Assets/Fungus/Thirdparty/ReorderableListField/Editor/Editor.ReorderableList.xml diff --git a/Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.xml.meta b/Assets/Fungus/Thirdparty/ReorderableListField/Editor/Editor.ReorderableList.xml.meta similarity index 100% rename from Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.xml.meta rename to Assets/Fungus/Thirdparty/ReorderableListField/Editor/Editor.ReorderableList.xml.meta diff --git a/Assets/Fungus/Thirdparty/Reorderable List Field/LICENSE.txt b/Assets/Fungus/Thirdparty/ReorderableListField/LICENSE.txt similarity index 100% rename from Assets/Fungus/Thirdparty/Reorderable List Field/LICENSE.txt rename to Assets/Fungus/Thirdparty/ReorderableListField/LICENSE.txt diff --git a/Assets/Fungus/Thirdparty/Reorderable List Field/LICENSE.txt.meta b/Assets/Fungus/Thirdparty/ReorderableListField/LICENSE.txt.meta similarity index 100% rename from Assets/Fungus/Thirdparty/Reorderable List Field/LICENSE.txt.meta rename to Assets/Fungus/Thirdparty/ReorderableListField/LICENSE.txt.meta diff --git a/Assets/Fungus/Thirdparty/Reorderable List Field/README.txt b/Assets/Fungus/Thirdparty/ReorderableListField/README.txt similarity index 100% rename from Assets/Fungus/Thirdparty/Reorderable List Field/README.txt rename to Assets/Fungus/Thirdparty/ReorderableListField/README.txt diff --git a/Assets/Fungus/Thirdparty/Reorderable List Field/README.txt.meta b/Assets/Fungus/Thirdparty/ReorderableListField/README.txt.meta similarity index 100% rename from Assets/Fungus/Thirdparty/Reorderable List Field/README.txt.meta rename to Assets/Fungus/Thirdparty/ReorderableListField/README.txt.meta diff --git a/Assets/Fungus/Thirdparty/iTween.meta b/Assets/Fungus/Thirdparty/iTween.meta new file mode 100644 index 00000000..b77d0cdf --- /dev/null +++ b/Assets/Fungus/Thirdparty/iTween.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: f23fa067728c04f50b8f1b3a50afb939 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Scripts/iTween.cs b/Assets/Fungus/Thirdparty/iTween/iTween.cs similarity index 100% rename from Assets/Fungus/Scripts/iTween.cs rename to Assets/Fungus/Thirdparty/iTween/iTween.cs diff --git a/Assets/Fungus/Scripts/iTween.cs.meta b/Assets/Fungus/Thirdparty/iTween/iTween.cs.meta similarity index 100% rename from Assets/Fungus/Scripts/iTween.cs.meta rename to Assets/Fungus/Thirdparty/iTween/iTween.cs.meta diff --git a/Assets/Fungus/VisualScripting.meta b/Assets/Fungus/VisualScripting.meta deleted file mode 100644 index d352de48..00000000 --- a/Assets/Fungus/VisualScripting.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 1a6df1b36ed2546c49bdbfaaff2cc9f5 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Fungus2.meta b/Assets/Fungus2.meta deleted file mode 100644 index 163520c3..00000000 --- a/Assets/Fungus2.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 120b23b5240c94aee960b7434706811c -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index 538306bd..c1fbba6e 100644 Binary files a/Assets/Shuttle/ShuttleGame.unity and b/Assets/Shuttle/ShuttleGame.unity differ