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

about summary refs log tree commit diff

path: root/js/helper-classes/3D/StageLine.js

	Commit message (Collapse)	Author	Age
*	Tweak to an edge case in grid drawing.	hwc487	2012-07-10
\|
*	Grid drawing changes	hwc487	2012-07-10
\|
*	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-07-10
\|\ \| \| \| \| \| \|	GridFixes
\| *	BSD License	Kris Kowal	2012-07-09
\| \|
* \|	Grid drawing fixes	hwc487	2012-07-10
\| \|
* \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-07-09
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	GridFixes Conflicts: js/helper-classes/3D/StageLine.js
\| *	Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal	Valerio Virgillito	2012-07-09
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| \| *	Expand tabs	Kris Kowal	2012-07-06
\| \| \|
\| * \|	Merge pull request #357 from ericmueller/GridFixes	Valerio Virgillito	2012-07-09
\| \|\ \ \| \| \|/ \| \|/\|	Fixes for incorrect line/polygon intersections.
* \| \|	Grid drawing fixes.	hwc487	2012-07-09
\| \| \|
* \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-07-09
\|\\| \| \| \| \| \| \| \| \| \| \|	GridFixes
\| * \|	Update copyright boilerplate	Kris Kowal	2012-07-06
\| \| \|
* \| \|	fix for grid drawing.	hwc487	2012-07-09
\| \| \|
* \| \|	fixes for grid drawing.	hwc487	2012-07-03
\| \|/ \|/\|
* \|	Fixes for incorrect line/polygon intersections.	hwc487	2012-06-28
\|/
*	Added logic to handle grid drawing where grid line starts on an object boundary	hwc487	2012-06-19
\|
*	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>
*	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>