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

	Commit message (Collapse)	Author	Age
*	Merge branch 'master' into pentool	Pushkar Joshi	2012-04-24
\|\
\| *	adjusting the bread crumb to work with the new template	Valerio Virgillito	2012-04-23
\| \| \| \| \| \| \| \| \| \| \| \|	Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	reverting old template to current working status. New template work.	Valerio Virgillito	2012-04-20
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Merge branch 'refs/heads/Document' into stage-document-architecture	Valerio Virgillito	2012-04-19
\| \|\
\| \| *	Merge branch 'refs/heads/Ninja-Internal' into Document	Jose Antonio Marquez	2012-04-10
\| \| \|\
\| \| * \	Merge branch 'refs/heads/Ninja-Internal' into Document	Jose Antonio Marquez	2012-04-04
\| \| \|\ \
\| \| * \| \|	Backup for merge	Jose Antonio Marquez	2012-04-04
\| \| \| \| \|
\| \| * \| \|	Merge branch 'refs/heads/Ninja-Internal' into Document	Jose Antonio Marquez	2012-04-02
\| \| \|\ \ \
\| \| * \| \| \|	Setting up document rework	Jose Antonio Marquez	2012-04-02
\| \| \| \| \| \|
\| * \| \| \| \|	initial stage web template	Valerio Virgillito	2012-04-18
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \|	Merge branch 'master' into pentool	Pushkar Joshi	2012-04-17
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/tools/PenTool.js
\| * \| \| \|	Merge pull request #159 from mqg734/WebGLMaterials	Valerio Virgillito	2012-04-09
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
\| \| * \| \| \|	Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ↵	Nivesh Rajbhandari	2012-04-05
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values. 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>
\| \| \| \| * \| \|	Give user feedback about which element the Fill/InkBottle tools will act on.	Nivesh Rajbhandari	2012-04-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| \| * \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLFileIO	Nivesh Rajbhandari	2012-03-30
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ \| \| \| \| \| \|/\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| \| \| * \| \|	Updated shapes to always check for its stroke and fill colors and materials ↵	Nivesh Rajbhandari	2012-03-29
\| \| \| \| \| \|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	instead of relying on the shapeModel cache because it can get out of sync. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLMaterials	Nivesh Rajbhandari	2012-03-27
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \| \| \| \|	Adding logic for flatten checkbox in PI.	Nivesh Rajbhandari	2012-03-24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This requires minor modifications to both StageController and ComponentController. Also removing unused global3DSettings CSS. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \|	Merge branch 'master' into pentool	Pushkar Joshi	2012-04-06
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #157 from ananyasen/ninja-internal-master-patch1	Valerio Virgillito	2012-04-04
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|	[CR] Keep Save related menu items always enabled, if there is an open do...
\| \| * \| \| \| \|	[CR] Keep Save related menu items always enabled, if there is an open document	Ananya Sen	2012-04-04
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
\| * \| \| \| \|	Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵	John Mayhew	2012-04-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
\| * \| \| \| \|	removed old unused import and export functions.	John Mayhew	2012-04-03
\| \| \| \| \| \|
\| * \| \| \| \|	Namespaced the canvas runtime file and updated all dependencies	John Mayhew	2012-04-03
\| \|/ / / /
* \| \| \| \|	Merge branch 'master' into pentool	Pushkar Joshi	2012-04-03
\|\\| \| \| \|
\| * \| \| \|	Merge pull request #147 from pushkarjoshi/brushtool	Valerio Virgillito	2012-03-29
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|	Brushtool
\| * \| \| \|	Merge pull request #131 from ananyasen/integration-candidate	Valerio Virgillito	2012-03-28
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
\| \| * \| \| \|	- enable/disable save, saveAs, saveAll, close, closeAll as per documents open	Ananya Sen	2012-03-22
\| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- added close file and close all menu items Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/helper-classes/3D/draw-utils.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* \| \| \| \|	working File I/O for pen tool created paths and some minor bug fixes ↵	Pushkar Joshi	2012-04-03
\| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	(correctly setting the canvas for brush stroke file I/O, correct plane matrix for file I/O)
* \| \| \|	Merge branch 'master' into brushtool	Pushkar Joshi	2012-03-28
\|\\| \| \|
\| * \| \|	Presets Controller - Removing test background from transition class	Eric Guzman	2012-03-27
\| \| \| \|
\| * \| \|	Merge branch 'refs/heads/master' into PresetsPI	Eric Guzman	2012-03-27
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Presets Panel - Adding presets controller and removing functionality from ↵	Eric Guzman	2012-03-22
\| \| \|/ \| \|/\| \| \| \| \| \| \|	panel code
* \| \|	File IO for the brush stroke AND changing the data type of brush stroke from ↵	Pushkar Joshi	2012-03-27
\| \|/ \|/\| \| \| \| \|	GEOM_TYPE_CUBIC_BEZIER to GEOM_TYPE_BRUSH_STROKE
* \|	Removing m-js components I/O and fix for webGL	Jose Antonio Marquez	2012-03-23
\| \| \| \| \| \| \| \|	Removed saving m-js components as new components broke I/O when present. Also made a fix for checking length of webGL array since first item now is non-user data. (That is to be removed)
* \|	Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵	Jose Antonio Marquez	2012-03-22
\|\ \ \| \| \| \| \| \| \| \| \|	FileIO-Montage-Components
\| * \|	Squashed commit of the following GL integration	Valerio Virgillito	2012-03-22
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \|	Adding Ninja URL method to io-mediator	Jose Antonio Marquez	2012-03-22
\| \| \|
* \| \|	Adding firstDraw event to components added	Jose Antonio Marquez	2012-03-22
\|/ / \| \| \| \| \| \|	This will allow us to re-parse the document for styles added dynamically.
* \|	Adding 'addComponentFirstDraw' event from the user document main component.	Valerio Virgillito	2012-03-21
\| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \|	Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵	Jose Antonio Marquez	2012-03-18
\|\ \ \| \| \| \| \| \| \| \| \|	FileIO-Montage-Components
\| * \|	Deleting unecessary property	François Frisch	2012-03-17
\| \| \|
\| * \|	Getting ownerComponent bindings	François Frisch	2012-03-17
\| \|/
* /	Temp I/O functionality for M-JS components	Jose Antonio Marquez	2012-03-18
\|/ \| \| \|	Added the ability to save montages component serialization from Ninja. Very rough, but functional.
*	Corrections for Uber shader IO	hwc487	2012-03-14
\|
*	Fixed BumpMetal material	hwc487	2012-03-13
\|
*	Add temp delay for webGL preview	Jose Antonio Marquez	2012-03-10
\| \| \| \|	Added a padded launch webGL preview delay. This is very temporary, just a work around until RDGE issues are fixed.
*	further removal of authortime asset path replacement.	hwc487	2012-03-09
\|