ninja - [ARCHIVED] A fully featured content authoring tool to deploy HTML5 web applications.

about summary refs log tree commit diff

path: root/js/models/materials-model.js

	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
\| *	Fixed issue with WebGL materials not working after file-save or ↵	Nivesh Rajbhandari	2012-03-26
\| \| \| \| \| \| \| \| \| \| \| \|	chrome-preview. Also fixed Raiders material not showing in the PI or working during Chrome Preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Squashed commit of the following GL integration	Valerio Virgillito	2012-03-22
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Cloud material	hwc487	2012-04-10
\| \|
* \|	Re-added taper and twist-vert materials.	hwc487	2012-04-05
\| \|
* \|	Added Flag material	hwc487	2012-04-04
\| \|
* \|	started the flag material	hwc487	2012-04-03
\| \|
* \|	Added Paris and Raiders materials	hwc487	2012-03-22
\| \|
* \|	Added material library data to the canvas data.	hwc487	2012-03-21
\| \|
* \|	Bug Fixes for Canvas & WebGL File IO	hwc487	2012-03-20
\| \|
* \|	Conversion to JSON based file IO for canvas2D and WebGL rendering	hwc487	2012-03-16
\|/
*	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>