| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-26 |
| |\ | |||
| | * | 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 |
| | | | | | |||
| | * | | | Merge pull request #141 from mqg734/WebGL-Animation-CheckBox | Valerio Virgillito | 2012-03-24 |
| | |\ \ \ | | | | | | | | | | | Changing where we check for _previewAnimation flag. | ||
| | | * | | | 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 |
| | | |\ \ \ | | |/ / / | |/| | | | |||
| | * | | | | Merge pull request #140 from ericmueller/integration | Valerio Virgillito | 2012-03-23 |
| | |\ \ \ \ | | | | | | | | | | | | | Integration | ||
| | | * | | | | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 |
| | | | | | | | |||
| | | * | | | | Merge branch 'montage-integration' of ↵ | hwc487 | 2012-03-23 |
| | | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration Conflicts: js/io/system/ninjalibrary.json | ||
| | * | | | | | 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 | ||
| | | * | | | | | | | 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 | ||
| | | * \ \ \ \ \ \ \ | 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 | ||
| | | * | | | | | | | | | | | Feed Reader - Change default to timer so it matches component | Eric Guzman | 2012-03-23 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | Presets Panel - Add slide/fade out animation | Eric Guzman | 2012-03-23 |
| | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | Merge pull request #135 from mqg734/WebGL-Animation-CheckBox | Valerio Virgillito | 2012-03-23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | We have to add a flag in GLWorld so that any changes in geometry that forces a render will only render once. | ||
| | | | | | | | | | | * | | | Added Paris and Raiders materials | hwc487 | 2012-03-22 |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | Synchronized material animation speed for pulse material between Ninja and ↵ | hwc487 | 2012-03-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | runtime. | ||
| | | | | | | | | | | * | | | fixes for Runtime line object. | hwc487 | 2012-03-21 |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-21 |
| | | | | | | | | | | |\ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | integration | ||
| | | | | | | | | | | * | | | Added material library data to the canvas data. | hwc487 | 2012-03-21 |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | Clear RDGE when an element is deleted and before registering the context. | hwc487 | 2012-03-21 |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | Runtime canvas & WebGL fixes. | hwc487 | 2012-03-20 |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | Bug Fixes for Canvas & WebGL File IO | hwc487 | 2012-03-20 |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | removing dead code | hwc487 | 2012-03-16 |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | Supporting new and old GL data formats. | hwc487 | 2012-03-16 |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-16 |
| | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration | ||
| | | | | | | | | | | * | | | | Conversion to JSON based file IO for canvas2D and WebGL rendering | hwc487 | 2012-03-16 |
| | | | | | | | | | | | | | | | |||
| | | | | | | | | | | | | * | | 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> | ||
| | | * | | | | | | | | | | | Respect play/pause WebGL animation when saving files and re-rendering caused | ||