aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #177 from mqg734/WebGLMaterialsValerio Virgillito2012-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Updating the canvas runtime files for gradient and rectangle radius fixes.Nivesh Rajbhandari2012-04-25
| | * | | | | | | | | | | | | | | | | | | | IKNinja-406 - Strange behavior when changing the corner radius to the maximum...Nivesh Rajbhandari2012-04-25
| | * | | | | | | | | | | | | | | | | | | | Changing canvas-2d gradient drawing to more closely match div's background-im...Nivesh Rajbhandari2012-04-25
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Fixed materials editor popup not refreshing correctly.Nivesh Rajbhandari2012-04-16
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-26
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| | | | | | | | | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document changeJon Reid2012-04-26
| | | | | | | | | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | * | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-25
| | | | | | | | | | | | | | | | | | |\| |
| | | | | | | | | | | | | | | | | | | * | Timeline Bug Fix : 1541Kruti Shah2012-04-25
| | | | | | | | | | | | | | | | | | * | | Timeline: Handling of multiselect of elements from stage.Jon Reid2012-04-25
| | | | | | | | | | | | | | | | | | * | | Timeline: New tracking for multiple selected layers.Jon Reid2012-04-25
| | | | | | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-25
| | | | | | | | | | | | | | | | | | |\ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * | Revert "Fix Pen Tool not broadcasting elementAdded event"Jonathan Duran2012-04-25
| | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
| | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | |_|/ / | | | | | | | | | | | | | | | | |/| | |
| | | | | | | | | | | | | | | | | | * | Turn on width and height as tweenable propertiesJonathan Duran2012-04-24
| | | | | | | | | | | | | | | | | | * | Fix Brush tool not broadcasting elementAdded eventJonathan Duran2012-04-23
| | | | | | | | | | | | | | | | | | * | Fix Pen Tool not broadcasting elementAdded eventJonathan Duran2012-04-23
| | | | | | | | | | | | | | | | | | * | Change sublayer property names to match css property namesJonathan Duran2012-04-23
| | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-23
| | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | |_|_|/ / | | | | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | | | | | | | * | 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 '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
| | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | |_|/ / | | | | | | | | | | | | | | | | | | |/| | |
| | | | | | | | | | | | | | | | | | * | | | Remove more unneeded requiresJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | | | * | | | Remove unneeded requireJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | |