Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Fixing some more merge issues. | Nivesh Rajbhandari | 2012-04-18 |
* | Merge branch 'refs/heads/ninja-internal' into EricMerge | Nivesh Rajbhandari | 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 |
| |\ \ | |||
| * \ \ | 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 |
| | * | | | setProperties to the montage undo/redo | Valerio Virgillito | 2012-04-09 |
| | * | | | adding a history panel | Valerio Virgillito | 2012-04-09 |
| | | | * | IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected. | Nivesh Rajbhandari | 2012-04-17 |
| | | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-04-16 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-03-13 |
| | | | |\ | |||
| | | | * \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-03-13 |
| | | | |\ \ | |||
* | | | | \ \ | 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 |
| |\| | | | | | |||
| | * | | | | | Merge pull request #162 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-12 |
| | |\ \ \ \ \ | |||
| * | | | | | | | 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 |
* | | | | | | | | | | | Drag and drop of images and components should not add 3d values by default. | Nivesh Rajbhandari | 2012-04-16 |
| |_|_|_|_|/ / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Fixing selection/tag layout drawing when canvas and image elements have borders. | Nivesh Rajbhandari | 2012-04-12 |
* | | | | | | | | | | Borders are not factored into offset calculations by the browser, so we have ... | Nivesh Rajbhandari | 2012-04-12 |
* | | | | | | | | | | offsets should be calculated on offsetParent instead of parentElement. | Nivesh Rajbhandari | 2012-04-11 |
| |_|_|_|/ / / / / |/| | | | | | | | | |||
* | | | | | | | | | Merge pull request #161 from mqg734/PerspectiveFix | Valerio Virgillito | 2012-04-11 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||
| * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-09 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||
* | | | | | | | | | Merge pull request #159 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-04-09 |
|\ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ | Merge pull request #160 from ananyasen/integration-candidate | Valerio Virgillito | 2012-04-09 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||
| * | | | | | | | | | block filenames and directories with all space | Ananya Sen | 2012-04-06 |