Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 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 |
| | * | Re-added Raiders material | hwc487 | 2012-06-15 |
| | * | Re-added Paris material | 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 |
| | |\ | |||
| | * | | Fix for line color. | hwc487 | 2012-06-14 |
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-13 |
| | |\ \ | |||
| | * \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-13 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-12 |
| | |\ \ \ \ | |||
| | * | | | | | Disabled the add, copy, and delete buttons in the material library panel. Al... | hwc487 | 2012-06-12 |
| | * | | | | | material cleanup and rearchitecture | hwc487 | 2012-06-06 |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-05 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 |
| | |\ \ \ \ \ \ \ | |||
| | * | | | | | | | | Correction for texture paths. | hwc487 | 2012-06-01 |
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-31 |
| | |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | Parameters for twistVertex material | hwc487 | 2012-05-25 |
| | * | | | | | | | | | Editable material properties | hwc487 | 2012-05-22 |
| | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-17 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | Exposing parameters in Water Material | hwc487 | 2012-05-16 |
| | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-11 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | Material editor | hwc487 | 2012-05-02 |
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-04-27 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | Update materials to the new texture model. | hwc487 | 2012-04-26 |
| * | | | | | | | | | | | | | Fixing binding of alpha slider/hottext in popup with panel | Jose Antonio Marquez | 2012-06-18 |
| * | | | | | | | | | | | | | More cleaning up | Jose Antonio Marquez | 2012-06-16 |
| * | | | | | | | | | | | | | Fixed slider/hottext bindings | Jose Antonio Marquez | 2012-06-16 |
| * | | | | | | | | | | | | | Fixing apply 'no color' | Jose Antonio Marquez | 2012-06-15 |
| * | | | | | | | | | | | | | Cleaning up references | Jose Antonio Marquez | 2012-06-14 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Fix: IKNINJA-1608 | Jose Antonio Marquez | 2012-06-13 |
| * | | | | | | | | | | | | Clean up | Jose Antonio Marquez | 2012-06-13 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes | Nivesh Rajbhandari | 2012-06-13 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-12 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |||
| | * | | | | | | | | | | | remove serializable from custom section | Valerio Virgillito | 2012-06-12 |
| | * | | | | | | | | | | | adding more missing properties to the serialization | Valerio Virgillito | 2012-06-12 |
| | * | | | | | | | | | | | Merge branch 'montage-v10-integration' of github.com:Motorola-Mobility/ninja-... | Valerio Virgillito | 2012-06-12 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | montage v10 serialization updates for timeline | Jonathan Duran | 2012-06-12 |
| | * | | | | | | | | | | | | adding more nonexistent properties | Valerio Virgillito | 2012-06-12 |
| | * | | | | | | | | | | | | fixing a default property | Valerio Virgillito | 2012-06-12 |
| | |/ / / / / / / / / / / | |||
| | * | | | | | | | | | | | fix a typo | Valerio Virgillito | 2012-06-12 |
| | * | | | | | | | | | | | Timeline: Fix document switching under Montage v.10 | Jon Reid | 2012-06-12 |
| | * | | | | | | | | | | | fixing a timeline issue | Valerio Virgillito | 2012-06-12 |
| | * | | | | | | | | | | | adding more missing properties to the timeline | Valerio Virgillito | 2012-06-12 |
| | * | | | | | | | | | | | removing the serializable from the timeline repetition and fixing the panels ... | Valerio Virgillito | 2012-06-12 |
| | * | | | | | | | | | | | adding more missing properties | Valerio Virgillito | 2012-06-11 |
| | * | | | | | | | | | | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |||
| | * | | | | | | | | | | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-06 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |