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

about summary refs log tree commit diff

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

	Commit message (Collapse)	Author	Age
*	Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \|	materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-11
\|\ \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html
\| *	Support export/import of GLLine data.	Nivesh Rajbhandari	2012-02-10
\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-02-09
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/helper-classes/RDGE/GLMaterial.js js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/FlatMaterial.js js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js js/helper-classes/RDGE/Materials/JuliaMaterial.js js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js js/helper-classes/RDGE/Materials/MandelMaterial.js js/helper-classes/RDGE/Materials/PlasmaMaterial.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/Materials/RadialGradientMaterial.js js/helper-classes/RDGE/Materials/TunnelMaterial.js js/helper-classes/RDGE/Materials/TwistMaterial.js js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/src/core/script/renderer.js js/panels/Materials/Materials.xml Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	Merging WebGL changes that allow users to modify different shape instances. ↵	Nivesh Rajbhandari	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, merging in changes that improve rendering performance by not updating static materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-09
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Reversed the orientation of one of the triangles for WebGL rendering.	Nivesh Rajbhandari	2012-02-09
\| \|/ \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-08
\|\\|
\| *	Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵	Nivesh Rajbhandari	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \|	makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	Merged old FileIO	Jose Antonio Marquez	2012-01-27
\|/
*	First commit of Ninja to ninja-internal	Pierre Frisch	2012-01-27
	Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>