Merge pull request #35 from snozbot/VisualScripting

merging Fungus 2 branch back to master
snozbot · Sep 15, 2014 · d0b739f · d0b739f
2 parents 1d7df50 + 63ccec7
commit d0b739f
Show file tree

Hide file tree

Showing 549 changed files with 9,034 additions and 12,997 deletions.
diff --git a/Assets/Fungus/Docs.meta → Assets/Example.meta b/Assets/Fungus/Docs.meta → Assets/Example.meta
diff --git a/Assets/FungusExample/Audio.meta → Assets/Example/Audio.meta b/Assets/FungusExample/Audio.meta → Assets/Example/Audio.meta
diff --git a/Assets/Example/Audio/UpATree.ogg b/Assets/Example/Audio/UpATree.ogg
diff --git a/Assets/FungusExample/Audio/effect.wav.meta → Assets/Example/Audio/UpATree.ogg.meta b/Assets/FungusExample/Audio/effect.wav.meta → Assets/Example/Audio/UpATree.ogg.meta
diff --git a/Assets/FungusExample/Scenes.meta → Assets/Example/Scenes.meta b/Assets/FungusExample/Scenes.meta → Assets/Example/Scenes.meta
diff --git a/Assets/Example/Scenes/Example.unity b/Assets/Example/Scenes/Example.unity
diff --git a/...s/FungusExample/Scenes/Example.unity.meta → Assets/Example/Scenes/Example.unity.meta b/...s/FungusExample/Scenes/Example.unity.meta → Assets/Example/Scenes/Example.unity.meta
diff --git a/Assets/Fungus/Sprites.meta → Assets/Example/Sprites.meta b/Assets/Fungus/Sprites.meta → Assets/Example/Sprites.meta
diff --git a/Assets/Example/Sprites/Attribution.txt b/Assets/Example/Sprites/Attribution.txt
@@ -0,0 +1,8 @@
+Creative Commons / Public Domain artwork used with permission.
+Mnay thanks to the authors for sharing!
+
+http://denmanrooke.com/creativecommons/
+http://syntetyc.deviantart.com/art/Waterfall-forest-214723814
+http://syntetyc.deviantart.com/art/Green-Forest-206321928
+http://syntetyc.deviantart.com/art/Sanctuary-Forest-207795795
+http://syntetyc.deviantart.com/art/Deep-Forest-204641620
diff --git a/...MouseRunnerDotComGraphicsLicense.txt.meta → Assets/Example/Sprites/Attribution.txt.meta b/...MouseRunnerDotComGraphicsLicense.txt.meta → Assets/Example/Sprites/Attribution.txt.meta
diff --git a/Assets/Example/Sprites/Bear.png b/Assets/Example/Sprites/Bear.png
diff --git a/Assets/Example/Sprites/Bear.png.meta b/Assets/Example/Sprites/Bear.png.meta
diff --git a/Assets/Example/Sprites/BearHead.png b/Assets/Example/Sprites/BearHead.png
diff --git a/...e/Sprites/MushroomLand/bg_desert.png.meta → Assets/Example/Sprites/BearHead.png.meta b/...e/Sprites/MushroomLand/bg_desert.png.meta → Assets/Example/Sprites/BearHead.png.meta
diff --git a/Assets/Example/Sprites/Ciara.psd b/Assets/Example/Sprites/Ciara.psd
diff --git a/Assets/Example/Sprites/Ciara.psd.meta b/Assets/Example/Sprites/Ciara.psd.meta
diff --git a/Assets/Example/Sprites/CiaraHead.psd b/Assets/Example/Sprites/CiaraHead.psd
diff --git a/Assets/Example/Sprites/CiaraHead.psd.meta b/Assets/Example/Sprites/CiaraHead.psd.meta
diff --git a/Assets/Example/Sprites/DeepForest.jpg b/Assets/Example/Sprites/DeepForest.jpg
diff --git a/Assets/Example/Sprites/DeepForest.jpg.meta b/Assets/Example/Sprites/DeepForest.jpg.meta
diff --git a/Assets/Example/Sprites/SanctuaryForest.jpg b/Assets/Example/Sprites/SanctuaryForest.jpg
diff --git a/Assets/Example/Sprites/SanctuaryForest.jpg.meta b/Assets/Example/Sprites/SanctuaryForest.jpg.meta
diff --git a/Assets/Example/Sprites/Shay.psd b/Assets/Example/Sprites/Shay.psd
diff --git a/Assets/Example/Sprites/Shay.psd.meta b/Assets/Example/Sprites/Shay.psd.meta
diff --git a/Assets/Example/Sprites/ShayHead.psd b/Assets/Example/Sprites/ShayHead.psd