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

about summary refs log tree commit diff

path: root/js/lib/geom/shape-primitive.js

	Commit message (Collapse)	Author	Age
*	Merge branch 'Taper' of https://github.com/ericmueller/ninja-internal	Valerio Virgillito	2012-07-09
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/lib/geom/circle.js js/lib/rdge/materials/linear-gradient-material.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Added capability to split a mesh into multiiple parts to avoid buffer ↵	hwc487	2012-06-28
\| \| \| \| \| \| \| \|	overflow situations.
* \|	Update copyright boilerplate	Kris Kowal	2012-07-06
\|/
*	New functions on shape primitives.	hwc487	2012-05-25
\|
*	Fixed merge problems	hwc487	2012-05-23
\|
*	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-05-22
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Textures Conflicts: js/lib/geom/shape-primitive.js js/lib/rdge/materials/linear-gradient-material.js
\| *	Radial gradients to match CSS	hwc487	2012-05-08
\| \|
* \|	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
\| *	-Namespaced all RDGE javascript.	John Mayhew	2012-04-02
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-Removed the following unused files from the build script /core/script/fx/blur.js /core/script/fx/ssao.js /core/script/animation.js - Fully removed the following from the build and from source control as they are unused or no longer needed /core/script/util/dbgpanel.js /core/script/util/fpsTracker.js /core/script/util/statTracker.js /core/script/input.js /core/script/TextureManager.js /core/script/ubershader.js
* \|	Added Flag material	hwc487	2012-04-04
\|/
*	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>