aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
Commit message (Collapse)AuthorAge
* Replacing old button component with montage button component in our UI.Nivesh Rajbhandari2012-03-19
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵Nivesh Rajbhandari2012-02-22
| | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
* Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵Nivesh Rajbhandari2012-02-22
| | | | | | materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Updated Materials Library and Materials Editor Popup to work with latest ↵mqg7342012-02-21
| | | | | | | | version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error.
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\ | | | | | | | | Conflicts: js/ninja.reel/ninja.html
| * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-09
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLMaterial.js js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/FlatMaterial.js js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js js/helper-classes/RDGE/Materials/JuliaMaterial.js js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js js/helper-classes/RDGE/Materials/MandelMaterial.js js/helper-classes/RDGE/Materials/PlasmaMaterial.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/Materials/RadialGradientMaterial.js js/helper-classes/RDGE/Materials/TunnelMaterial.js js/helper-classes/RDGE/Materials/TwistMaterial.js js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/src/core/script/renderer.js js/panels/Materials/Materials.xml Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Removed unused materials.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\ \ \ | | |/ | |/|
| * | updated from old repohwc4872012-01-27
| |/
* / Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>