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

	Commit message (Collapse)	Author	Age
*	Fixing the getStageWorldToGlobalMatrix bug	Valerio Virgillito	2012-02-16
\| \| \| \| \| \|	removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com>
*	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-11
\|\ \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html
\| *	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-02-10
\| \|\
\| * \|	Support export/import of GLLine data.	Nivesh Rajbhandari	2012-02-10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	Removing some console logs. I kept in the ones that signify error cases.	Nivesh Rajbhandari	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	Updated linear and radial gradient materials import/export routines.	Nivesh Rajbhandari	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \|	Merging changes for rectangle drawing.	Nivesh Rajbhandari	2012-02-09
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| \| * \|	Changed the rendering for canvas 2D rectangle.	hwc487	2012-02-08
\| \| \| \|
\| \| * \|	Reversed the orientation of one of the triangles for WebGL rendering.	hwc487	2012-02-08
\| \| \| \|
\| \| * \|	Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working	hwc487	2012-02-08
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js
\| \| * \| \|	Removed unused rdge files from the compiler.	hwc487	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	switched the preloader to use the compiled version of rdge Updated the rdge binary.
\| \| * \| \|	Fixed context switching problems in rdge	hwc487	2012-02-08
\| \| \| \| \|
\| \| * \| \|	Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working	hwc487	2012-02-07
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
\| \| * \| \| \|	test code for deformation shader	hwc487	2012-02-07
\| \| \| \| \| \|
\| \| * \| \| \|	Enhanced the overlap test for the selection tool marquee select.	hwc487	2012-02-06
\| \| \| \| \| \|
\| \| * \| \| \|	Removed an unnecessary (and incorrect) snapping calculation.	hwc487	2012-02-06
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working	hwc487	2012-02-03
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Added a counter to the renderer that tracks the number of unloaded texture maps.	hwc487	2012-02-03
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Started vertex deformations.
\| \| * \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-02-03
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	working
\| \| * \ \ \ \ \	Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working	hwc487	2012-02-02
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Added the 'animate' flag to the pulse material	hwc487	2012-02-02
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	added some additional shaders	hwc487	2012-02-02
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into WebGLFixes	Nivesh Rajbhandari	2012-02-09
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/helper-classes/RDGE/GLMaterial.js js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/FlatMaterial.js js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js js/helper-classes/RDGE/Materials/JuliaMaterial.js js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js js/helper-classes/RDGE/Materials/MandelMaterial.js js/helper-classes/RDGE/Materials/PlasmaMaterial.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/Materials/RadialGradientMaterial.js js/helper-classes/RDGE/Materials/TunnelMaterial.js js/helper-classes/RDGE/Materials/TwistMaterial.js js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/src/core/script/renderer.js js/panels/Materials/Materials.xml Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \| \|	Removed unused materials.	Nivesh Rajbhandari	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \| \|	Merging WebGL changes that allow users to modify different shape instances. ↵	Nivesh Rajbhandari	2012-02-09
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, merging in changes that improve rendering performance by not updating static materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-10
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
\| * \| \| \| \| \| \| \|	deleted old utils file and move single method into NJUtils	Valerio Virgillito	2012-02-09
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* \| \| \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-09
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed bad merge in FlatMaterials.	Nivesh Rajbhandari	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \|	Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes	Nivesh Rajbhandari	2012-02-09
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \|	Changed the rendering for canvas 2D rectangle.	Nivesh Rajbhandari	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \|	Reversed the orientation of one of the triangles for WebGL rendering.	Nivesh Rajbhandari	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \|	Merging snap manager fix for infinite projection errors when stage view is ↵	Nivesh Rajbhandari	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changed to top or side. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \|	Merging fix for marquee selection that accounts for 3d values.	Nivesh Rajbhandari	2012-02-08
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \|	Fixed several typos in Materials import/export code to support toggling ↵	Nivesh Rajbhandari	2012-02-08
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	between 2d and 3d shape modes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \| \| \| \| \| \|	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-09
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	fill all paths even if they are open	Pushkar Joshi	2012-02-08
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into pentool	Pushkar Joshi	2012-02-08
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
\| * \| \| \| \| \|	bug fixes for better anchor point rotation and removing snapping on hover ↵	Pushkar Joshi	2012-02-08
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and mouse down
\| * \| \| \| \| \|	some minor bug fixes and code cleanup	Pushkar Joshi	2012-02-07
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into pentool	Pushkar Joshi	2012-02-07
\| \|\ \