Merge branch 'master' of git://github.com/Xephorium/xenia into Xephorium-master

24 files changed, 26 insertions, 0 deletions

diff --git a/assets/icon/128x128.png b/assets/icon/128x128.png
index 231718bb7..c266576e6 100644
--- a/assets/icon/128x128.png
+++ b/assets/icon/128x128.png
diff --git a/assets/icon/16x16.png b/assets/icon/16x16.png
index d28919c4b..77d669639 100644
--- a/assets/icon/16x16.png
+++ b/assets/icon/16x16.png
diff --git a/assets/icon/256x256.png b/assets/icon/256x256.png
index 0c530d578..d9cb2976e 100644
--- a/assets/icon/256x256.png
+++ b/assets/icon/256x256.png
diff --git a/assets/icon/32x32.png b/assets/icon/32x32.png
index 9ae25c42e..c82a2463a 100644
--- a/assets/icon/32x32.png
+++ b/assets/icon/32x32.png
diff --git a/assets/icon/36x36.png b/assets/icon/36x36.png
index 18f0ee0e8..3a25e4c3f 100644
--- a/assets/icon/36x36.png
+++ b/assets/icon/36x36.png
diff --git a/assets/icon/37x37.png b/assets/icon/37x37.png
index 86e0c33f1..f515c8632 100644
--- a/assets/icon/37x37.png
+++ b/assets/icon/37x37.png
diff --git a/assets/icon/48x48.png b/assets/icon/48x48.png
index a2307c355..5449d62c4 100644
--- a/assets/icon/48x48.png
+++ b/assets/icon/48x48.png
diff --git a/assets/icon/512x512.png b/assets/icon/512x512.png
index 647425b38..103a78ca8 100644
--- a/assets/icon/512x512.png
+++ b/assets/icon/512x512.png
diff --git a/assets/icon/64x64.png b/assets/icon/64x64.png
index 3f662265e..1fdc81a25 100644
--- a/assets/icon/64x64.png
+++ b/assets/icon/64x64.png
diff --git a/assets/icon/Icon.blend b/assets/icon/Icon.blend
new file mode 100644
index 000000000..a7a4a045e
--- /dev/null
+++ b/assets/icon/Icon.blend
diff --git a/assets/icon/Rendering Instructions.txt b/assets/icon/Rendering Instructions.txt
new file mode 100644
index 000000000..bf73392af
--- /dev/null
+++ b/assets/icon/Rendering Instructions.txt
@@ -0,0 +1,26 @@
+
+/// -------------- *** -------------- ///
+///                                   ///
+///      Rendering Instructions       ///
+///                                   ///
+/// -------------- *** -------------- ///
+
+For those not well-versed in Blender, this document explains
+how to render the icon in any desired resolution and color.
+
+To Change Resolution:
+  1. Open Icon.blend in Blender.
+  2. In the right tool pane, look for "Resolution" under the
+     "Dimensions" settings. It should be defaulted to 512x512.
+     This is where you'll change the icon output dimensions.
+  3. After you've set the value to what you want, hit F12 or
+     select 'Render' > 'Render Image' from the top bar. This
+     will render the icon.
+  4. To save, hit F3 or select 'Image' > 'Save As Image' on
+     the left toward the middle of the screen.
+
+To Change Colors:
+  1. Open Icon.blend in Blender.
+  2. The icon's colors will appear in the bottom window as
+     labeled nodes. Change them by clicking on each node.
+  3. Render and save as described above.
\ No newline at end of file
diff --git a/assets/icon/icon.ico b/assets/icon/icon.ico
index d35265440..103a78ca8 100644
--- a/assets/icon/icon.ico
+++ b/assets/icon/icon.ico
diff --git a/assets/icon/original icon by KMA/128x128.png b/assets/icon/original icon by KMA/128x128.png
new file mode 100644
index 000000000..231718bb7
--- /dev/null
+++ b/assets/icon/original icon by KMA/128x128.png
diff --git a/assets/icon/original icon by KMA/16x16.png b/assets/icon/original icon by KMA/16x16.png
new file mode 100644
index 000000000..d28919c4b
--- /dev/null
+++ b/assets/icon/original icon by KMA/16x16.png
diff --git a/assets/icon/original icon by KMA/256x256.png b/assets/icon/original icon by KMA/256x256.png
new file mode 100644
index 000000000..0c530d578
--- /dev/null
+++ b/assets/icon/original icon by KMA/256x256.png
diff --git a/assets/icon/original icon by KMA/32x32.png b/assets/icon/original icon by KMA/32x32.png
new file mode 100644
index 000000000..9ae25c42e
--- /dev/null
+++ b/assets/icon/original icon by KMA/32x32.png
diff --git a/assets/icon/original icon by KMA/36x36.png b/assets/icon/original icon by KMA/36x36.png
new file mode 100644
index 000000000..18f0ee0e8
--- /dev/null
+++ b/assets/icon/original icon by KMA/36x36.png
diff --git a/assets/icon/original icon by KMA/37x37.png b/assets/icon/original icon by KMA/37x37.png
new file mode 100644
index 000000000..86e0c33f1
--- /dev/null
+++ b/assets/icon/original icon by KMA/37x37.png
diff --git a/assets/icon/original icon by KMA/48x48.png b/assets/icon/original icon by KMA/48x48.png
new file mode 100644
index 000000000..a2307c355
--- /dev/null
+++ b/assets/icon/original icon by KMA/48x48.png
diff --git a/assets/icon/original icon by KMA/512x512.png b/assets/icon/original icon by KMA/512x512.png
new file mode 100644
index 000000000..647425b38
--- /dev/null
+++ b/assets/icon/original icon by KMA/512x512.png
diff --git a/assets/icon/original icon by KMA/64x64.png b/assets/icon/original icon by KMA/64x64.png
new file mode 100644
index 000000000..3f662265e
--- /dev/null
+++ b/assets/icon/original icon by KMA/64x64.png
diff --git a/assets/icon/Icon.psd b/assets/icon/original icon by KMA/Icon.psd
index 16afc8084..16afc8084 100644
--- a/assets/icon/Icon.psd
+++ b/assets/icon/original icon by KMA/Icon.psd
diff --git a/assets/icon/Icon_Complex.psd b/assets/icon/original icon by KMA/Icon_Complex.psd
index f343a1363..f343a1363 100644
--- a/assets/icon/Icon_Complex.psd
+++ b/assets/icon/original icon by KMA/Icon_Complex.psd
diff --git a/assets/icon/original icon by KMA/icon.ico b/assets/icon/original icon by KMA/icon.ico
new file mode 100644
index 000000000..d35265440
--- /dev/null
+++ b/assets/icon/original icon by KMA/icon.ico