| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Material bug fixes - reset texture array. | hwc487 | 2012-06-13 |
| | | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 |
| |\ | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | ||
| | * | ignore hardness for calligraphic brushes if stroke width is 1 | Pushkar Joshi | 2012-06-12 |
| | | | |||
| * | | Removed a console message. | hwc487 | 2012-06-13 |
| | | | | | | | | | Removed cloud material from the pulldown. | ||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-12 |
| |\| | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js | ||
| | * | Merge branch 'refs/heads/master' into dom-container | Valerio Virgillito | 2012-06-11 |
| | |\ | |||
| | | * | Merge pull request #280 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-06-08 |
| | | |\ | | | | | | | | | Brushtool | ||
| | | | * | change the PI to make it look like the fill color affects the brush stroke color | Pushkar Joshi | 2012-06-07 |
| | | | | | |||
| | | | * | enable gradients for brush stroke (in authoring as well as runtime) | Pushkar Joshi | 2012-06-06 |
| | | | | | |||
| | * | | | rewrite: currentSelectedContainer -> domContainer | Valerio Virgillito | 2012-06-08 |
| | |/ / | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-06 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | enable gradients for pen stroke and fill | Pushkar Joshi | 2012-06-05 |
| | | | | |||
| | | * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-31 |
| | | |\ | |||
| | | * | | move all the subpath functions to its prototype, and first version of the ↵ | Pushkar Joshi | 2012-05-31 |
| | | | | | | | | | | | | | | | | | pen path runtime | ||
| | | * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-21 |
| | | |\ \ | |||
| | | * | | | code cleanup and starting the subtool functionality | Pushkar Joshi | 2012-05-11 |
| | | | | | | |||
| | | * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-05-07 |
| | | |\ \ \ | |||
| | | * | | | | undo some previous change that was halving the alpha value of the stroke | Pushkar Joshi | 2012-05-01 |
| | | | | | | | |||
| | | * | | | | small code changes (mostly re-org) | Pushkar Joshi | 2012-05-01 |
| | | | | | | | |||
| | | * | | | | Fixed 1436 Brush: Calligraphic brushstroke is slightly thicker than the ↵ | Pushkar Joshi | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | round tip brushstroke | ||
| | | * | | | | prevent alpha values from accumulating over 1 due to rounding...fixes 1443 ↵ | Pushkar Joshi | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Brush: Odd painting behavior when Hardness is 99%. A solid outline is shown on the brushstroke. | ||
| | | * | | | | scale the brush stroke according to the input width and height | Pushkar Joshi | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 1444 Brush: Unable to scale brushstroke using the Transform handles | ||
| | * | | | | | removing all model creators. | Valerio Virgillito | 2012-06-05 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Runtime material fixes | hwc487 | 2012-06-12 |
| | | | | | | |||
| * | | | | | Material cleanup & bug fixes. | hwc487 | 2012-06-12 |
| | | | | | | |||
| * | | | | | Material cleanup | hwc487 | 2012-06-07 |
| | | | | | | |||
| * | | | | | material cleanup and rearchitecture | hwc487 | 2012-06-06 |
| | | | | | | |||
| * | | | | | Fixed RDGE render tree when PI changes causes node changes. | hwc487 | 2012-06-04 |
| | | | | | | |||
| * | | | | | Avoid throwing shader errors in the console for 'color' property at a base ↵ | hwc487 | 2012-06-04 |
| | | | | | | | | | | | | | | | | | | | | | class level. | ||
| * | | | | | 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 | ||