| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Changing ID to Montage-ID for Color Components | Jose Antonio Marquez | 2012-05-03 |
| | | |||
| * | Merge cleanup | Valerio Virgillito | 2012-04-27 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 |
| |\ | |||
| | * | Merge branch 'stage-document-architecture' of ↵ | Valerio Virgillito | 2012-04-26 |
| | |\ | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization | ||
| | | * | Fixed the stage border and layout in the new template | Valerio Virgillito | 2012-04-26 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | |/ | | | | | | | preparation for montage converting to the new "prototype" format fully | ||
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 |
| |\| | |||
| | * | Merge pull request #175 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-25 |
| | |\ | | | | | | | Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom. | ||
| | | * | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-24 |
| | | |\ | |||
| | | * | | Allow users to toggle application of stroke and border settings when using ↵ | Nivesh Rajbhandari | 2012-04-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Fixing translate handles to draw without zoom value. Also fixed some typos ↵ | Nivesh Rajbhandari | 2012-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-25 |
| |\| | | | |||
| | * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-24 |
| | |\ \ \ | | | |/ | | |/| | |||
| | * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-17 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | * \ \ \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-04 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | * \ \ \ \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-03 |
| | |\ \ \ \ \ | |||
| | * | | | | | | render the pen path with local coordinates, but use stage world coordinates ↵ | Pushkar Joshi | 2012-04-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working | ||
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-24 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-23 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||
| | * | | | | | | adjusting the bread crumb to work with the new template | Valerio Virgillito | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | Breadcrumb Fix | Kruti Shah | 2012-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-20 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | * | | | | | cleanup unused code. | Valerio Virgillito | 2012-04-19 |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | BreadCrumb Bug Fix | Kruti Shah | 2012-04-19 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | Timeline: Bug fix: problem with editing layers missing last letter in new | Jon Reid | 2012-04-13 |
| | | | | | | | | | | | | | | | | | | | | | value. | ||
| * | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-10 |
| |\ \ \ \ \ | |||
| | * | | | | | Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names should not | Jon Reid | 2012-04-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | require hitting "Return" key to commit the change" | ||
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-10 |
| |\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||
| | * | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-04 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | IKNINJA-764 - The Local/Global options are not in synced with both 3D object ↵ | Nivesh Rajbhandari | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotate tool and 3D object translate tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Tweaking some styles in the materials popup. | Nivesh Rajbhandari | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | Timeline: Bug fix for IKNINJA-1086, "CSS Style Suggestion stops working" | Jon Reid | 2012-04-05 |
| | | | | | | | |||
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-04 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/tools/SelectionTool.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-30 |
| |\| | | | | |||
| | * | | | | Merge pull request #147 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-29 |
| | |\ \ \ \ | | | |_|/ | | |/| | | Brushtool | ||
| | | * | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-28 |
| | | |\ \ \ | |||
| | | * \ \ \ | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | | * | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-16 |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-14 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 |
| | | | | | | | | | |||
| | | * | | | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-03-13 |
| | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | Add a smoothing amount parameter, and hide options based on checkboxes | Pushkar Joshi | 2012-03-13 |
| | | | | | | | | | | |||
| | | * | | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-12 |
| | | |\ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-29 |
| |\| | | | | | | | | | |||
| | * | | | | | | | | | Merge pull request #131 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-28 |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||