| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-02-13 |
| |\ | |||
| | * | Merge pull request #32 from mayhewinator/WorkingBranch | mayhewinator | 2012-02-10 |
| | |\ | |||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-02-10 |
| | | |\ | | |/ | |/| | |||
| | * | | Merge pull request #31 from mqg734/WebGLFixes | Valerio Virgillito | 2012-02-10 |
| | |\ \ | |||
| | | * \ | 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 |
| | | * | | Fixed switching between webGL and canvas 2d modes. | 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 |
| | | | |\ \ | |||
| | | | * \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into wor... | 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 |
| | | | * | | | | | 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 |
| | | | * | | | | | | | 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 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | Undoing experimental changes from the basic webgl shaders. | Nivesh Rajbhandari | 2012-02-09 |
| | | * | | | | | | | | | | | Removing image assets that were being used by deleted WebGL materials. | 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 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-02-10 |
| | | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||
| | * | | | | | | | | | | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into fea... | Valerio Virgillito | 2012-02-09 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | | More Text Tool Updates | Armen Kesablyan | 2012-02-09 |
| | | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into tex... | Armen Kesablyan | 2012-02-07 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | | | Refactored rich text editor location | Armen Kesablyan | 2012-02-07 |
| | | * | | | | | | | | | | | | | Initial Text tool completion. | Armen Kesablyan | 2012-02-07 |
| | * | | | | | | | | | | | | | | Merge branch 'code-cleanup' of https://github.com/mencio/ninja-internal into ... | Valerio Virgillito | 2012-02-09 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | | | | Removing the un-used context menu style | Valerio Virgillito | 2012-02-09 |
| | | * | | | | | | | | | | | | | | deleted old utils file and move single method into NJUtils | Valerio Virgillito | 2012-02-09 |
| | | * | | | | | | | | | | | | | | Removing the un-used package.json | Valerio Virgillito | 2012-02-09 |
| | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into ... | Valerio Virgillito | 2012-02-09 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-09 |
| | | * | | | | | | | | | | | | | Fix layer/element selection on first click select | Jonathan Duran | 2012-02-09 |
| | | * | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-09 |
| | | * | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-02-09 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | | | | Fixes for animation element assignment | Jonathan Duran | 2012-02-09 |
| | | * | | | | | | | | | | | | | | Cleanup | Jonathan Duran | 2012-02-09 |
| | | * | | | | | | | | | | | | | | Cleaning up more code and adding more models for timeline | Jonathan Duran | 2012-02-09 |