aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/EricSnapping' into WebGLFileIONivesh Rajbhandari2012-04-04
|\
| * Snapping fixes.hwc4872012-04-02
| |
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-29
| |\ | | | | | | | | | Snapping
| * | merge from mainhwc4872012-03-29
| | |
* | | Adjusting line's width and height when changing stroke size.Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | IKNinja-635 - Can't see 3d handles if div is red, green or blue color.Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | IKNinja-1375 - After WebGL conversion from PI, Selection tool gets ↵Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | deactivated or becomes non-functional to the shape. Need to set elementModel.isIn2DSnapCache to false when replacing element. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | IKNinja-1392 - Unable to view Oval canvas2D with Inner Radius in the ↵Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | Chrome-Preview. Any shapes object are drawn after will not shown in Chrome-Preview. Vector.create should be replaced with [ ] notation. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | IKNinja-1376 - 3D values reverted when using Selection tool to move the ↵Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | object. (Only happen when 3D values set in PI) We need to update the undo array for the tool if values are changed outside the active tool. I think this was the same bug causing IKNinja-1411. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | IKNinja-1399 - [Eyedropper] Not sampling WebGL gradients after file open.Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | Need to set the isShape property in the elementModel on file open. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Switching to Linear/RadialGradient materials will set the corresponding ↵Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | color. Also, dispatching an addElement event when toggling shape from WebGL/canvas2d so timeline can draw correctly. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | IKNinna-1409 - Should dirty document when changing shape properties. ↵Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | IKNinja-1391 - Shapes need to support no-color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | IKNinja-1410 - Inner Radius should be restricted to 99%.Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-04-02
|\ \ \
| * \ \ Merge pull request #148 from ananyasen/integration-candidateValerio Virgillito2012-04-01
| |\ \ \ | | | | | | | | | | added text paste detection and updated some menu items
| | * | | - using clipboard data directly to avoid using setTimeoutAnanya Sen2012-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 dialogAnanya Sen2012-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 menuAnanya Sen2012-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_AnimationDurationFixValerio Virgillito2012-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 Guzman2012-03-29
| |/ /
* | | Update PI and Color Panel to reflect default LinearGradient and ↵Nivesh Rajbhandari2012-03-30
| | | | | | | | | | | | | | | | | | RadialGradient materials' colors. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
|\| | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ | | |/ | |/| Brushtool
| | * Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| | |\
| | * | turn off changing the left and top of the brush stroke canvasPushkar Joshi2012-03-28
| | | |
| | * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\ \
| | * | | File IO for the brush stroke AND changing the data type of brush stroke from ↵Pushkar Joshi2012-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 Joshi2012-03-27
| | | | | | | | | | | | | | | | | | | | get called
| | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| | * | | | correctly update the brush stroke canvas size and position when the stroke ↵Pushkar Joshi2012-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 Joshi2012-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 Joshi2012-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 Joshi2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step
| | * | | | draw the brush stroke in realtimePushkar Joshi2012-03-19
| | | | | |
| | * | | | first pass for file IO of brush strokesPushkar Joshi2012-03-19
| | | | | |
| | * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
| | |\ \ \ \
| | * | | | | update values in the PI from values of the selected brush stroke or pen tool ↵Pushkar Joshi2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | path
| | * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-03-14
| | |\ \ \ \ \
| | * | | | | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | | | | | | |
| | * | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
| | |\ \ \ \ \ \
| | * | | | | | | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
| | | | | | | | |
* | | | | | | | | Updated shapes to always check for its stroke and fill colors and materials ↵Nivesh Rajbhandari2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of relying on the shapeModel cache because it can get out of sync. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | We shouldn't set z to 0 for translate tool snapping because user may want to ↵Nivesh Rajbhandari2012-03-29
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snap in 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
| * | | | | | | fixed logical error in triggering menu itemAnanya Sen2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | disable more menus if the active document is not in design viewAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | - removed menu-data boundObj path support for nowAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed error on clicking on disabled menu item Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | KNINJA-1302 : refactored fixed as per requestAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | IKNINJA-1302 : close on ESC even if text field is focussedAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:32:06 +0000