aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
Commit message (Expand)AuthorAge
* Re-added Raiders materialhwc4872012-06-15
* Re-added Paris materialhwc4872012-06-15
* Added correct 'Cancel' behavior to the material editorhwc4872012-06-15
* Material changes through the popup editor can effect multiple material instan...hwc4872012-06-15
* Fix for line color.hwc4872012-06-14
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
|\
| * adding more missing properties to the serializationValerio Virgillito2012-06-12
| * first iteration of adding serializable to ninja plus other changes to run the...Valerio Virgillito2012-06-06
* | Disabled the add, copy, and delete buttons in the material library panel. Al...hwc4872012-06-12
* | material cleanup and rearchitecturehwc4872012-06-06
* | Correction for texture paths.hwc4872012-06-01
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-31
|\|
| * Fixed Materials Popup to work with new changes to repetition bindings.Nivesh Rajbhandari2012-05-18
| * Squashed master into dom-architectureValerio Virgillito2012-05-16
* | Parameters for twistVertex materialhwc4872012-05-25
* | Editable material propertieshwc4872012-05-22
* | Exposing parameters in Water Materialhwc4872012-05-16
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
|\ \
| * | Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
| |/
| * Updating id to data-montage-id (and associated CSS, if necessary) in some of ...Nivesh Rajbhandari2012-04-30
* | Material editorhwc4872012-05-02
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-04-27
|\|
| * Removing all "module" declarations and replaced with "prototype" in preparati...John Mayhew2012-04-26
* | Update materials to the new texture model.hwc4872012-04-26
|/
* Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
* Tweaking some styles in the materials popup.Nivesh Rajbhandari2012-03-23
* Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
* Support button control in Properties Panel and use them for edit fill and str...Nivesh Rajbhandari2012-03-20
* Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
* Replacing old button component with montage button component in our UI.Nivesh Rajbhandari2012-03-19
* Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
* Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
* Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ...Nivesh Rajbhandari2012-02-22
* Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ma...Nivesh Rajbhandari2012-02-22
* Updated Materials Library and Materials Editor Popup to work with latest vers...mqg7342012-02-21
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
|\
| * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-09
| |\
| * | Removed unused materials.Nivesh Rajbhandari2012-02-09
* | | 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