| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | texture abstraction | hwc487 | 2012-04-02 |
| | | |||
| * | converted materials to new texture structure | hwc487 | 2012-03-30 |
| | | |||
| * | linked textures | hwc487 | 2012-03-29 |
| | | |||
| * | added a notification procedure to worlds. | hwc487 | 2012-03-28 |
| | | |||
| * | texture abstraction integration | hwc487 | 2012-03-27 |
| | | |||
| * | Integrated texture wrapper into pulse and bump-metal materials. | hwc487 | 2012-03-27 |
| | | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-27 |
| |\ | | | | | | | Textures | ||
| | * | Merge pull request #142 from joseeight/Color | Valerio Virgillito | 2012-03-26 |
| | |\ | | | | | | | Color Bug Fix | ||
| | | * | Fix: IKNINJA-1355 | Jose Antonio Marquez | 2012-03-26 |
| | | | | |||
| | | * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-03-26 |
| | | |\ | |||
| | | * | | Fix: IKNINJA-1362 | Jose Antonio Marquez | 2012-03-26 |
| | | | | | |||
| | * | | | Check for a authortime animation setting in the draw routine for WebGL. | Nivesh Rajbhandari | 2012-03-24 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBox | Nivesh Rajbhandari | 2012-03-24 |
| | |\ \ \ | |||
| | * | | | | Check for a authortime animation setting in the draw routine for WebGL. | Nivesh Rajbhandari | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | WebGL & Canvas as data for texture maps. | hwc487 | 2012-03-26 |
| | | | | | | |||
| * | | | | | Merge branch 'montage-integration' of ↵ | hwc487 | 2012-03-24 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | github.com:Motorola-Mobility/ninja-internal into Textures | ||
| | * | | | | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 |
| | | | | | | |||
| | * | | | | Merge pull request #138 from joseeight/FileIO-Montage-Components | Valerio Virgillito | 2012-03-23 |
| | |\ \ \ \ | | | | | | | | | | | | | I/O Fixes | ||
| | | * \ \ \ | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-23 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | | * | | | | | Removing m-js components I/O and fix for webGL | Jose Antonio Marquez | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed saving m-js components as new components broke I/O when present. Also made a fix for checking length of webGL array since first item now is non-user data. (That is to be removed) | ||
| | | * | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-22 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | | | * \ \ \ \ | Merge branch 'montage-integration' of ↵ | Valerio Virgillito | 2012-03-22 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-integration | ||
| | | * | | | | | | | Adding Ninja URL method to io-mediator | Jose Antonio Marquez | 2012-03-22 |
| | | | | | | | | | | |||
| | | * | | | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-22 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | | * | | | | | | | | Adding firstDraw event to components added | Jose Antonio Marquez | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to re-parse the document for styles added dynamically. | ||
| | | * | | | | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-21 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-21 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||
| | * | | | | | | | | | | | Merge pull request #137 from ericguzman/montage-integration | Valerio Virgillito | 2012-03-23 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | Preset Heading - "3D" to "2D" | ||
| | | * | | | | | | | | | | Presets - fixed preset group name ("2D") | Eric Guzman | 2012-03-23 |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Merge branch 'montage-integration' of github.com:ericguzman/ninja-internal ↵ | Valerio Virgillito | 2012-03-23 |
| | |\| | | | | | | | | | | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | into montage-integration | ||
| | | * | | | | | | | | | Presets Panel - Add slide/fade out animation | Eric Guzman | 2012-03-23 |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | Respect play/pause WebGL animation when saving files and re-rendering caused ↵ | Nivesh Rajbhandari | 2012-03-23 |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | | | Merge pull request #134 from mqg734/WebGL-Animation-CheckBox | Valerio Virgillito | 2012-03-22 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Adding enabled/disabled support for PI"s checkbox controls, and using that capability for WebGL animate checkbox. | ||
| | | * | | | | | | | | | Adding enabled/disabled support for PI's checkbox control. | Nivesh Rajbhandari | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | | | | Merge pull request #133 from mqg734/WebGL-Animation-CheckBox | Valerio Virgillito | 2012-03-22 |
| | |\| | | | | | | | | | | |_|_|_|_|_|/ / / | |/| | | | | | | | | Web gl animation check box | ||
| | | * | | | | | | | | Start WebGL animation during live preview. And set WebGL animation back to ↵ | Nivesh Rajbhandari | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user preference when closing live preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | | Adding checkbox in PI to start/stop WebGL animation preview. | Nivesh Rajbhandari | 2012-03-22 |
| | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | fixing the shape properties border bindings. | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | fixing the shape properties border bindings. | Valerio Virgillito | 2012-03-22 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | Fixed the lock button for the shape properties bar | Valerio Virgillito | 2012-03-22 |
| | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Changes to the webrequest blocking and adding a google.com permission workaround | Valerio Virgillito | 2012-03-21 |
| | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Adding 'addComponentFirstDraw' event from the user document main component. | Valerio Virgillito | 2012-03-21 |
| | | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 |
| | |\| | | | |||
| | | * | | | Merge branch 'refs/heads/montage-integration' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
| | | |\ \ \ | |||
| | | * \ \ \ | Merge branch 'refs/heads/FileIO' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
| | | | | |||