aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-12
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js
| | | * | | | | | | | Disabled the add, copy, and delete buttons in the material library panel. ↵hwc4872012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed the Custom Materials section.
| | | * | | | | | | | 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 ↵hwc4872012-06-05
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | | * | | | | | | | | 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 ↵hwc4872012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class level.
| | | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | | * | | | | | | | | | | Correction for texture paths.hwc4872012-06-01
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-31
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| | | * | | | | | | | | | | | 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 ↵hwc4872012-05-22
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/shape-primitive.js js/lib/rdge/materials/linear-gradient-material.js
| | | * | | | | | | | | | | | | 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 ↵hwc4872012-05-17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | | * | | | | | | | | | | | | | Exposing parameters in Water Materialhwc4872012-05-16
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | More merge problemshwc4872012-05-14
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fixing merge issueshwc4872012-05-14
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
| | | * | | | | | | | | | | | | | | 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 ↵Nivesh Rajbhandari2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |