aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/material.js
Commit message (Collapse)AuthorAge
* Merge branch 'Taper' of https://github.com/ericmueller/ninja-internalValerio Virgillito2012-07-09
|\ | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/rdge/materials/linear-gradient-material.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Added capability to split a mesh into multiiple parts to avoid buffer ↵hwc4872012-06-28
| | | | | | | | overflow situations.
* | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Update copyright boilerplateKris Kowal2012-07-06
| |/
* / PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
|/ | | | | | | | | | | | IKNinja-1841 - Cannot change webgl shape with LinearGradient and RadialGradient to solid color. IKNINJA-1851 - Cannot draw webgl shapes with Linear/RadialGradient material. IKNINJA-1864 - PI doesn't update the color of shape if WebGL material switches to Flat. IKNINJA-1886 - Gradient edits not applied to WebGL Stage object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Fixed alphabetization of material names.hwc4872012-06-14
| | | | | Removed console output. Removed texture map field from Mandel material editor.
* Runtime material fixeshwc4872012-06-12
|
* material cleanup and rearchitecturehwc4872012-06-06
|
* Avoid throwing shader errors in the console for 'color' property at a base ↵hwc4872012-06-04
| | | | class level.
* Parameters for twistVertex materialhwc4872012-05-25
|
* 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
| * Radial gradients to match CSShwc4872012-05-08
| |
* | Cleanup of indirect textures.hwc4872012-05-03
| |
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/rdge/materials/cloud-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js
| * removed old unused import and export functions.John Mayhew2012-04-03
| |
* | texture notificationshwc4872012-04-06
| |
* | Added Flag materialhwc4872012-04-04
| |
* | Integrated texture wrapper into pulse and bump-metal materials.hwc4872012-03-27
| |
* | WebGL & Canvas as data for texture maps.hwc4872012-03-26
|/
* Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
- Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>