| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'brushtool' into pentool | Pushkar Joshi | 2012-03-28 |
| |\ | |||
| | * | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-28 |
| | |\ | |||
| | | * | Merge pull request #145 from ericguzman/PresetsPI | Valerio Virgillito | 2012-03-28 |
| | | |\ | | | | | | | | | Presets - Adding presets controller | ||
| | | | * | Text Tool - Remove inline style from user document | Eric Guzman | 2012-03-27 |
| | | | | | |||
| | | | * | Presets Controller - Removing test background from transition class | Eric Guzman | 2012-03-27 |
| | | | | | |||
| | | | * | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-27 |
| | | | |\ | |||
| | | | * | | Presets Panel - Adding presets controller to serialization | Eric Guzman | 2012-03-22 |
| | | | | | | |||
| | | | * | | Presets Panel - Adding presets controller and removing functionality from ↵ | Eric Guzman | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | panel code | ||
| | | * | | | Merge pull request #139 from dhg637/ResizersRefactoring | Valerio Virgillito | 2012-03-28 |
| | | |\ \ \ | | | | | | | | | | | | | Resizers refactoring | ||
| | | | * | | | minor glitch in calculations in snap code | Armen Kesablyan | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | Removing old code | Armen Kesablyan | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | Resizers updated | Armen Kesablyan | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | Merge branch 'refs/heads/master' into DataBinding | Armen Kesablyan | 2012-03-22 |
| | | | |\| | | |||
| | | | * | | | Updated Resizers for Panels and timeline | Armen Kesablyan | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * | | | Merge branch 'refs/heads/master' into DataBinding | Armen Kesablyan | 2012-03-19 |
| | | | |\ \ \ | |||
| | | | * | | | | Initial Data Binding Mediator | Armen Kesablyan | 2012-03-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | | | turn off changing the left and top of the brush stroke canvas | Pushkar Joshi | 2012-03-28 |
| | | | | | | | | |||
| * | | | | | | | added cursors to the pen tool UI AND change cursor when the user hovers over ↵ | Pushkar Joshi | 2012-03-27 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | an anchor point or handles of thte selected anchor | ||
| * | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| |\| | | | | | |||
| | * | | | | | Merge pull request #146 from mqg734/WebGLFileIO | Valerio Virgillito | 2012-03-27 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fixes for Line Tool and EyeDropper tool runtime error. | ||
| | | * \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into WebGLFileIO | Nivesh Rajbhandari | 2012-03-27 |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | * | | | | | | Merge pull request #144 from mqg734/WebGLFileIO | Valerio Virgillito | 2012-03-27 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | WebGL Fixes and Minor EyeDropper Tool Fixes. | ||
| | | | * | | | | Reverting change for IKNinja-1355 because it is causing line tool to fail. | Nivesh Rajbhandari | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | Check for webGLWorld before calling draw. | Nivesh Rajbhandari | 2012-03-27 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Merge branch 'refs/heads/montage-integration' into WebGLFileIO | Nivesh Rajbhandari | 2012-03-26 |
| | |/| | | | | |||
| | | * | | | | Fixed issue with WebGL materials not working after file-save or ↵ | Nivesh Rajbhandari | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chrome-preview. Also fixed Raiders material not showing in the PI or working during Chrome Preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Handle no-color/null. | Nivesh Rajbhandari | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Updating EyeDropper tool to support new JSON data format for WebGL. | Nivesh Rajbhandari | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | File IO for the brush stroke AND changing the data type of brush stroke from ↵ | Pushkar Joshi | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | GEOM_TYPE_CUBIC_BEZIER to GEOM_TYPE_BRUSH_STROKE | ||
| * | | | | | | add a setfillcolor to brush stroke so the default fillcolor handler does not ↵ | Pushkar Joshi | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | get called | ||
| * | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | * | | | | | 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 |
| | | | | | | | |||