| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Correction for texture paths. | hwc487 | 2012-06-01 |
| | | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-31 |
| |\ | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | ||
| | * | Fixing reference of document | Jose Antonio Marquez | 2012-05-24 |
| | | | |||
| | * | Merge branch 'dom-architecture' of ↵ | Eric Guzman | 2012-05-22 |
| | |\ | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/controllers/styles-controller.js | ||
| | | * | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-22 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Squashed master into dom-architecture | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Fixing the live preview for the new document. | Valerio Virgillito | 2012-05-10 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-17 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-10 |
| | |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | ||
| | * | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-01 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-30 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-26 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-23 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-09 |
| | |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-05 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-04 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-02 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js | ||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | ||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-02-29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | ||
| | * | | | | | | | | | | | | | | | | | CSS Panel Update | Eric Guzman | 2012-02-22 |
| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | Added the flag shader to the runtime. | hwc487 | 2012-05-31 |
| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | Fixed authortime & runtime for twist vertex shader. | hwc487 | 2012-05-29 |
| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | Added mesh refinement to circles. | hwc487 | 2012-05-25 |
| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | Parameters for twistVertex material | hwc487 | 2012-05-25 |
| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | New functions on shape primitives. | hwc487 | 2012-05-25 |
| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | Fixed merge problems | hwc487 | 2012-05-23 |
| | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-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. | hwc487 | 2012-05-18 |
| | | | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | | canvas 2d radial gradient render problem. | hwc487 | 2012-05-17 |
| | | | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | | Linear & radial gradients for runtime fixes | hwc487 | 2012-05-17 |
| | | | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | | Gradient matching between WebGL and Canvas2D | hwc487 | 2012-05-15 |
| | | | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | | base canvas 2d rendering of radial gradient on size of the filled region only | hwc487 | 2012-05-14 |
| | | | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js | ||
| | * | | | | | | | | | | | | | | | | | code cleanup for linear gradients. | hwc487 | 2012-05-08 |
| | | | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | | WebGL linear gradients to match CSS | hwc487 | 2012-05-08 |
| | | | | | | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | | | |||