Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/runtime/GLRuntime.js
	js/helper-classes/RDGE/src/core/script/MeshManager.js
	js/helper-classes/RDGE/src/core/script/engine.js
	js/helper-classes/RDGE/src/core/script/fx/ssao.js
	js/helper-classes/RDGE/src/core/script/init_state.js
	js/helper-classes/RDGE/src/core/script/run_state.js
	js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
	js/helper-classes/RDGE/src/core/script/utilities.js
	js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
	js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/lib/drawing/world.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/linear-gradient-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-blur-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js
	js/preloader/Preloader.js

1 files changed, 239 insertions, 0 deletions

diff --git a/js/panels/color/colorchippopup.reel/css/colorchippopup.css b/js/panels/color/colorchippopup.reel/css/colorchippopup.css
new file mode 100755
index 00000000..514c8e9f
--- /dev/null
+++ b/js/panels/color/colorchippopup.reel/css/colorchippopup.css
@@ -0,0 +1,239 @@
+@charset "UTF-8";
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+/* line 12, colorchippopup.scss */
+.cc_popup {
+  overflow: hidden;
+  font-size: 12px;
+  text-shadow: 1px 1px 1px #000;
+  font-family: 'Droid Sans', sans-serif;
+}
+
+/* line 20, colorchippopup.scss */
+#cc_pu_options {
+  float: left;
+  clear: both;
+  width: 100%;
+}
+
+/* line 27, colorchippopup.scss */
+#cc_pu_options button {
+  display: block;
+  width: 16px;
+  height: 16px;
+  margin: 4px 0px 2px 2px;
+  text-indent: -9999px;
+  overflow: hidden;
+  float: right;
+  padding: 0px;
+  cursor: pointer;
+  border: 1px solid transparent;
+}
+
+/* line 41, colorchippopup.scss */
+#cc_pu_options button:hover {
+  border: 1px solid #FFF;
+  box-shadow: 0px 0px 4px #000;
+}
+
+/* line 47, colorchippopup.scss */
+#cc_pu_wheel {
+  background: url(../img/icon_colorwheel.png) no-repeat transparent top left;
+}
+
+/* line 52, colorchippopup.scss */
+#cc_pu_images {
+  background: url(../img/icon_bitmap.png) no-repeat black top left;
+}
+
+/* line 57, colorchippopup.scss */
+#cc_pu_gradients {
+  background: url(../img/icon_gradient.png) no-repeat black top left;
+}
+
+/* line 62, colorchippopup.scss */
+#cc_pu_palettes {
+  background: #000;
+}
+
+/* line 67, colorchippopup.scss */
+#cc_pu_nocolor {
+  background: url(../img/icon_nofill.png) no-repeat black top left;
+}
+
+/* line 71, colorchippopup.scss */
+#cc_pu_history {
+  float: left;
+  margin: 0px 0px 0px 0px;
+  background: url(../../../../../images/colorpanel/transparent.png) repeat;
+}
+
+/* line 77, colorchippopup.scss */
+#cc_pu_history button {
+  width: 22px;
+  height: 22px;
+  overflow: hidden;
+  text-indent: -9999px;
+  background: #333;
+  float: right;
+  border: solid 1px #000;
+  cursor: pointer;
+  margin: 0px -1px 0px 0px;
+  padding: 0px;
+}
+
+/* line 91, colorchippopup.scss */
+#cc_pu_history button:hover {
+  border: solid 1px #000 !important;
+  box-shadow: none !important;
+}
+
+/* line 97, colorchippopup.scss */
+#cc_pu_hex {
+  float: left;
+  margin: 3px 2px 0px 6px;
+}
+
+/* line 102, colorchippopup.scss */
+#cc_pu_hex input {
+  width: 50px;
+  background: #555;
+  border: 1px solid #333;
+  color: #FFF;
+  padding: 1px 0px 1px 0px;
+  margin: 0px 0px 0px 2px;
+  text-transform: uppercase;
+  text-decoration: none !important;
+  text-shadow: 1px 1px 1px #000;
+  font-family: 'Droid Sans', sans-serif;
+  font-size: 11px;
+  letter-spacing: 1px;
+  text-align: center;
+}
+
+/* line 118, colorchippopup.scss */
+#cc_pu_hex input:focus {
+  outline: none;
+  padding: 2px 0px 2px 0px;
+  margin: -1px 0px -1px 2px;
+  background: #FFF;
+  color: #000;
+  text-shadow: none;
+}
+
+/* line 128, colorchippopup.scss */
+#cc_pu_content {
+  float: left;
+  clear: both;
+  width: 100%;
+  margin: 6px 0px;
+}
+
+/* line 136, colorchippopup.scss */
+#cc_pu_content div {
+  display: none;
+}
+
+/* line 141, colorchippopup.scss */
+#cc_pu_alpha {
+  float: left;
+  clear: both;
+  width: 100%;
+  margin: 0px;
+}
+
+/* line 149, colorchippopup.scss */
+#cc_pu_alpha .slider-track {
+  background: none;
+}
+
+/* line 154, colorchippopup.scss */
+#cc_pu_alpha .knob {
+  background: url(../img/knob.png) no-repeat transparent center center;
+}
+
+/* line 159, colorchippopup.scss */
+#cc_pu_a_label, #cc_pu_a_label2 {
+  float: left;
+  width: auto;
+  font-size: 11px;
+}
+
+/* line 166, colorchippopup.scss */
+#cc_pu_a_slider, .cc_pu_a_slider {
+  width: 120px;
+  height: 12px;
+  float: left;
+  clear: none;
+  margin: 0px 10px 5px 10px;
+}
+
+/* line 175, colorchippopup.scss */
+#cc_pu_a_hottext.hottext, .cc_pu_a_hottext.hottext {
+  background: none;
+  float: left;
+  margin: -1px 2px 0px 0px;
+  padding: 0px;
+  width: 23px;
+  color: #FFF;
+  text-shadow: 1px 1px 1px #000;
+  font-family: 'Droid Sans', sans-serif;
+  font-size: 11px;
+  text-align: center;
+}
+
+/* line 189, colorchippopup.scss */
+#cc_pu_a_hottext.hottextInput, .cc_pu_a_hottext.hottextInput {
+  background: #FFF;
+  color: #000;
+  text-shadow: none;
+  border: 1px solid #333;
+  margin: -3px 1px 0px 0px;
+  padding: 1px;
+  text-decoration: none;
+  font-family: 'Droid Sans', sans-serif;
+  font-size: 11px;
+  outline: none;
+  float: left;
+}
+
+/* line 204, colorchippopup.scss */
+#cc_pu_wheel_container, .cc_pu_wheel_container {
+  width: 202px;
+  height: 202px;
+}
+
+/* line 211, colorchippopup.scss */
+#cc_pu_palette_container, .cc_pu_palette_container {