Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-04-20 |
|\ | |||
| * | Merge pull request #170 from mayhewinator/WorkingBranch | mayhewinator | 2012-04-19 |
| |\ | |||
| | * | Removed hack that required us to use a bogus url for host permissions. Chrome... | John Mayhew | 2012-04-19 |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-04-19 |
| |\ \ | |||
| | * | | Merge pull request #169 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-04-19 |
| | |\| | |||
| | | * | Updated Manifest.json for the CRX build | John Mayhew | 2012-04-19 |
| | |/ | |||
| * | | Merge branch 'refs/heads/master' into cleanup | Valerio Virgillito | 2012-04-19 |
| |\| | |||
| | * | Merge pull request #168 from mqg734/EricMerge | Valerio Virgillito | 2012-04-19 |
| | |\ | |||
| | | * | Moving initialzeSnapping routine from RotateObject3DTool tool to Rotate3DTool... | Nivesh Rajbhandari | 2012-04-18 |
| | | * | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 2012-04-18 |
| | | |\ | |||
| | | * | | Fixing some more merge issues. | Nivesh Rajbhandari | 2012-04-18 |
| | | * | | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 2012-04-18 |
| | | |\ \ | |||
| | | * \ \ | Merge branch 'refs/heads/Snapping_II' into EricMerge | Nivesh Rajbhandari | 2012-04-18 |
| | | |\ \ \ | |||
| | | | * | | | Allow snapping to unselected objects | hwc487 | 2012-04-17 |
| | | | * | | | snapping for stage rotation tool | hwc487 | 2012-04-16 |
| | | | * | | | 3D translation fixes | hwc487 | 2012-04-16 |
| | | | * | | | 3D rotation | hwc487 | 2012-04-13 |
| | | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna... | hwc487 | 2012-04-13 |
| | | | |\ \ \ | |||
| | | | * | | | | 3D Rotate changes | hwc487 | 2012-04-13 |
| | | | * | | | | Rotate3D tool changes | hwc487 | 2012-04-11 |
| | | | * | | | | Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into Snappin... | hwc487 | 2012-04-05 |
| | | | |\ \ \ \ | |||
| | | | | * | | | | translate3DObject tool fixes. | hwc487 | 2012-04-05 |
| | | | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna... | hwc487 | 2012-04-04 |
| | | | | |\ \ \ \ | |||
| | | | | * | | | | | Cap fix for vecUtils. | hwc487 | 2012-04-04 |
| | | | | * | | | | | turned off translation handles during a multi-object drag. | hwc487 | 2012-04-04 |
| | | | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna... | hwc487 | 2012-04-03 |
| | | | | |\ \ \ \ \ | |||
| | | | | * | | | | | | Translate 3D fix for multi-selection Z translation | hwc487 | 2012-04-02 |
| | * | | | | | | | | | Merge pull request #167 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-18 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||
| | | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-17 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | Grid should redraw on elementChanging as well as elementChange. | Nivesh Rajbhandari | 2012-04-17 |
| | | | |/ / / / / / / | | | |/| | | | | | | | |||
| * | / | | | | | | | | cleanup unused code. | Valerio Virgillito | 2012-04-19 |
| |/ / / / / / / / / | |||
| * | | | | | | | / | Squashed commit of the following: | Valerio Virgillito | 2012-04-18 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #166 from mqg734/WebGLFixes | Valerio Virgillito | 2012-04-17 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| | * | | | | | | | Adding back setProperties for canvas because width and height values need to ... | Nivesh Rajbhandari | 2012-04-17 |
| | * | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-04-17 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #165 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-17 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||
| | * | | | | | | | Drag and drop of images and components should not add 3d values by default. | Nivesh Rajbhandari | 2012-04-16 |
| * | | | | | | | | Merge pull request #164 from mqg734/ToolTipFixes | Valerio Virgillito | 2012-04-17 |
| |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for ... | Nivesh Rajbhandari | 2012-04-13 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||
| * | | | | | | | | Merge pull request #163 from mencio/undo-manager | Valerio Virgillito | 2012-04-17 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | * | | | | | | | Fixing the shape border | Valerio Virgillito | 2012-04-13 |
| | * | | | | | | | collapsing the history panel by default and commenting out the undo for the 3... | Valerio Virgillito | 2012-04-13 |
| | * | | | | | | | fixed stage rotation | Valerio Virgillito | 2012-04-13 |
| | * | | | | | | | clear console log | Valerio Virgillito | 2012-04-13 |
| | * | | | | | | | Cleanup | Valerio Virgillito | 2012-04-13 |
| | * | | | | | | | fixing the transform handles | Valerio Virgillito | 2012-04-13 |
| | * | | | | | | | removing _undo array and _targets array and use object instead of matching ar... | Valerio Virgillito | 2012-04-13 |
| | * | | | | | | | Merge branch 'refs/heads/master' into undo-manager | Valerio Virgillito | 2012-04-12 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | * | | | | | | | some code cleanup | Valerio Virgillito | 2012-04-10 |
| | * | | | | | | | setAttribute added to the undo/redo | Valerio Virgillito | 2012-04-09 |