| Commit message (Expand) | Author | Age |
* | Merge pull request #19 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-24 |
|\ |
|
| * | - added closeDocument event for timeline | Ananya Sen | 2012-02-24 |
| * | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
| |\ |
|
| * \ | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
| |\ \ |
|
| * | | | switch html document - re-initialize draw-utils and snap-manager on opening a... | Ananya Sen | 2012-02-23 |
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-24 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Javascript does not evaluate a return with its expression in a new line. The ... | Nivesh Rajbhandari | 2012-02-24 |
| * | | | Removing duplicate get/setElementPlanes method. | Nivesh Rajbhandari | 2012-02-24 |
* | | | | Merge pull request #17 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-02-23 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int... | hwc487 | 2012-02-23 |
| |\| | |
|
| * | | | 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 |
| | |/
| |/| |
|
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
|\ \ \
| | |/
| |/| |
|
| * | | 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 |
| |/ |
|
* / | renaming makeElementModel2 to makeModelFromElement | Valerio Virgillito | 2012-02-23 |
|/ |
|
* | 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 |
|\ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|