aboutsummaryrefslogtreecommitdiff
path: root/js/lib
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | | | | | | | Added mesh refinement to circles.hwc4872012-05-25
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Parameters for twistVertex materialhwc4872012-05-25
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | New functions on shape primitives.hwc4872012-05-25
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Fixed merge problemshwc4872012-05-23
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/shape-primitive.js js/lib/rdge/materials/linear-gradient-material.js
| * | | | | | | | | | | | | | | | | Updates for WebGL/Canvas 2D authortime and runtime gradients.hwc4872012-05-18
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | canvas 2d radial gradient render problem.hwc4872012-05-17
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Linear & radial gradients for runtime fixeshwc4872012-05-17
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Gradient matching between WebGL and Canvas2Dhwc4872012-05-15
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | base canvas 2d rendering of radial gradient on size of the filled region onlyhwc4872012-05-14
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js
| * | | | | | | | | | | | | | | | | code cleanup for linear gradients.hwc4872012-05-08
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | WebGL linear gradients to match CSShwc4872012-05-08
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Radial gradients to match CSShwc4872012-05-08
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | |