aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internalValerio Virgillito2012-06-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | IKNINJA 1754 menu not opening on hoverValerio Virgillito2012-06-19
| | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internalValerio Virgillito2012-06-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Reverting last change since this is is being made in a different pull request.Ananya Sen2012-06-19
| | * | | | | | | | | | | | | | | | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main men...Ananya Sen2012-06-19
| | * | | | | | | | | | | | | | | | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ...Ananya Sen2012-06-18
* | | | | | | | | | | | | | | | | | remove obsolete functionsJonathan Duran2012-06-19
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | prop tween splittingJonathan Duran2012-06-19
| * | | | | | | | | | | | | | | | | Lock Position and Size keyframes to main track keyframesJonathan Duran2012-06-19
| * | | | | | | | | | | | | | | | | Fix position tracks collapser to use unique elementJonathan Duran2012-06-19
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOMJon Reid2012-06-19
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Timeline: Enable splitting of keyframes with F6 interaction.Jon Reid2012-06-18
| * | | | | | | | | | | | | | | | Timeline: Default easing for new animation keyframes set to "none" per CSSJon Reid2012-06-18
| * | | | | | | | | | | | | | | | Timeline: Bug FixesJon Reid2012-06-18
* | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Removed Flat material from the materials libraryhwc4872012-06-15
| | * | | | | | | | | | | | | | Fixed a canvas 2D rendering problem.hwc4872012-06-15
| | * | | | | | | | | | | | | | Fixed a problem with Uber shader where new values were getting clobbered by o...hwc4872012-06-15
| | * | | | | | | | | | | | | | Runtime change for Paris material.hwc4872012-06-15
| | * | | | | | | | | | | | | | Re-added Raiders materialhwc4872012-06-15
| | * | | | | | | | | | | | | | Re-added Paris materialhwc4872012-06-15
| | * | | | | | | | | | | | | | Fix for setting the specular map in the Uber shader.hwc4872012-06-15
| | * | | | | | | | | | | | | | Added correct 'Cancel' behavior to the material editorhwc4872012-06-15
| | * | | | | | | | | | | | | | Material changes through the popup editor can effect multiple material instan...hwc4872012-06-15
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix for line color.hwc4872012-06-14
| | * | | | | | | | | | | | | | | Fixed alphabetization of material names.hwc4872012-06-14
| | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Fixes for runtime Taper materialhwc4872012-06-13
| | * | | | | | | | | | | | | | | | Oval stroke and fill material were stored in inverted order.hwc4872012-06-13
| | * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Material bug fixes - reset texture array.hwc4872012-06-13
| | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Removed a console message.hwc4872012-06-13
| | * | | | | | | | | | | | | | | | | Removed references to NJUtilshwc4872012-06-12
| | * | | | | | | | | | | | | | | | | Moved Flat material to the top of the drop down.hwc4872012-06-12
| | * | | | | | | | | | | | | | | | | Incremented RDGE library numberhwc4872012-06-12
| | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Disabled the add, copy, and delete buttons in the material library panel. Al...hwc4872012-06-12
| | * | | | | | | | | | | | | | | | | Runtime material fixeshwc4872012-06-12
| | * | | | | | | | | | | | | | | | | Material cleanup & bug fixes.hwc4872012-06-12
| | * | | | | | | | | | | | | | | | | Material cleanuphwc4872012-06-07
| | * | | | | | | | | | | | | | | | | material cleanup and rearchitecturehwc4872012-06-06
| | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-05
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Fixed RDGE render tree when PI changes causes node changes.hwc4872012-06-04
| | * | | | | | | | | | | | | | | | | | Avoid throwing shader errors in the console for 'color' property at a base cl...hwc4872012-06-04