aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-20
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-20
| |\
| * | remove the un-used css fileValerio Virgillito2012-06-20
| * | fixing the last instances of the old montage components in the css panelValerio Virgillito2012-06-20
| * | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
| |\ \
| * | | fixing the css bugs with montage v11Valerio Virgillito2012-06-18
| * | | fixing the components.Valerio Virgillito2012-06-18
| * | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-18
| |\ \ \
| * | | | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
* | | | | Adding transparent background to color chip buttonsJose Antonio Marquez2012-06-20
| |_|_|/ |/| | |
* | | | Fixing logic to close color panel popupJose Antonio Marquez2012-06-19
| |_|/ |/| |
* | | Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
|\ \ \ | |_|/ |/| |
| * | 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
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-14
| |\|
| * | Fix for line color.hwc4872012-06-14
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| |\ \
| * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-12
| |\ \ \ \
| * | | | | Disabled the add, copy, and delete buttons in the material library panel. Al...hwc4872012-06-12
| * | | | | material cleanup and rearchitecturehwc4872012-06-06
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-05
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| |\ \ \ \ \ \ \
| * | | | | | | | Correction for texture paths.hwc4872012-06-01
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-31
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Parameters for twistVertex materialhwc4872012-05-25
| * | | | | | | | | Editable material propertieshwc4872012-05-22
| * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-17
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Exposing parameters in Water Materialhwc4872012-05-16
| * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Material editorhwc4872012-05-02
| * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-04-27
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update materials to the new texture model.hwc4872012-04-26
* | | | | | | | | | | | | Fixing binding of alpha slider/hottext in popup with panelJose Antonio Marquez2012-06-18
* | | | | | | | | | | | | More cleaning upJose Antonio Marquez2012-06-16
* | | | | | | | | | | | | Fixed slider/hottext bindingsJose Antonio Marquez2012-06-16
* | | | | | | | | | | | | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
* | | | | | | | | | | | | Cleaning up referencesJose Antonio Marquez2012-06-14
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Fix: IKNINJA-1608Jose Antonio Marquez2012-06-13
* | | | | | | | | | | | Clean upJose Antonio Marquez2012-06-13
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-12
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | remove serializable from custom sectionValerio Virgillito2012-06-12
| * | | | | | | | | | | adding more missing properties to the serializationValerio Virgillito2012-06-12
| * | | | | | | | | | | Merge branch 'montage-v10-integration' of github.com:Motorola-Mobility/ninja-...Valerio Virgillito2012-06-12
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | montage v10 serialization updates for timelineJonathan Duran2012-06-12