aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
Commit message (Expand)AuthorAge
* Merge branch 'Fixes_071' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-20
|\
| * Restrict materials popup to appear within our page.Nivesh Rajbhandari2012-07-19
* | Merge branch 'RadialBlur' of https://github.com/ericmueller/ninjaValerio Virgillito2012-07-19
|\ \ | |/ |/|
| * Renamed Raiders material to Dark Blur, and Paris to Blue Sky.hwc4872012-07-19
| * Re-added Radial Blur and Raiders materialshwc4872012-07-19
* | Squashed commit of the following:Nivesh Rajbhandari2012-07-19
|/
* Removed the shaders that we do not have rights to.hwc4872012-07-10
* fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
* Normalize HTML DOCTYPEKris Kowal2012-07-09
* BSD LicenseKris Kowal2012-07-09
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\
| * Normalize HTML doctypeKris Kowal2012-07-06
| * Remove byte order markers (BOM)Kris Kowal2012-07-06
| * Remove trailing spacesKris Kowal2012-07-06
| * Remove trailing spacesKris Kowal2012-07-06
| * Expand tabsKris Kowal2012-07-06
* | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\|
| * Update copyright boilerplateKris Kowal2012-07-06
* | PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
* | Performance fix for WebGL materials playing even when the dialog/file is no l...Nivesh Rajbhandari2012-06-27
* | Integrating Materials UI changes. Squashed commit of the following:Nivesh Rajbhandari2012-06-27
|/
* Removed Flat material from the materials libraryhwc4872012-06-15
* 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