| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'Fixes_071' of https://github.com/mqg734/ninja | Valerio Virgillito | 2012-07-20 |
| |\ | |||
| | * | IKNINJA-1780 - [Shape] Error when opening document that contains a shape ↵ | Nivesh Rajbhandari | 2012-07-19 |
| | | | | | | | | | | | | | with gradient color or no color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Renamed Raiders material to Dark Blur, and Paris to Blue Sky. | hwc487 | 2012-07-19 |
| |/ | |||
| * | re-wrote the radial blur shader. Changed tolerances in the deformation shaders. | hwc487 | 2012-07-11 |
| | | |||
| * | BSD License | Kris Kowal | 2012-07-09 |
| | | |||
| * | Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal | Valerio Virgillito | 2012-07-09 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Remove trailing spaces | Kris Kowal | 2012-07-06 |
| | | | |||
| | * | Expand tabs | Kris Kowal | 2012-07-06 |
| | | | |||
| * | | Merge branch 'Taper' of https://github.com/ericmueller/ninja-internal | Valerio Virgillito | 2012-07-09 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/rdge/materials/linear-gradient-material.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | 'V' texture map coordinate was inverted in some cases. | hwc487 | 2012-06-29 |
| | | | | |||
| | * | | Added capability to split a mesh into multiiple parts to avoid buffer ↵ | hwc487 | 2012-06-28 |
| | | | | | | | | | | | | | overflow situations. | ||
| * | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUI | Nivesh Rajbhandari | 2012-07-09 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
| | | | | |||
| * | | | PI, drawing and editing fixes for shapes and materials. | Nivesh Rajbhandari | 2012-07-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1841 - Cannot change webgl shape with LinearGradient and RadialGradient to solid color. IKNINJA-1851 - Cannot draw webgl shapes with Linear/RadialGradient material. IKNINJA-1864 - PI doesn't update the color of shape if WebGL material switches to Flat. IKNINJA-1886 - Gradient edits not applied to WebGL Stage object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUI | Nivesh Rajbhandari | 2012-07-02 |
| |\| | | |||
| | * | | Need to special case linear gradient, radial gradient and uber materials ↵ | Nivesh Rajbhandari | 2012-06-29 |
| | |/ | | | | | | | | | | | when applying fill and stroke colors. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * / | Performance fix for WebGL materials playing even when the dialog/file is no ↵ | Nivesh Rajbhandari | 2012-06-27 |
| |/ | | | | | | | | longer in view. Also pausing videos when switching documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Fixed a problem with Uber shader where new values were getting clobbered by ↵ | hwc487 | 2012-06-15 |
| | | | | | old values. | ||
| * | Re-added Raiders material | hwc487 | 2012-06-15 |
| | | |||
| * | Re-added Paris material | hwc487 | 2012-06-15 |
| | | |||
| * | Fix for setting the specular map in the Uber shader. | hwc487 | 2012-06-15 |
| | | |||
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-14 |
| |\ | | | | | | | Textures | ||
| | * | fix bug #1704 where small paths/strokes with large stroke width caused a ↵ | Pushkar Joshi | 2012-06-13 |
| | | | | | | | | | flip of the gradient colors | ||
| | * | correct path resizing in case of stroke width other than 1 | Pushkar Joshi | 2012-06-13 |
| | | | |||
| | * | fixes bug #1623: middle transform handle causes the brush stroke to have a ↵ | Pushkar Joshi | 2012-06-13 |
| | | | | | | | | | zero width or height and brush stroke cannot be recovered | ||
| * | | Fix for line color. | hwc487 | 2012-06-14 |
| | | | | | | | | | Name change for all materials | ||
| * | | Fixed alphabetization of material names. | hwc487 | 2012-06-14 |
| | | | | | | | | | | | Removed console output. Removed texture map field from Mandel material editor. | ||
| * | | Fixes for runtime Taper material | hwc487 | 2012-06-13 |
| | | | |||
| * | | Oval stroke and fill material were stored in inverted order. | hwc487 | 2012-06-13 |
| | | | |||
| * | | 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. | ||