aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* prevent alpha values from accumulating over 1 due to rounding...fixes 1443 ↵Pushkar Joshi2012-05-01
| | | | Brush: Odd painting behavior when Hardness is 99%. A solid outline is shown on the brushstroke.
* scale the brush stroke according to the input width and heightPushkar Joshi2012-04-27
| | | | Fixes: 1444 Brush: Unable to scale brushstroke using the Transform handles
* Merge branch 'master' into pentoolPushkar Joshi2012-04-27
|\
| * Merge cleanupValerio Virgillito2012-04-27
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
| |\
| | * Merge branch 'stage-document-architecture' of ↵Valerio Virgillito2012-04-26
| | |\ | | | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization
| | | * Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | | |\
| | | * | Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | Simplifying the getElement method from stage and adding an exclusion list to ↵Valerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | | |\ \
| | | * | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-24
| | | |\ \ \
| | | * | | | Added a body controllerValerio Virgillito2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ↵Valerio Virgillito2012-04-26
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | serialization
| | | * | | | Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | preparation for montage converting to the new "prototype" format fully
| * | | | | | Refix brush tool elementAdded eventJonathan Duran2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #176 from pushkarjoshi/brushtoolValerio Virgillito2012-04-27
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Brushtool
| | * | | | | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito2012-04-26
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | IKNINJA-1511 - We don't currently support perspective values on individual elements, so removing perspective values from the animation presets.
| | | * | | | | We don't currently support perspective values on individual elements, so ↵Nivesh Rajbhandari2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-04-26
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Fixing the eye dropper shortcut.Valerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Revert "Fix Brush tool not broadcasting elementAdded event"Jonathan Duran2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 12fadd1494a9b5fcdaa17fde2f4847277237cf79. Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Fix WEbGL not rendering on stage with timelineJonathan Duran2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Timeline: Deleting elements now deletes associated layers.Jon Reid2012-04-26
| | | | | | | |
| * | | | | | | Timeline: comment out a conditional debugger; re-enable layer name storage.Jon Reid2012-04-26
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-26
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge pull request #179 from joseeight/FileIOValerio Virgillito2012-04-26
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | Fixing duplicate layer bug
| | | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-26
| | | | |\| | | |
| | | | * | | | | Fixing duplicate layer errorJose Antonio Marquez2012-04-26
| | | | | | | | |
| | | | * | | | | Fixing duplicate layer bugJose Antonio Marquez2012-04-26
| | | | | |_|/ / | | | | |/| | |
| | | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | Updating the canvas runtime files for gradient and rectangle radius fixes.Nivesh Rajbhandari2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | IKNinja-406 - Strange behavior when changing the corner radius to the ↵Nivesh Rajbhandari2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maximum value. IKNinja-1236 - Corner radius is not applied if stroke size is >= 2 times the corner radius. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | Changing canvas-2d gradient drawing to more closely match div's ↵Nivesh Rajbhandari2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background-image gradient support. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-26
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Merge pull request #175 from mqg734/BoundsCalculationValerio Virgillito2012-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.
| | | | * | | | | Fixed issue with setting stroke when using the PI.Nivesh Rajbhandari2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | | | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | |
| | | | * | | | | Allow users to toggle application of stroke and border settings when using ↵Nivesh Rajbhandari2012-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 Rajbhandari2012-04-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |