aboutsummaryrefslogtreecommitdiff
path: root/js/lib
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | | | | | | Editable parameters for flag, pulse, uber, and radial gradient materials.hwc4872012-05-22
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Editable material propertieshwc4872012-05-22
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Exposing parameters for pulse and plasma materialshwc4872012-05-17
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Exposing parameters in Water Materialhwc4872012-05-16
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | More merge problemshwc4872012-05-14
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Fixing merge issueshwc4872012-05-14
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-07
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | | | | | Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | | | | Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | | | | | | Converting line, circle and rectangle shapes to object literal notation.Nivesh Rajbhandari2012-05-02
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | | | | Cleanup of indirect textures.hwc4872012-05-03
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Material editorhwc4872012-05-02
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| * | | | | | | | | | | | | | Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | Canvas interaction
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canvas-interaction
| | * | | | | | | | | | | | | | canvas interactionhwc4872012-04-26
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Canvas-interaction
| | * | | | | | | | | | | | | | Snapping tocontained objectshwc4872012-04-24
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | canvas interactionhwc4872012-04-23
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | twist vertex material changeshwc4872012-04-30
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| * | | | | | | | | | | | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | | | | Merge pull request #176 from pushkarjoshi/brushtoolValerio Virgillito2012-04-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | Brushtool
| | *