| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 | ||
| | * | Merge pull request #221 from ericmueller/3DBugs | Valerio Virgillito | 2012-05-22 |
| | |\ | | | | | | | 3 d bugs | ||
| | | * | 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 |
| | | | | |||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | 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 |
| | | | | |||
| | | * | removed console output. | hwc487 | 2012-05-14 |
| | | | | |||
| | | * | Drag plane not being set. Injection from a recent checkin of mine. | hwc487 | 2012-05-14 |
| | | | | |||
| | | * | removed some console output. | hwc487 | 2012-05-14 |
| | | | | |||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-11 |
| | | |\ | |||
| | | * \ | 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 | ||
| | | * \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-10 |
| | | |\ \ \ | |||
| | | * | | | | Fixed an inaccuracy snapping to the stage. | hwc487 | 2012-05-10 |
| | | | | | | | |||
| | | * | | | | code cleanup for linear gradients. | hwc487 | 2012-05-08 |
| | | | | | | | |||
| | | * | | | | WebGL linear gradients to match CSS | hwc487 | 2012-05-08 |
| | | | | | | | |||
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-08 |
| | | |\ \ \ \ | |||
| | | * | | | | | Radial gradients to match CSS | hwc487 | 2012-05-08 |
| | | | | | | | | |||
| * | | | | | | | Editable parameters for flag, pulse, uber, and radial gradient materials. | hwc487 | 2012-05-22 |
| | | | | | | | | |||
| * | | | | | | | Editable material properties | hwc487 | 2012-05-22 |
| | | | | | | | | |||
| * | | | | | | | Exposing parameters for pulse and plasma materials | hwc487 | 2012-05-17 |
| | | | | | | | | |||
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-17 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | * | | | | | | Merge pull request #239 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-05-16 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | Tool Options styling and Icon update | ||
| | | * | | | | | fixed bug with keyboard shortcut for fill/ink tool | John Mayhew | 2012-05-16 |
| | | | | | | | | |||
| | | * | | | | | -added new images for the text tool options | John Mayhew | 2012-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -simplified text options CSS -fixed styling to accommodate new images | ||
| | | * | | | | | updated object 3D options bar to use the new radio styles | John Mayhew | 2012-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed its use of the sprite sheet | ||
| | | * | | | | | Merge pull request #1 from mencio/WorkingBranch | mayhewinator | 2012-05-15 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Working branch - Adding the color pre-flight for the Tag tool | ||
| | | | * | | | | | Add color to tag tool | Valerio Virgillito | 2012-05-15 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-15 |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | WorkingBranch | ||
| | | * | | | | | -fixed spacing problem in the tag tool | John Mayhew | 2012-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -implemented the new mode radio buttons for the pen tool | ||
| | | * | | | | | -changed tool options radio button class to match the styling of the shape ↵ | John Mayhew | 2012-05-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options tool buttons -fixed bug injected in the tag tool caused by accidental removal of the value element attribute -moved color chip in the tag tool to the right of the element radio button group | ||
| | | * | | | | | -updated images for tag and zoom tool | John Mayhew | 2012-05-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -made tag and zoom tool radio group button styles consistent and removed duplicate classes | ||
| | | * | | | | | fixed bug introduced when we removed the color toolbar. The styling of the ↵ | John Mayhew | 2012-05-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color chips in the PI was broken due to a reliance on a css class from the colortoolbar reel. The requried class was copied to the properties.css file as a temporary fix. | ||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-10 |
| | | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | WorkingBranch | ||
| | | * | | | | | put color chips in the inkbottle and fill tool | John Mayhew | 2012-05-10 |
| | | | | | | | | |||
| | | * | | | | | removed unnecessary css class | John Mayhew | 2012-05-10 |
| | | | | | | | | |||
| | | * | | | | | -moved sel tool images to proper folder | John Mayhew | 2012-05-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -finished styling shape tool options -added new icons for shape tool | ||
| | | * | | | | | -Consolidated many redundant css classes used in the tool options bars | John Mayhew | 2012-05-09 |
| | | | | | | | | |||
| | | * | | | | | Correct layout and styling for the shape tool and its sub tools | John Mayhew | 2012-05-09 |
| | | | | | | | | |||
| | | * | | | | | -Put new selection tool icons in the options bar | John Mayhew | 2012-05-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Styled the selection tool options bar | ||
| | | * | | | | | implemented proper styling for shape, inkbottle and fill tools | John Mayhew | 2012-05-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make all icons for fill and stroke use the proper classes/images | ||
| | | * | | | | | removed unused classes form selection properties reel | John Mayhew | 2012-05-08 |
| | | | | | | | | |||
| | | * | | | | | Moved out old select tool image css classes into the proper css file. | John Mayhew | 2012-05-08 |
| | | | | | | | | |||
| | | * | | | | | moved all tag tool css back into the scss file | John Mayhew | 2012-05-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added extra padding before first input control | ||
| | | * | | | | | -Removed id dependence of the tag tool options CSS | John Mayhew | 2012-05-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Separated the options3d CSS from the tag tool options css -Removed unused translateObjectToolContainer CSS class | ||
| | | * | | | | | Removed unused SubSelect Tool | John Mayhew | 2012-05-08 |
| | | | | | | | | |||
| | | * | | | | | Fixed missing quote from last merge | John Mayhew | 2012-05-07 |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-05-07 |
| | | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html | ||