| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Update timeline to work with new element removed event | Jonathan Duran | 2012-04-04 |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | 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> | ||
| * | | Changing layer name should put dirty flag on doc | Jonathan Duran | 2012-04-04 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | define "that" var correctly | Jonathan Duran | 2012-04-04 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Merge branch 'timeline-k' of github.com:ntfx47/ninja-internal into TimelineUber | Jonathan Duran | 2012-04-04 |
| |\ \ | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | Timeline: Saving layername | Kruti Shah | 2012-04-04 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | Timeline: Initial implementation of timeline zoom. | Jon Reid | 2012-04-03 |
| | | | | |||
| | * | | TImeline : Bug Fix 1429 & The zoom tweendata | Kruti Shah | 2012-04-02 |
| | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | FIX IKNINJA-1309 Timeline:Master Layer animation span is gone when another ↵ | Jonathan Duran | 2012-04-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | new file is open Fix for master duration indicator not updating when switching files Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-03 |
| |\ \ \ | |||
| | * | | | Timeline: disable console logs in layer component. | Jon Reid | 2012-04-03 |
| | | | | | |||
| * | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-03 |
| |\| | | | |||
| | * | | | Timeline: Bug fix: IKNINJA-1431, "Adding a new element to the stage with one | Jon Reid | 2012-04-02 |
| | | | | | | | | | | | | | | | | | | | | | layer in focus whose name is empty, Ninja creates an empty name layer for the element." | ||
| | * | | | Timeline: Autoscrolling when dragging a layer within a scrollable layer | Jon Reid | 2012-04-02 |
| | | | | | | | | | | | | | | | | | list. | ||
| | * | | | Timeline: Move drag-and-drop helper deletion to draw routine. Bug fix: | Jon Reid | 2012-03-30 |
| | | | | | | | | | | | | | | | | | better handling of drag-and-drop finish events and cleanup of helper. | ||
| | * | | | Timeline: Link layerDragEnd and layerDrop events to better handle end of | Jon Reid | 2012-03-30 |
| | | | | | | | | | | | | | | | | | drag-and-drop events. | ||
| | * | | | Timeline: Bug fixes. | Jon Reid | 2012-03-30 |
| | |/ / | |||
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-03 |
| |\ \ \ | |/ / |/| / | |/ | |||
| | * | Merge pull request #148 from ananyasen/integration-candidate | Valerio Virgillito | 2012-04-01 |
| | |\ | | | | | | | added text paste detection and updated some menu items | ||
| | | * | - using clipboard data directly to avoid using setTimeout | Ananya Sen | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | - fixed logical error to trigger OK on Enter key pressed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | detect paste from context menu for new file and save as dialog | Ananya Sen | 2012-03-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | IKNINJA-719 - removed Zoom In/Zoom Out under View menu in the Main menu | Ananya Sen | 2012-03-28 |
| | | | | | | | | | | | | | | | | | | | Disabled cut, copy, paste, debug, since that functionality is not there yet Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | Merge pull request #151 from ericguzman/CSSPanel_AnimationDurationFix | Valerio Virgillito | 2012-03-30 |
| | |\ \ | | | | | | | | | CSS Panel - Fix animation duration value updates from "infinite" to int... | ||
| | | * | | CSS Panel - Fix animation duration value updates from "infinite" to integer. | Eric Guzman | 2012-03-29 |
| | |/ / | |||
| * | | | 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 |
| | | |\ | |||
| | | * | | turn off changing the left and top of the brush stroke canvas | Pushkar Joshi | 2012-03-28 |
| | | | | | |||
| | | * | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| | | |\ \ | |||
| | | * | | | 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 | ||
| | | * | | | | correctly update the brush stroke canvas size and position when the stroke ↵ | Pushkar Joshi | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | path is smoothed (and also when the stroke width is changed) AND some code cleanup to remove unnecessary brush stroke properties | ||
| | | * | | | | correctly update the brush stroke canvas size and position when the stroke ↵ | Pushkar Joshi | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | size is changed (does not yet work when smoothing is applied) AND select the newly created brush stroke by default | ||
| | | * | | | | Almost working version of brush tool that uses only local coordinates to ↵ | Pushkar Joshi | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | store the brush stroke points. Current version does not yet update the width and height of the brush stroke canvas upon changing the brush stroke through the PI. Also, current version does not obtain 3D position of points properly from the drawing tool base (see BrushTool _getUnsnappedPosition) | ||
| | | * | | | | 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 | ||
| | | * | | | | draw the brush stroke in realtime | Pushkar Joshi | 2012-03-19 |
| | | | | | | | |||
| | | * | | | | first pass for file IO of brush strokes | Pushkar Joshi | 2012-03-19 |
| | | | | | | | |||
| | | * | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-16 |
| | | |\ \ \ \ | |||
| | | * | | | | | update values in the PI from values of the selected brush stroke or pen tool ↵ | Pushkar Joshi | 2012-03-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path | ||
| | | * | | | | | 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 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-03-29 |
| |\ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | Timeline: Stability fixes for drag-and-drop and page switching. | Jon Reid | 2012-03-27 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266 | ||
| | | * | | | | | | | fixed logical error in triggering menu item | Ananya Sen | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||