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

about summary refs log tree commit diff

path: root/js/tools/Translate3DToolBase.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>
\| *	removing _undo array and _targets array and use object instead of matching ↵	Valerio Virgillito	2012-04-13
\| \| \| \| \| \| \| \| \| \| \| \|	arrays to set properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	3D translation fixes	hwc487	2012-04-16
\| \|
* \|	3D rotation	hwc487	2012-04-13
\| \|
* \|	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
\| *	Fixing 3d tool reset to redraw handles.	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Commenting out console logs.	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| *	Merge branch 'refs/heads/ToolFixes' into WebGLMaterials	Nivesh Rajbhandari	2012-04-04
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| *	Merge branch 'refs/heads/WebGLFileIO' into ToolFixes	Nivesh Rajbhandari	2012-04-04
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.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 Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \|	Translation handles do not redraw at correct location when double-clicking ↵	Nivesh Rajbhandari	2012-03-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to reset. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \|	translate3DObject tool fixes.	hwc487	2012-04-05
\| \| \| \|
* \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-04-04
\|\ \ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Snapping Conflicts: 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
\| * \| \|	Squashed commit of Preparing for the montage undo-manager: Architecture changes	Valerio Virgillito	2012-04-04
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	turned off translation handles during a multi-object drag.	hwc487	2012-04-04
\| \| \|
* \| \|	Translate 3D fix for multi-selection Z translation	hwc487	2012-04-02
\| \|/ \|/\|
* \|	Snapping fixes.	hwc487	2012-04-02
\|/
*	Squashed commit of SnapManagerFixes	Valerio Virgillito	2012-03-16
\| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Create drag plane parallel to working plane and offset by where the user ↵	Nivesh Rajbhandari	2012-03-06
\| \| \| \| \| \|	clicked in z. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	Reset translation values as well when double-clicking to reset the rotation ↵	Nivesh Rajbhandari	2012-02-27
\| \| \| \| \| \|	values. 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>