aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials
Commit message (Collapse)AuthorAge
* Merge branch 'integration' of github.com:ericmueller/ninja-internal into ↵hwc4872012-03-22
|\ | | | | | | Textures
| * Added Paris and Raiders materialshwc4872012-03-22
| |
| * Synchronized material animation speed for pulse material between Ninja and ↵hwc4872012-03-21
| | | | | | | | runtime.
| * Added material library data to the canvas data.hwc4872012-03-21
| |
| * Bug Fixes for Canvas & WebGL File IOhwc4872012-03-20
| |
| * removing dead codehwc4872012-03-16
| |
| * Conversion to JSON based file IO for canvas2D and WebGL renderinghwc4872012-03-16
| |
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-22
|/ | | | | | | | | | | | | | | | | Texture Conflicts: assets/shaders/plasma.frag.glsl js/helper-classes/RDGE/GLLine.js js/helper-classes/RDGE/MaterialsLibrary.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/rectangle.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/material.js js/panels/Materials/Materials.xml js/panels/Materials/materials-popup.reel/materials-popup.js js/preloader/Preloader.js
* Corrections for Uber shader IOhwc4872012-03-14
|
* Uber material changes for IOhwc4872012-03-12
|
* Removed asset path replacement at authortime.hwc4872012-03-09
|
* Canvas IOhwc4872012-03-08
|
* Fix for runtime Radial blur materialhwc4872012-03-08
|
* Fixed a few problems with Plasma material.hwc4872012-03-07
|
* File IOhwc4872012-03-07
|
* 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>