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

	Commit message (Collapse)	Author	Age
*	Merge branch 'master' into pentool	Pushkar Joshi	2012-02-28
\|\ \| \| \| \| \| \| \| \|	Conflicts: manifest.json
\| *	Reverting the export for publish property since its only used for testing.	Valerio Virgillito	2012-02-27
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes the enable webGL in the PI for shapes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
\| *	Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵	hwc487	2012-02-23
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/preloader/Preloader.js
\| * \|	GL save and reload.	hwc487	2012-02-22
\| \| \|
\| * \|	Runtime classes	hwc487	2012-02-22
\| \| \|
\| * \|	Added all materials back in	hwc487	2012-02-22
\| \| \|
\| * \|	Adding all the shaders back in	hwc487	2012-02-22
\| \| \|
\| * \|	Adding bug fixes.	hwc487	2012-02-22
\| \| \|
* \| \|	new anchor control guide rendering (smaller handles)	Pushkar Joshi	2012-02-28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and clamp min. width and height to 1 while resizing subpaths
* \| \|	Bug fixes:	Pushkar Joshi	2012-02-28
\| \|/ \|/\| \| \| \| \| \| \| \| \|	1152: allow deleting of multiple paths from inside pen tool 1128: keyboard hotkey shortcut 'P' for pen tool 941: changing width or height of the path scales the path
* \|	PulseMaterial and RadialBlurMaterial had typos in their import code.	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \|	Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* \|	Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵	Nivesh Rajbhandari	2012-02-22
\| \| \| \| \| \| \| \| \| \| \| \|	WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
* \|	Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵	Nivesh Rajbhandari	2012-02-22
\|/ \| \| \| \| \|	materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
*	Merge branch 'refs/heads/NinjaInternal' into FileIO	Jose Antonio Marquez	2012-02-11
\|\ \| \| \| \| \| \| \| \|	Conflicts: js/ninja.reel/ninja.html
\| *	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
\| \| \| \| \|
\| \| * \| \|	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
\| \| * \| \| \|	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-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>
\| * \| \| \| \|	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
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	don't use colorToHex function because it only works for 3D color (needs a ↵	Pushkar Joshi	2012-02-07
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix to colorToHex)
\| * \| \| \|	Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool	Pushkar Joshi	2012-02-02
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Removed a console log and set the Plasma material to animating.	hwc487	2012-02-01
\| \| \| \| \|
\| \| * \| \|	changes to allow minimal rendering ofnon-animated materials.	hwc487	2012-02-01
\| \| \| \| \|
\| \| * \| \|	Renderer startup handling of non-animated materials.	hwc487	2012-01-30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed zoom from the document bar to keep the location center of the viewable portion of the document fixed.