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 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
| | |\ | | |/ | |/|
| * | Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
| |\ \
| * \ \ Merge pull request #164 from mqg734/ToolTipFixesValerio Virgillito2012-04-17
| |\ \ \
| | * | | IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for ...Nivesh Rajbhandari2012-04-13
| * | | | Merge pull request #163 from mencio/undo-managerValerio Virgillito2012-04-17
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixing the shape borderValerio Virgillito2012-04-13
| | * | | collapsing the history panel by default and commenting out the undo for the 3...Valerio Virgillito2012-04-13
| | * | | fixed stage rotationValerio Virgillito2012-04-13
| | * | | clear console logValerio Virgillito2012-04-13
| | * | | CleanupValerio Virgillito2012-04-13
| | * | | fixing the transform handlesValerio Virgillito2012-04-13
| | * | | removing _undo array and _targets array and use object instead of matching ar...Valerio Virgillito2012-04-13
| | * | | Merge branch 'refs/heads/master' into undo-managerValerio Virgillito2012-04-12
| | |\ \ \ | | |/ / / | |/| | |
| | * | | some code cleanupValerio Virgillito2012-04-10
| | * | | setAttribute added to the undo/redoValerio Virgillito2012-04-09
| | * | | setProperties to the montage undo/redoValerio Virgillito2012-04-09
| | * | | adding a history panelValerio Virgillito2012-04-09
| | | | * 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
| | | | |\ \
* | | | | \ \ 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
| |\| | | | |
| | * | | | | Merge pull request #162 from mqg734/BoundsCalculationValerio Virgillito2012-04-12
| | |\ \ \ \ \
| * | | | | | | 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
* | | | | | | | | | | Drag and drop of images and components should not add 3d values by default.Nivesh Rajbhandari2012-04-16
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Fixing selection/tag layout drawing when canvas and image elements have borders.Nivesh Rajbhandari2012-04-12
* | | | | | | | | | Borders are not factored into offset calculations by the browser, so we have ...Nivesh Rajbhandari2012-04-12
* | | | | | | | | | offsets should be calculated on offsetParent instead of parentElement.Nivesh Rajbhandari2012-04-11
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #161 from mqg734/PerspectiveFixValerio Virgillito2012-04-11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-09
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge pull request #160 from ananyasen/integration-candidateValerio Virgillito2012-04-09
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | block filenames and directories with all spaceAnanya Sen2012-04-06