Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-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 Mayhew | 2012-04-03 |
| | | |||
| * | Made use of semicolons consistent and updated new files to use the new RDGE ↵ | John Mayhew | 2012-04-03 |
| | | | | | | | | namespace | ||
| * | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-18 |
| | | | | | | | | | | Snapping_II Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js | ||
* | Cloud material | hwc487 | 2012-04-17 |
| | |||
* | Cloud material | hwc487 | 2012-04-16 |
| | |||
* | Cloud Material | hwc487 | 2012-04-15 |
| | |||
* | Cloud Material | hwc487 | 2012-04-13 |
| | |||
* | Cloud material | hwc487 | 2012-04-12 |
| | |||
* | Cloud material | hwc487 | 2012-04-11 |
| | |||
* | Cloud material | hwc487 | 2012-04-11 |
| | |||
* | Cloud material | hwc487 | 2012-04-10 |
| | |||
* | Clouds | hwc487 | 2012-04-08 |
| | |||
* | Added material library data to the canvas data. | hwc487 | 2012-03-21 |