aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | | * | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | * | Remove more unneeded requiresJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | * | Remove unneeded requireJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following:Valerio Virgillito2012-04-18
| |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | * | Remove TODOsJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | * | Add flag for abs/rel positionJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | * | FIX for layer selection when adding a keyframe in unselected layerJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | |\|
| | | | | | | | | | | | | | | | | | | | | | | | | * Timeline: Bug fix: changing layer name didn't save in some circumstances.Jon Reid2012-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | * Timeline: Further fixes to new document/breadcrumb interactions.Jon Reid2012-04-17
| | | | | | | | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | |