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

	Commit message (Collapse)	Author	Age
...
\| \| \| * \| \| \|	revert space	Jonathan Duran	2012-03-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \|	Merge branch 'refs/heads/NINJAmaster' into TimelineUber	Jonathan Duran	2012-03-15
\| \| \| \|\ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/controllers/selection-controller.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/helper-classes/backup-delete/GLBrushStroke.js js/helper-classes/backup-delete/GLCircle.js js/helper-classes/backup-delete/GLGeomObj.js js/helper-classes/backup-delete/GLRectangle.js js/helper-classes/backup-delete/GLSubpath.js js/helper-classes/backup-delete/GLWorld.js js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js js/helper-classes/backup-delete/Materials/DeformMaterial.js js/helper-classes/backup-delete/Materials/FlatMaterial.js js/helper-classes/backup-delete/Materials/FlyMaterial.js js/helper-classes/backup-delete/Materials/JuliaMaterial.js js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js js/helper-classes/backup-delete/Materials/MandelMaterial.js js/helper-classes/backup-delete/Materials/PlasmaMaterial.js js/helper-classes/backup-delete/Materials/PulseMaterial.js js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js js/helper-classes/backup-delete/Materials/StarMaterial.js js/helper-classes/backup-delete/Materials/TaperMaterial.js js/helper-classes/backup-delete/Materials/TunnelMaterial.js js/helper-classes/backup-delete/Materials/TwistMaterial.js js/helper-classes/backup-delete/Materials/TwistVertMaterial.js js/helper-classes/backup-delete/Materials/UberMaterial.js js/helper-classes/backup-delete/Materials/WaterMaterial.js js/helper-classes/backup-delete/Materials/ZInvertMaterial.js js/lib/drawing/world.js js/preloader/Preloader.js js/stage/layout.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \|	Fix element delete causes keyframe addition fail	Jonathan Duran	2012-03-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \|	Optimize Tween component needsDraw calls	Jonathan Duran	2012-03-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jonathan Duran <jduran@motorola.com>
\| \| \| * \| \| \|	Squashed commit of the following:	Jonathan Duran	2012-03-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge master into timeline Signed-off-by: Jonathan Duran <jduran@motorola.com>
* \| \| \| \| \| \|	Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate	Jose Antonio Marquez	2012-03-15
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Temp fix for element dimensions (SVG)	Jose Antonio Marquez	2012-03-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a temp fix to allow for a redraw of an SVG on load.
\| * \| \| \| \| \|	Fixing offset bug for drag-and-drop	Jose Antonio Marquez	2012-03-15
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'refs/heads/Ninja-Internal' into FileIO	Jose Antonio Marquez	2012-03-15
\| \|\\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-Candidate	Jose Antonio Marquez	2012-03-15
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal	Valerio Virgillito	2012-03-15
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Removing the backup-delete folder and the RDGE tools directory.	Valerio Virgillito	2012-03-15
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \|	Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate	Jose Antonio Marquez	2012-03-15
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Merge pull request #34 from ericmueller/integration	Jose Antonio Marquez Russo	2012-03-15
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|	Integration
\| \| * \| \| \|	Corrections for Uber shader IO	hwc487	2012-03-14
\| \| \| \| \| \|
\| \| * \| \| \|	Fixed BumpMetal material	hwc487	2012-03-13
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #5 from joseeight/FileIO-Integration	Eric	2012-03-13
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean-Up
\| \| * \| \| \| \|	Uber material changes for IO	hwc487	2012-03-12
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'integration' of github.com:ericmueller/ninja-internal into ↵	hwc487	2012-03-12
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration
\| \| \| * \ \ \ \	Merge pull request #4 from joseeight/FileIO-Integration	Eric	2012-03-12
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	File IO Updates
\| \| * \| \| \| \| \| \|	Merge branch 'integration' of github.com:ericmueller/ninja-internal into ↵	hwc487	2012-03-09
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration
\| \| \| * \| \| \| \| \|	Merge pull request #3 from joseeight/FileIO-Integration	Eric	2012-03-09
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Integrated dynamic path to assets
\| \| * \| \ \ \ \ \ \	Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal ↵	hwc487	2012-03-09
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into integration
* \| / \| \| \| \| \| \| \|	Adding Temp drag-drop I/O support	Jose Antonio Marquez	2012-03-15
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added methods to get data from dropped file while document is opened and save as a file. Currently only supporting images and SVGs, no error handling, which will have to be done.
* \| \| \| \| \| \| \| \|	Merge pull request #116 from joseeight/Color	Valerio Virgillito	2012-03-14
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|	Temp Fix for: IKNINJA-1078
\| * \| \| \| \| \| \| \|	Temp Fix for: IKNINJA-1078	Jose Antonio Marquez	2012-03-13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Removing the obsolete modalContainer div.	Valerio Virgillito	2012-03-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \| \|	Merge pull request #117 from mencio/layout-fix	Valerio Virgillito	2012-03-14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Layout Fixes and Canvas sized when panels are collapsed
\| * \| \| \| \| \| \| \| \|	Fixing the layout to only draw one level and stage resize when the panels ↵	Valerio Virgillito	2012-03-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	are collapsed. Fixing the following bugs: IKNINJA-1068 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| * \| \| \| \| \| \| \| \|	Some code cleanup - removing unused assignments.	Valerio Virgillito	2012-03-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \| \| \|	Merge pull request #114 from mqg734/ToolFixes	Valerio Virgillito	2012-03-13
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Fixed selection rectangle for multiple selection case.
\| * \| \| \| \| \| \| \| \|	Fixed drawing of multiple selection bounds when in flat case.	Nivesh Rajbhandari	2012-03-13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-03-13
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'refs/heads/ninja-internal' into ToolFixes	Nivesh Rajbhandari	2012-03-13
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Fixing selection tool when moving multiple selection in 3d mode.	Nivesh Rajbhandari	2012-03-12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \|