| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-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. ↵ | hwc487 | 2012-06-12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed the Custom Materials section. | |||
| | | | * | | | | | | | | | Runtime material fixes | hwc487 | 2012-06-12 | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | Material cleanup & bug fixes. | hwc487 | 2012-06-12 | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | Material cleanup | hwc487 | 2012-06-07 | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | material cleanup and rearchitecture | hwc487 | 2012-06-06 | |
| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-05 | |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | |||
| | | | * | | | | | | | | | | Fixed RDGE render tree when PI changes causes node changes. | hwc487 | 2012-06-04 | |
| | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | Avoid throwing shader errors in the console for 'color' property at a base ↵ | hwc487 | 2012-06-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class level. | |||
| | | | * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-04 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | |||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-04 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | |||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-01 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | |||
| | | | * | | | | | | | | | | | | | Correction for texture paths. | hwc487 | 2012-06-01 | |
| | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-31 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | |||
| | | | * | | | | | | | | | | | | | | Added the flag shader to the runtime. | hwc487 | 2012-05-31 | |
| | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | Fixed authortime & runtime for twist vertex shader. | hwc487 | 2012-05-29 | |
| | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | Added mesh refinement to circles. | hwc487 | 2012-05-25 | |
| | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | Parameters for twistVertex material | hwc487 | 2012-05-25 | |
| | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | New functions on shape primitives. | hwc487 | 2012-05-25 | |
| | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | Fixed merge problems | hwc487 | 2012-05-23 | |
| | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-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. | hwc487 | 2012-05-22 | |
| | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | Editable material properties | hwc487 | 2012-05-22 | |
| | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | Exposing parameters for pulse and plasma materials | hwc487 | 2012-05-17 | |
| | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-17 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | |||
| | | | * | | | | | | | | | | | | | | | | Exposing parameters in Water Material | hwc487 | 2012-05-16 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | More merge problems | hwc487 | 2012-05-14 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | Fixing merge issues | hwc487 | 2012-05-14 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-11 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |</ | ||||