106 files changed, 2353 insertions, 1515 deletions
diff --git a/.gitignore b/.gitignore
index 6c288e8c..40248468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,9 +8,6 @@ images/treeControl/Thumbs.db
 .DS_Store
 .project
-_scss/compass_app_log.txt
-_scss/.sass-cache
 js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
 js/panels/Color/colorpanelpopup.reel/compass_app_log.txt
 js/panels/Color/colorpanelbase.reel/compass_app_log.txt
@@ -21,6 +18,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
 cloud/
 /.idea/scopes/scope_settings.xml
-_scss/imports/scss/_Stage.scss
 compass_app_log.txt
-js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc
-\ No newline at end of file
+js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc
+scss/.sass-cache/
+\ No newline at end of file
diff --git a/assets/descriptor.json b/assets/descriptor.json
new file mode 100644
index 00000000..53bfb684
--- /dev/null
+++ b/assets/descriptor.json
@@ -0,0 +1,34 @@
+{
+        "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.",
+        "version": "0.0.0.0",
+        "root": "/assets/",
+        "directories": [{"name": "images"}, {"name": "shaders"}],
+        "files": [
+                "images/black.png",
+                "images/blue.png",
+                "images/BoxB2_AO.png",
+                "images/BoxB2_DM.png",
+                "images/cubelight.png",
+                "images/grey.png",
+                "images/material_paint.png",
+                "images/metal.png",
+                "images/normalMap.png",
+                "images/random_normal.png",
+                "images/rocky-diffuse.jpg",
+                "images/rocky-normal.jpg",
+                "images/rocky-spec.jpg",
+                "images/silver.png",
+                "images/white.png",
+                "shaders/Basic.frag.glsl",
+                "shaders/Basic.vert.glsl",
+                "shader

diff --git a/.gitignore b/.gitignore index 6c288e8c..40248468 100644 --- a/.gitignore +++ b/.gitignore
@@ -8,9 +8,6 @@ images/treeControl/Thumbs.db
8	.DS_Store	8	.DS_Store
9	.project	9	.project
10		10
11	_scss/compass_app_log.txt
12	_scss/.sass-cache
13
14	js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc	11	js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
15	js/panels/Color/colorpanelpopup.reel/compass_app_log.txt	12	js/panels/Color/colorpanelpopup.reel/compass_app_log.txt
16	js/panels/Color/colorpanelbase.reel/compass_app_log.txt	13	js/panels/Color/colorpanelbase.reel/compass_app_log.txt
@@ -21,6 +18,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
21	cloud/	18	cloud/
22		19
23	/.idea/scopes/scope_settings.xml	20	/.idea/scopes/scope_settings.xml
24	_scss/imports/scss/_Stage.scss
25	compass_app_log.txt	21	compass_app_log.txt
26	js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc \ No newline at end of file	22	js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc
		23	scss/.sass-cache/ \ No newline at end of file


diff --git a/assets/descriptor.json b/assets/descriptor.json new file mode 100644 index 00000000..53bfb684 --- /dev/null +++ b/assets/descriptor.json
@@ -0,0 +1,34 @@
		1	{
		2	"copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.",
		3	"version": "0.0.0.0",
		4	"root": "/assets/",
		5	"directories": [{"name": "images"}, {"name": "shaders"}],
		6	"files": [
		7	"images/black.png",
		8	"images/blue.png",
		9	"images/BoxB2_AO.png",
		10	"images/BoxB2_DM.png",
		11	"images/cubelight.png",
		12	"images/grey.png",
		13	"images/material_paint.png",
		14	"images/metal.png",
		15	"images/normalMap.png",
		16	"images/random_normal.png",
		17	"images/rocky-diffuse.jpg",
		18	"images/rocky-normal.jpg",
		19	"images/rocky-spec.jpg",
		20	"images/silver.png",
		21	"images/white.png",
		22	"shaders/Basic.frag.glsl",
		23	"shaders/Basic.vert.glsl",
		24	"shader