ninja - [ARCHIVED 2012] An HTML5 web app content authoring tool

about summary refs log tree commit diff

path: root/js/helper-classes/RDGE/MaterialsLibrary.js

	Commit message (Collapse)	Author	Age
*	Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working	hwc487	2012-02-08
\|\ \| \| \| \| \| \| \| \|	Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js
\| *	Fixed several typos in Materials import/export code to support toggling ↵	Nivesh Rajbhandari	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \|	between 2d and 3d shape modes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working	hwc487	2012-02-07
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
\| *	Updated tools and PI to get/set materials by binding to appModel's materials ↵	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \|	property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	added some additional shaders	hwc487	2012-02-02
\| \|
* \|	updated from old repo	hwc487	2012-01-27
\|/
*	First commit of Ninja to ninja-internal	Pierre Frisch	2012-01-27
	Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>