| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge pull request #147 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-29 |
| |\ | | | | | Brushtool | ||
| | * | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| | |\ | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | * | | revert to using the angle without flipping its sign...fixing some minor bugs ↵ | Pushkar Joshi | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step | ||
| | * | | update values in the PI from values of the selected brush stroke or pen tool ↵ | Pushkar Joshi | 2012-03-15 |
| | | | | | | | | | | | | | path | ||
| | * | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 |
| | | | | |||
| * | | | Merge pull request #131 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-28 |
| |\ \ \ | |_|/ |/| | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266 | ||
| | * | | disable more menus if the active document is not in design view | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents open | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added close file and close all menu items Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/helper-classes/3D/draw-utils.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | Adding enabled/disabled support for PI's checkbox control. | Nivesh Rajbhandari | 2012-03-22 |
| | | | | | | | | | | | | | 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> | ||
| * | | Support edit material button in oval and line PI. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Support button control in Properties Panel and use them for edit fill and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| |/ | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | reverting old pi data | Valerio Virgillito | 2012-03-09 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-09 |
| |\ | |||
| | * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-03-09 |
| | |\ | |||
| | * \ | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-02-29 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | * \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-28 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-23 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-22 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-21 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-17 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-15 |
| | |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-11 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into Color | Jose Antonio Marquez | 2012-02-08 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js | ||
| * | | | | | | | | | | | | added close file menu item | Ananya Sen | 2012-03-06 |
| | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | | | | | | removing repetition from the panel container and using a static list of panels. | Valerio Virgillito | 2012-03-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixing the bugs associated with the repetition of component and PI problems. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | | | Squashed commit of the workspace-bugs | Valerio Virgillito | 2012-03-01 |
| | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | | Merge pull request #85 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-02-29 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Brushtool | ||
| | * | | | | | | | | | | changed the registration point of the brush tool icon and | Pushkar Joshi | 2012-02-29 |
| | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a temporary check to prevent extremely long brush strokes | ||
| * | | | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵ | Valerio Virgillito | 2012-02-28 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | integration-candidate | ||
| | * | | | | | | | | | Fixing tooltips and keyboard shortcuts for 3d tools. | Nivesh Rajbhandari | 2012-02-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1014 and IKNinja-1015. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | | | Merge branch 'local-storage-version' of ↵ | Valerio Virgillito | 2012-02-27 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into integration-candidate | ||
| | * | | | | | | | | | | removing the old settings class and disabling panel settings until the new ↵ | Valerio Virgillito | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | panels are in Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | | | Merge branch 'refs/heads/master' into local-storage-version | Valerio Virgillito | 2012-02-24 |
| | |\| | | | | | | | | | |||
| | * | | | | | | | | | | Merge branch 'refs/heads/master' into local-storage-version | Valerio Virgillito | 2012-02-23 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||
| | * | | | | | | | | | | local storage integration and versioning | Valerio Virgillito | 2012-02-22 |
| | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed the splitters Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-24 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||
| | * | | | | | | | | | Marking inkbottle as the final tool in the set. | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵ | Nivesh Rajbhandari | 2012-02-24 |
| | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| |\| | | | | | | | | |||
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-20 |
| | |\ \ \ \ \ \ \ \ | | | | | |||