aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | | Fixing some more merge issues.Nivesh Rajbhandari2012-04-18
| | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Snapping_II' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Allow snapping to unselected objectshwc4872012-04-17
| | | * | | | | | | | | | | | | | | | | snapping for stage rotation toolhwc4872012-04-16
| | | * | | | | | | | | | | | | | | | | 3D translation fixeshwc4872012-04-16
| | | * | | | | | | | | | | | | | | | | 3D rotationhwc4872012-04-13
| | | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | 3D Rotate changeshwc4872012-04-13
| | | * | | | | | | | | | | | | | | | | Rotate3D tool changeshwc4872012-04-11
| | | * | | | | | | | | | | | | | | | | Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into Snappin...hwc4872012-04-05
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | translate3DObject tool fixes.hwc4872012-04-05
| | | | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-04
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | Cap fix for vecUtils.hwc4872012-04-04
| | | | * | | | | | | | | | | | | | | | | | turned off translation handles during a multi-object drag.hwc4872012-04-04
| | | | * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-03
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Translate 3D fix for multi-selection Z translationhwc4872012-04-02
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #167 from mqg734/BoundsCalculationValerio Virgillito2012-04-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Grid should redraw on elementChanging as well as elementChange.Nivesh Rajbhandari2012-04-17
| | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Squashed commit of the following:Valerio Virgillito2012-04-18
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #166 from mqg734/WebGLFixesValerio Virgillito2012-04-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Adding back setProperties for canvas because width and height values need to ...Nivesh Rajbhandari2012-04-17
| | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-04-17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected.Nivesh Rajbhandari2012-04-17
| | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-04-16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | get the canvas plane matrix before multiplying it with the translation due to...Pushkar Joshi2012-04-19
* | | | | | | | | | | | | | | | | | | | | | | correctly maintain canvas position when drawing subpaths off the XY plane (wa...Pushkar Joshi2012-04-19
* | | | | | | | | | | | | | | | | | | | | | | for subpaths that have not been initialized with a canvas yet (i.e. no local ...Pushkar Joshi2012-04-19
* | | | | | | | | | | | | | | | | | | | | | | store the canvas center (in local space) per each subpath, instead of trackin...Pushkar Joshi2012-04-19
* | | | | | | | | | | | | | | | | | | | | | | turn off snapping for the pen tool (with an option to turn it back on if we d...Pushkar Joshi2012-04-19
* | | | | | | | | | | | | | | | | | | | | | | fix a bug with closing the subpathPushkar Joshi2012-04-18
* | | | | | | | | | | | | | | | | | | | | | | re-enable dragging and editing of anchor point handles for bezier path editin...Pushkar Joshi2012-04-18
* | | | | | | | | | | | | | | | | | | | | | | compute the translation to new center of bounding of the subpath --- this pre...Pushkar Joshi2012-04-18
* | | | | | | | | | | | | | | | | | | | | | | allow drawing polylines in YZ and XZ planes as well as XY. In those planes, s...Pushkar Joshi2012-04-18
* | | | | | | | | | | | | | | | | | | | | | | Fairly stable version of polyline drawing code that works for paths on XY, YZ...Pushkar Joshi2012-04-17
* | | | | | | | | | | | | | | | | | | | | | | took out bad merge line and use different function for converting points from...Pushkar Joshi2012-04-17
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-17
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | |