Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
| | |||
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 |
|\ | | | | | | | Textures | ||
| * | first iteration of adding serializable to ninja plus other changes to run ↵ | Valerio Virgillito | 2012-06-06 |
| | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Squashed master into dom-architecture | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Disabled the add, copy, and delete buttons in the material library panel. ↵ | hwc487 | 2012-06-12 |
| | | | | | | | | Also removed the Custom Materials section. | ||
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-11 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js | ||
| * | | Removing outdated tree-controller. | Nivesh Rajbhandari | 2012-05-11 |
| |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵ | Nivesh Rajbhandari | 2012-04-30 |
| | | | | | | | | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Material editor | hwc487 | 2012-05-02 |
|/ | |||
* | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | | | | preparation for montage converting to the new "prototype" format fully | ||
* | Support button control in Properties Panel and use them for edit fill and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Use new tree control in Materials panel. | Nivesh Rajbhandari | 2012-03-19 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Replacing old button component with montage button component in our UI. | Nivesh Rajbhandari | 2012-03-19 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Updated Materials Library and Materials Editor Popup to work with latest ↵ | mqg734 | 2012-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. | ||
* | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
| | |||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |