aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte...hwc4872012-03-24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | textureshwc4872012-03-23
| | * | | | | | | | | | | | | | | | | | | | | | | | textureshwc4872012-03-23
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'integration' of github.com:ericmueller/ninja-internal into Text...hwc4872012-03-22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | Added Paris and Raiders materialshwc4872012-03-22
| | | * | | | | | | | | | | | | | | | | | | | | | | | Synchronized material animation speed for pulse material between Ninja and ru...hwc4872012-03-21
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-03-21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Added material library data to the canvas data.hwc4872012-03-21
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Clear RDGE when an element is deleted and before registering the context.hwc4872012-03-21
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Bug Fixes for Canvas & WebGL File IOhwc4872012-03-20
| | | * | | | | | | | | | | | | | | | | | | | | | | | | removing dead codehwc4872012-03-16
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Supporting new and old GL data formats.hwc4872012-03-16
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-03-16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Conversion to JSON based file IO for canvas2D and WebGL renderinghwc4872012-03-16
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-03-22
| | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #308 from joseeight/ColorValerio Virgillito2012-06-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Fixing binding of alpha slider/hottext in popup with panelJose Antonio Marquez2012-06-18
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning reelJose Antonio Marquez2012-06-17
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up element referencesJose Antonio Marquez2012-06-17
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Tidying up color barJose Antonio Marquez2012-06-17
| | * | | | | | | | | | | | | | | | | | | | | | | | | | More cleaning upJose Antonio Marquez2012-06-16
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Fixed slider/hottext bindingsJose Antonio Marquez2012-06-16
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up referencesJose Antonio Marquez2012-06-14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #309 from mqg734/IKNinja_1746Valerio Virgillito2012-06-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1746 - Can't select items behind the banner templates' viewport.Nivesh Rajbhandari2012-06-15
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Bug fix: Document switching no longer causes multiple styles to beJon Reid2012-06-15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Bug fix: Correctly maintain expand/collapse state of layers andJon Reid2012-06-15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Remove ninja's author-time styles for banner and animation templates on publi...Nivesh Rajbhandari2012-06-14
| * | | | | | | | | | | | | | | | | | | | |