aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | | | | | More merge problemshwc4872012-05-14
| * | | | | | | | | | | | | | | | | | | | | | | | Fixing merge issueshwc4872012-05-14
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Cleanup of indirect textures.hwc4872012-05-03
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textureshwc4872012-05-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | Updated hard-coded linear and radial gradients to use the color values in Lin...Nivesh Rajbhandari2012-05-03
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Material editorhwc4872012-05-02
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-01
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | twist vertex material changeshwc4872012-04-30
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-04-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Update materials to the new texture model.hwc4872012-04-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | chaned textureshwc4872012-04-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-04-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-04-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloud materialhwc4872012-04-17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloud materialhwc4872012-04-16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloud Materialhwc4872012-04-15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloud Materialhwc4872012-04-13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloud materialhwc4872012-04-12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloud materialhwc4872012-04-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloud materialhwc4872012-04-11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloud materialhwc4872012-04-10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloudshwc4872012-04-08
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture notificationshwc4872012-04-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-added taper and twist-vert materials.hwc4872012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Flag materialhwc4872012-04-04
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | started the flag materialhwc4872012-04-03
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture abstractionhwc4872012-04-02
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture abstractionhwc4872012-04-02
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | converted materials to new texture structurehwc4872012-03-30
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linked textureshwc4872012-03-29
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a notification procedure to worlds.hwc4872012-03-28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture abstraction integrationhwc4872012-03-27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated texture wrapper into pulse and bump-metal materials.hwc4872012-03-27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-03-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebGL & Canvas as data for texture maps.hwc4872012-03-26
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte...hwc4872012-03-24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | |<