| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 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 |
| | |\| | |||
| | * | | cleanup unused code. | Valerio Virgillito | 2012-04-19 |
| * | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into Timeli... | Jonathan Duran | 2012-04-19 |
| |\ \ \ | |||
| | * | | | BreadCrumb Bug Fix | Kruti Shah | 2012-04-19 |
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 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 |
| * | | | | | | | | | | | Remove more unneeded requires | Jonathan Duran | 2012-04-19 |
| * | | | | | | | | | | | Remove unneeded require | Jonathan Duran | 2012-04-19 |
| * | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-19 |
| |\| | | | | | | | | | | |||
| | * | | | | | | | | | | 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 |
| | | | |/ / / / / / / / | | |/| | | | | | | | | |||
| | * | | | | | | | | | | Squashed commit of the following: | Valerio Virgillito | 2012-04-18 |
| | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| * | | | | | | | | | | Remove TODOs | Jonathan Duran | 2012-04-18 |
| * | | | | | | | | | | Add flag for abs/rel position | Jonathan Duran | 2012-04-18 |
| * | | | | | | | | | | FIX for layer selection when adding a keyframe in unselected layer | Jonathan Duran | 2012-04-18 |
| * | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-18 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
| | * | | | | | | | | | Timeline: Bug fix: changing layer name didn't save in some circumstances. | Jon Reid | 2012-04-17 |
| | * | | | | | | | | | Timeline: Further fixes to new document/breadcrumb interactions. | Jon Reid | 2012-04-17 |
| * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 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 |