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

about summary refs log tree commit diff

path: root/js/tools/RotateObject3DTool.js

	Commit message (Collapse)	Author	Age
*	Fixing some more merge issues.	Nivesh Rajbhandari	2012-04-18
\| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	Merge branch 'refs/heads/ninja-internal' into EricMerge	Nivesh Rajbhandari	2012-04-18
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	fixed stage rotation	Valerio Virgillito	2012-04-13
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-04-13
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Snapping_II Conflicts: js/helper-classes/3D/view-utils.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js js/tools/Translate3DToolBase.js
\| *	IKNINJA-764 - The Local/Global options are not in synced with both 3D object ↵	Nivesh Rajbhandari	2012-03-27
\| \| \| \| \| \| \| \| \| \| \| \|	rotate tool and 3D object translate tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	Rotate3D tool changes	hwc487	2012-04-11
\|/
*	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>