aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #170 from mayhewinator/WorkingBranchmayhewinator2012-04-19
|\
| * Removed hack that required us to use a bogus url for host permissions. Chrome...John Mayhew2012-04-19
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-04-19
|\ \
| * | Merge pull request #169 from mayhewinator/WorkingBranchValerio Virgillito2012-04-19
| |\|
| | * Updated Manifest.json for the CRX buildJohn Mayhew2012-04-19
| |/
* | Merge branch 'refs/heads/master' into cleanupValerio Virgillito2012-04-19
|\|
| * Merge pull request #168 from mqg734/EricMergeValerio Virgillito2012-04-19
| |\
| | * Moving initialzeSnapping routine from RotateObject3DTool tool to Rotate3DTool...Nivesh Rajbhandari2012-04-18
| | * Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | |\
| | * | 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
| | | |/ / / / / / / | | |/| | | | | | |
* | / | | | | | | | cleanup unused code.Valerio Virgillito2012-04-19
|/ / / / / / / / /
* | | | | | | | / 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
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Drag and drop of images and components should not add 3d values by default.Nivesh Rajbhandari2012-04-16
* | | | | | | | 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