| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-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 IO | hwc487 | 2012-03-14 |
| | | |||
| * | Uber material changes for IO | hwc487 | 2012-03-12 |
| | | |||
| * | Removing duplicate file | Jose Antonio Marquez | 2012-03-09 |
| | | |||
| * | Merge pull request #32 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 |
| |\ | | | | | Added asset folder replacement to runtime load. | ||
| | * | Removed asset path replacement at authortime. | hwc487 | 2012-03-09 |
| | | | |||
| * | | Adding missing file for webGL, still need a fix for runtime | Jose Antonio Marquez | 2012-03-09 |
| |/ | |||
| * | Adding webGL I/O runtime functionality | Jose Antonio Marquez | 2012-03-09 |
| | | | | | There is a problem that needs to be resolved in the CanvasRuntime. | ||
| * | Canvas IO | hwc487 | 2012-03-08 |
| | | |||
| * | removed an unused parameter to CanvasDataManager | hwc487 | 2012-03-08 |
| | | |||
| * | Fix for runtime Radial blur material | hwc487 | 2012-03-08 |
| | | |||
| * | Fixed a few problems with Plasma material. | hwc487 | 2012-03-07 |
| | | |||
| * | File IO | hwc487 | 2012-03-07 |
| | | |||
| * | Squashed commit of preload-fix into Master | Valerio Virgillito | 2012-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> | |||