aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Fix Select All bug and remove debuggersJonathan Duran2012-04-23
* Breadcrumb FixKruti Shah2012-04-20
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-20
|\
| * Timeline: More bug fixes for selection with multiple documents opening andJon Reid2012-04-19
| * Timeline: Bug fix: check for uninitialized currentDocument in intializationJon Reid2012-04-19
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-19
| |\
| * | Timeline: Bug fix: Maintain selection between document switching.Jon Reid2012-04-19
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-20
|\ \ \ | |_|/ |/| |
| * | Merge branch 'refs/heads/master' into cleanupValerio Virgillito2012-04-19
| |\ \
| * | | cleanup unused code.Valerio Virgillito2012-04-19
* | | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into Timeli...Jonathan Duran2012-04-19
|\ \ \ \
| * | | | BreadCrumb Bug FixKruti Shah2012-04-19
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-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
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | 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
| | |\| | | | | |