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

	Commit message (Collapse)	Author	Age
*	Bug Fixes	Jose Antonio Marquez	2012-02-13
\| \| \| \| \| \|	IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
*	Merge pull request #32 from mayhewinator/WorkingBranch	mayhewinator	2012-02-10
\|\ \| \| \| \|	Updates for splash screen, menu items and implemented some of the new help menu items
\| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-02-10
\| \|\ \| \|/ \|/\| \| \|	WorkingBranch
* \|	Merge pull request #31 from mqg734/WebGLFixes	Valerio Virgillito	2012-02-10
\|\ \ \| \| \| \| \| \|	Merging WebGL fixes
\| * \	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>
\| * \|	Fixed switching between webGL and canvas 2d modes.	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
\| \| * \ \	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-02-08
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	working
\| \| * \| \| \|	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
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working	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>
\| * \| \| \| \| \| \| \| \| \| \|	Undoing experimental changes from the basic webgl shaders.	Nivesh Rajbhandari	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
\| * \| \| \| \| \| \| \| \| \| \|	Removing image assets that were being used by deleted WebGL materials.	Nivesh Rajbhandari	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	John Mayhew	2012-02-10
\| \| \| \| \| \| \| \| \| \| \| \|\ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WorkingBranch Conflicts: js/ninja.reel/ninja.html
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵	Valerio Virgillito	2012-02-09
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature-branch
\| * \| \| \| \| \| \| \| \| \| \| \|	More Text Tool Updates	Armen Kesablyan	2012-02-09
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	Armen Kesablyan	2012-02-07
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Refactored rich text editor location	Armen Kesablyan	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Initial Text tool completion.	Armen Kesablyan	2012-02-07
\| \| \| \| \| \| \| \|