aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | Merge pull request #368 from mqg734/CopyPasteWebGLValerio Virgillito2012-07-09
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs.Nivesh Rajbhandari2012-07-02
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #366 from joseeight/ColorValerio Virgillito2012-07-09
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix: IKNINJA-1634Jose Antonio Marquez2012-07-02
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #364 from ananyasen/bugfix-masterValerio Virgillito2012-07-09
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | removing unnecessary variableAnanya Sen2012-06-29
| | * | | | | | | | | Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading is done for im...Ananya Sen2012-06-29
| * | | | | | | | | | Merge pull request #357 from ericmueller/GridFixesValerio Virgillito2012-07-09
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #346 from mqg734/MaterialsUIValerio Virgillito2012-07-09
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
| | * | | | | | | | | | IKNINJA-1246 - Line drawing feedback disappears when using no-color or gradie...Nivesh Rajbhandari2012-07-09
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-02
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Performance fix for WebGL materials playing even when the dialog/file is no l...Nivesh Rajbhandari2012-06-27
| | * | | | | | | | | | Integrating Materials UI changes. Squashed commit of the following:Nivesh Rajbhandari2012-06-27
| | | | | | | | | | | * Grid drawing fixes.hwc4872012-07-09
| | | | | | | | | | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri...hwc4872012-07-09
| | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | | | | | | | | | | * fix for grid drawing.hwc4872012-07-09
| | | | | | | | | | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri...hwc4872012-07-03
| | | | | | | | | | | |\
| | | | | | | | | | | * | fixes for grid drawing.hwc4872012-07-03
| | | | | | | | | | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri...hwc4872012-07-02
| | | | | | | | | | | |\ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | | | | | | | | | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri...hwc4872012-06-29
| | | | | |_|_|_|_|_|/| | | | | | |/| | | | | | | |
| | | | * | | | | | | | | Fixes a bug in rectangle containment test.hwc4872012-06-29
| | | | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri...hwc4872012-06-29
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / | | | | | |/| | | | | | |
| | | | * | | | | | | | | Fixes for incorrect line/polygon intersections.hwc4872012-06-28
* | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Timeline: Ameliorate slowness when adding first keyframe to an element.Jon Reid2012-07-16
| * | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Timeline: Disable drag-and-drop on subproperty keyframes. Better errorJon Reid2012-07-16
| * | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Timeline: Delete unused file.Jon Reid2012-07-09
* | | | | | | | | | | | | | | | | Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug (lef...Kruti Shah2012-07-16
| |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Zooming the tweensKruti Shah2012-07-12
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix layer arrayJonathan Duran2012-07-10
| * | | | | | | | | | | | | | | Fix more missing charJonathan Duran2012-07-10
| * | | | | | | | | | | | | | | Fix missing char and Temp fix missing imageJonathan Duran2012-07-10
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Adding Zoom Control to Property TracksKruti Shah2012-07-10
* | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-09
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | remove commas from var linesJonathan Duran2012-07-09
| * | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-09
| |\| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Adding commentsKruti Shah2012-07-09
| * | | | | | | | | | | | | | Refactoring CodeKruti Shah2012-07-09
| * | | | | | | | | | | | | | Remove CommentKruti Shah2012-07-03
| * | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninjainternalmaster' into Timeline-RefactorCodeKruti Shah2012-07-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Refactor Code + Bug Fix for the Colorchip disappear between breadcrumb naviga...Kruti Shah2012-07-03
| * | | | | | | | | | | | | | | Refactoring PropertyTrack.js & Span.jsKruti Shah2012-07-03
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |