aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* 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
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Correction for texture paths.hwc4872012-06-01
| | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-31
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Added the flag shader to the runtime.hwc4872012-05-31
| | * | | | | | | | | | Fixed authortime & runtime for twist vertex shader.hwc4872012-05-29
| | * | | | | | | | | | Added mesh refinement to circles.hwc4872012-05-25
| | * | | | | | | | | | Parameters for twistVertex materialhwc4872012-05-25
| | * | | | | | | | | | New functions on shape primitives.hwc4872012-05-25
| | * | | | | | | | | | Fixed merge problemshwc4872012-05-23
| | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-22
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Editable parameters for flag, pulse, uber, and radial gradient materials.hwc4872012-05-22
| | * | | | | | | | | | | Editable material propertieshwc4872012-05-22
| | * | | | | | | | | | | Exposing parameters for pulse and plasma materialshwc4872012-05-17
| | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-17
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Exposing parameters in Water Materialhwc4872012-05-16
| | * | | | | | | | | | | | More merge problemshwc4872012-05-14