| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-14 | |
| | |\ \ \ | ||||
| | * | | | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 | |
| | | | | | | ||||
| | * | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-03-13 | |
| | |\ \ \ \ | ||||
| | * | | | | | Add a smoothing amount parameter, and hide options based on checkboxes | Pushkar Joshi | 2012-03-13 | |
| | | | | | | | ||||
| * | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-16 | |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||
| | * | | | | | Merge pull request #34 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-15 | |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Integration | |||
| | | * | | | | Corrections for Uber shader IO | hwc487 | 2012-03-14 | |
| | | | | | | | ||||
| | | * | | | | Uber material changes for IO | hwc487 | 2012-03-12 | |
| | | | | | | | ||||
| * | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-14 | |
| |\| | | | | | ||||
| | * | | | | | Some code cleanup - removing unused assignments. | Valerio Virgillito | 2012-03-13 | |
| | | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-13 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js | |||
| | * | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-13 | |
| | |\ \ \ \ | | |_|/ / | |/| | | | ||||
| | | * | | | Merge pull request #110 from mqg734/WebGLFixes | Valerio Virgillito | 2012-03-13 | |
| | | |\ \ \ | | | | | | | | | | | | | Gradient Support for Shapes and Eyedropper support for gradients. Also fixed 3d bug when moving multiple selections in 3d using the Selection Tool | |||
| | | | * | | | Support import/export of gradient materials. This fixes the eyedropper not ↵ | Nivesh Rajbhandari | 2012-03-12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being able to sample gradient colors from WebGL shapes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | * | | | Fixing radial gradient for rectangle. | Nivesh Rajbhandari | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | * | | | Fixing radial gradients for line and circle. | Nivesh Rajbhandari | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | * | | | Eyedropper support for getting color value from webgl shapes. | Nivesh Rajbhandari | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | * | | | gradient support for canvas-2d shapes. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | * | | | Change linear gradient to go from left to right instead of top-left to ↵ | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bottom-right. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | * | | | Gradient support for canvas-2d rectangle. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | * | | | Fix for stroke and fill gradients not being retained when drawing multiple ↵ | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shapes and switching between them. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | | * | | | preliminary support for setting gradients on webgl shapes. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | |/ | | | |/| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | Merge pull request #108 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-13 | |
| | | |\ \ \ | | | |_|/ | | |/| | | Brushtool | |||
| | | * | | | Removing duplicate file | Jose Antonio Marquez | 2012-03-09 | |
| | | | | | | ||||
| | | * | | | Merge pull request #32 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 | |
| | | |\ \ \ | | | | | | | | | | | | | Added asset folder replacement to runtime load. | |||
| | | | * | | | Removed asset path replacement at authortime. | hwc487 | 2012-03-09 | |
| | | | | | | | ||||
| | | * | | | | Adding missing file for webGL, still need a fix for runtime | Jose Antonio Marquez | 2012-03-09 | |
| | | |/ / / | ||||
| | | * | | | Adding webGL I/O runtime functionality | Jose Antonio Marquez | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | | | There is a problem that needs to be resolved in the CanvasRuntime. | |||
| | | * | | | Canvas IO | hwc487 | 2012-03-08 | |
| | | | | | | ||||
| | | * | | | removed an unused parameter to CanvasDataManager | hwc487 | 2012-03-08 | |
| | | | | | | ||||
| | | * | | | Fix for runtime Radial blur material | hwc487 | 2012-03-08 | |
| | | | | | | ||||
| | | * | | | Fixed a few problems with Plasma material. | hwc487 | 2012-03-07 | |
| | | | | | | ||||
| | | * | | | File IO | hwc487 | 2012-03-07 | |
| | | | | | | ||||
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-06 | |
| | | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/preloader/Preloader.js | |||
| | | * | | | Create element models based on nodeName. | Nivesh Rajbhandari | 2012-03-06 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | turn off the fill color for pen tool paths by default | Pushkar Joshi | 2012-03-13 | |
| | | |_|/ | |/| | | ||||
| | * | | | seemingly working version of the calligraphic brush (seems to work with ↵ | Pushkar Joshi | 2012-03-12 | |
| | | | | | | | | | | | | | | | | | transparency and large stroke widths...seems to work better with smoothing) | |||
| | * | | | bug fixes for spline interpolation | Pushkar Joshi | 2012-03-12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AND Laplacian smoothing for denoising AND code cleanup (removing blocks of commented code) | |||
| | * | | | brush stroke options for calligraphic brush style | Pushkar Joshi | 2012-03-08 | |
| | | | | | ||||
| | * | | | implement stroke hardness such that it is percentage of the stroke width ↵ | Pushkar Joshi | 2012-03-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that's fully the color of the brush AND add a smoothing flag for the brush options | |||
| | * | | | merge Valerio's architecture changes | Pushkar Joshi | 2012-03-06 | |
| | | | | | ||||
| | * | | | merge Valerio's architecture changes into pen tool | Pushkar Joshi | 2012-03-06 | |
| | | |/ | |/| | ||||
| * | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-12 | |
| |\| | | | | | | | | | | | | | | Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | |||
| | * | | Squashed commit of preload-fix into Master | Valerio Virgillito | 2012-03-06 | |
| | |/ | | | | | | | | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-02-29 | |
| |\| | | | | | | | | | Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | |||
| | * | renaming makeElementModel2 to makeModelFromElement | Valerio Virgillito | 2012-02-23 | |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | CSS Panel Update | Eric Guzman | 2012-02-22 | |
| |/ | ||||
| * | Support for data attributes and adding a random string generator | Valerio Virgillito | 2012-02-16 | |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 | |
| |\ | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html | |||
| | * | deleted old utils file and move single method into NJUtils | Valerio Virgillito | 2012-02-09 | |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||