| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| / / / / / / / / / / / / | |/ / / / / / / / / / / / | ||||
| | * | | | | | | | | | | | | Merge pull request #298 from ericmueller/Textures | Valerio Virgillito | 2012-06-19 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | Textures | |||
| | | * | | | | | | | | | | | Removed Flat material from the materials library | hwc487 | 2012-06-15 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Fixed a canvas 2D rendering problem. | hwc487 | 2012-06-15 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Fixed a problem with Uber shader where new values were getting clobbered by ↵ | hwc487 | 2012-06-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old values. | |||
| | | * | | | | | | | | | | | Runtime change for Paris material. | hwc487 | 2012-06-15 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Re-added Raiders material | hwc487 | 2012-06-15 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Re-added Paris material | hwc487 | 2012-06-15 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Fix for setting the specular map in the Uber shader. | hwc487 | 2012-06-15 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Added correct 'Cancel' behavior to the material editor | hwc487 | 2012-06-15 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Material changes through the popup editor can effect multiple material ↵ | hwc487 | 2012-06-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instances within a single object. | |||
| | | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-14 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | |||
| | | * | | | | | | | | | | | | Fix for line color. | hwc487 | 2012-06-14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Name change for all materials | |||
| | | * | | | | | | | | | | | | Fixed alphabetization of material names. | hwc487 | 2012-06-14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed console output. Removed texture map field from Mandel material editor. | |||
| | | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-14 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | |||
| | | * | | | | | | | | | | | | | Fixes for runtime Taper material | hwc487 | 2012-06-13 | |
| | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | Oval stroke and fill material were stored in inverted order. | hwc487 | 2012-06-13 | |
| | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | |||
| | | * | | | | | | | | | | | | | | Material bug fixes - reset texture array. | hwc487 | 2012-06-13 | |
| | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | |||
| | | * | | | | | | | | | | | | | | Removed a console message. | hwc487 | 2012-06-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed cloud material from the pulldown. | |||
| | | * | | | | | | | | | | | | | | Removed references to NJUtils | hwc487 | 2012-06-12 | |
| | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | Moved Flat material to the top of the drop down. | hwc487 | 2012-06-12 | |
| | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | Incremented RDGE library number | hwc487 | 2012-06-12 | |
| | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||