Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating the components and descriptor.json to support montage v.11 | Valerio Virgillito | 2012-06-17 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | montage v11 merge into ninja | Valerio Virgillito | 2012-06-17 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | Adding transparent background to color chip buttons | Jose Antonio Marquez | 2012-06-20 | |
| | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-20 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #312 from joseeight/Color | Valerio Virgillito | 2012-06-20 | |
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internal | Valerio Virgillito | 2012-06-19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA 1754 menu not opening on hover | Valerio Virgillito | 2012-06-19 | |
| | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internal | Valerio Virgillito | 2012-06-19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverting last change since this is is being made in a different pull request. | Ananya Sen | 2012-06-19 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main men... | Ananya Sen | 2012-06-19 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ... | Ananya Sen | 2012-06-18 | |
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: IKNINJA-1448 | Jose Antonio Marquez | 2012-06-20 | |
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing logic to close color panel popup | Jose Antonio Marquez | 2012-06-19 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #298 from ericmueller/Textures | Valerio Virgillito | 2012-06-19 | |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed Flat material from the materials library | hwc487 | 2012-06-15 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a canvas 2D rendering problem. | hwc487 | 2012-06-15 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a problem with Uber shader where new values were getting clobbered by o... | hwc487 | 2012-06-15 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Runtime change for Paris material. | hwc487 | 2012-06-15 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-added Raiders material | hwc487 | 2012-06-15 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-added Paris material | hwc487 | 2012-06-15 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for setting the specular map in the Uber shader. | hwc487 | 2012-06-15 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added correct 'Cancel' behavior to the material editor | hwc487 | 2012-06-15 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Material changes through the popup editor can effect multiple material instan... | hwc487 | 2012-06-15 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-14 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |