aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into TreeComponentsEric Guzman2012-02-13
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-10
| |\
| | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-10
| | |\
| | * | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
| | * | Removing some console logs. I kept in the ones that signify error cases.Nivesh Rajbhandari2012-02-09
| | * | Fixed switching between webGL and canvas 2d modes.Nivesh Rajbhandari2012-02-09
| | * | Updated linear and radial gradient materials import/export routines.Nivesh Rajbhandari2012-02-09
| | * | Merging changes for rectangle drawing.Nivesh Rajbhandari2012-02-09
| | |\ \
| | | * | Changed the rendering for canvas 2D rectangle.hwc4872012-02-08
| | | * | Reversed the orientation of one of the triangles for WebGL rendering.hwc4872012-02-08
| | | * | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-08
| | | |\ \
| | | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into wor...hwc4872012-02-08
| | | |\ \ \
| | | * | | | Removed unused rdge files from the compiler.hwc4872012-02-08
| | | * | | | Fixed context switching problems in rdgehwc4872012-02-08
| | | * | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-07
| | | |\ \ \ \
| | | * | | | | test code for deformation shaderhwc4872012-02-07
| | | * | | | | Enhanced the overlap test for the selection tool marquee select.hwc4872012-02-06
| | | * | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-06
| | | |\ \ \ \ \
| | | * | | | | | Removed an unnecessary (and incorrect) snapping calculation.hwc4872012-02-06
| | | * | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-03
| | | |\ \ \ \ \ \
| | | * | | | | | | Added a counter to the renderer that tracks the number of unloaded texture maps.hwc4872012-02-03
| | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into wor...hwc4872012-02-03
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-02
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Added the 'animate' flag to the pulse materialhwc4872012-02-02
| | | * | | | | | | | | added some additional shadershwc4872012-02-02
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-09
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Removed unused materials.Nivesh Rajbhandari2012-02-09
| | * | | | | | | | | | | Merging WebGL changes that allow users to modify different shape instances. A...Nivesh Rajbhandari2012-02-09
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-02-10
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into fea...Valerio Virgillito2012-02-09
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | More Text Tool UpdatesArmen Kesablyan2012-02-09
| | | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into tex...Armen Kesablyan2012-02-07
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Refactored rich text editor locationArmen Kesablyan2012-02-07
| | | * | | | | | | | | | | Initial Text tool completion.Armen Kesablyan2012-02-07
| | | * | | | | | | | | | | Initial Text Tool ImplementationArmen Kesablyan2012-02-02
| | * | | | | | | | | | | | Merge branch 'code-cleanup' of https://github.com/mencio/ninja-internal into ...Valerio Virgillito2012-02-09
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | deleted old utils file and move single method into NJUtilsValerio Virgillito2012-02-09
| | | * | | | | | | | | | | | Removing the un-used package.jsonValerio Virgillito2012-02-09
| | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into ...Valerio Virgillito2012-02-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-09
| | | * | | | | | | | | | | Fix layer/element selection on first click selectJonathan Duran2012-02-09
| | | * | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-09
| | | * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-09
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Fixes for animation element assignmentJonathan Duran2012-02-09
| | | * | | | | | | | | | | | CleanupJonathan Duran2012-02-09
| | | * | | | | | | | | | | | Cleaning up more code and adding more models for timelineJonathan Duran2012-02-09
| | | * | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-08
| | | * | | | | | | | | | | | Display time reading above layers and code clean upJonathan Duran2012-02-08
| | | * | | | | | | | | | | | Merge branch 'refs/heads/Timeline_updated' into TimelineJonathan Duran2012-02-08
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Numbering of layers between different selectedContainers starts from 1Kruti Shah2012-02-08
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 12:11:52 +0000