| Commit message (Expand) | Author | Age |
* | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
|\ |
|
| * | Removing unused method that was using snapManager. | Nivesh Rajbhandari | 2012-02-22 |
| * | Integrating Zoom tool fixes. | Nivesh Rajbhandari | 2012-02-22 |
* | | PulseMaterial and RadialBlurMaterial had typos in their import code. | Nivesh Rajbhandari | 2012-02-22 |
* | | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials. | Nivesh Rajbhandari | 2012-02-22 |
* | | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ... | Nivesh Rajbhandari | 2012-02-22 |
* | | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ma... | Nivesh Rajbhandari | 2012-02-22 |
|/ |
|
* | Fixing the getStageWorldToGlobalMatrix bug | Valerio Virgillito | 2012-02-16 |
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 |
|\ |
|
| * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-02-10 |
| |\ |
|
| * | | Support export/import of GLLine data. | Nivesh Rajbhandari | 2012-02-10 |
| * | | Removing some console logs. I kept in the ones that signify error cases. | Nivesh Rajbhandari | 2012-02-09 |
| * | | Updated linear and radial gradient materials import/export routines. | Nivesh Rajbhandari | 2012-02-09 |
| * | | Merging changes for rectangle drawing. | Nivesh Rajbhandari | 2012-02-09 |
| |\ \ |
|
| | * | | 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 |
| | |\ \ |
|
| | * | | | Removed unused rdge files from the compiler. | hwc487 | 2012-02-08 |
| | * | | | 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 |
| | |\ \ \ |
|
| | * | | | | 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 |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into wor... | hwc487 | 2012-02-03 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Removed unused materials. | Nivesh Rajbhandari | 2012-02-09 |
| * | | | | | | | | | Merging WebGL changes that allow users to modify different shape instances. A... | Nivesh Rajbhandari | 2012-02-09 |
| | |_|_|_|_|_|/ /
| |/| | | | | | | |
|
* | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 |
|\ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
| * | | | | | | | | deleted old utils file and move single method into NJUtils | Valerio Virgillito | 2012-02-09 |
| | |/ / / / / /
| |/| | | | | | |
|
* | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
|\| | | | | | | |
|
| * | | | | | | | Fixed bad merge in FlatMaterials. | Nivesh Rajbhandari | 2012-02-09 |
| * | | | | | | | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes | Nivesh Rajbhandari | 2012-02-09 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | Changed the rendering for canvas 2D rectangle. | Nivesh Rajbhandari | 2012-02-09 |
| * | | | | | | | | Reversed the orientation of one of the triangles for WebGL rendering. | Nivesh Rajbhandari | 2012-02-09 |
| * | | | | | | | | Merging snap manager fix for infinite projection errors when stage view is ch... | Nivesh Rajbhandari | 2012-02-08 |
| * | | | | | | | | Merging fix for marquee selection that accounts for 3d values. | Nivesh Rajbhandari | 2012-02-08 |
| | |/ / / / / /
| |/| | | | | | |
|
| * | | | | | | | Fixed several typos in Materials import/export code to support toggling betwe... | Nivesh Rajbhandari | 2012-02-08 |
| | |_|_|_|_|/
| |/| | | | | |
|
* | | | | | | | 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 |
| |\| | | | | |
|
| * | | | | | | bug fixes for better anchor point rotation and removing snapping on hover and... | Pushkar Joshi | 2012-02-08 |
| * | | | | | | 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 fix... | Pushkar Joshi | 2012-02-07 |
| * | | | | | | | Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool | Pushkar Joshi | 2012-02-02 |
| |\ \ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | | | |
|