aboutsummaryrefslogtreecommitdiff
path: root/js/lib
Commit message (Collapse)AuthorAge
...
| * | | Merge branch 'master' into pentoolPushkar Joshi2012-03-14
| |\ \ \
| * | | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | | | |
| * | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
| |\ \ \ \
| * | | | | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
| | | | | |
* | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-16
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #34 from ericmueller/integrationJose Antonio Marquez Russo2012-03-15
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Integration
| | * | | | Corrections for Uber shader IOhwc4872012-03-14
| | | | | |
| | * | | | Uber material changes for IOhwc4872012-03-12
| | | | | |
* | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-14
|\| | | | |
| * | | | | Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-13
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js
| * | | | Merge branch 'master' into pentoolPushkar Joshi2012-03-13
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge pull request #110 from mqg734/WebGLFixesValerio Virgillito2012-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 Rajbhandari2012-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 Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Fixing radial gradients for line and circle.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Eyedropper support for getting color value from webgl shapes.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | gradient support for canvas-2d shapes.Nivesh Rajbhandari2012-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 Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bottom-right. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Gradient support for canvas-2d rectangle.Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Fix for stroke and fill gradients not being retained when drawing multiple ↵Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shapes and switching between them. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | preliminary support for setting gradients on webgl shapes.Nivesh Rajbhandari2012-03-07
| | | | |/ | | | |/| | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge pull request #108 from pushkarjoshi/brushtoolValerio Virgillito2012-03-13
| | |\ \ \ | | | |_|/ | | |/| | Brushtool
| | * | | Removing duplicate fileJose Antonio Marquez2012-03-09
| | | | |
| | * | | Merge pull request #32 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
| | |\ \ \ | | | | | | | | | | | | Added asset folder replacement to runtime load.
| | | * | | Removed asset path replacement at authortime.hwc4872012-03-09
| | | | | |
| | * | | | Adding missing file for webGL, still need a fix for runtimeJose Antonio Marquez2012-03-09
| | |/ / /
| | * | | Adding webGL I/O runtime functionalityJose Antonio Marquez2012-03-09
| | | | | | | | | | | | | | | | | | | | There is a problem that needs to be resolved in the CanvasRuntime.
| | * | | Canvas IOhwc4872012-03-08
| | | | |
| | * | | removed an unused parameter to CanvasDataManagerhwc4872012-03-08
| | | | |
| | * | | Fix for runtime Radial blur materialhwc4872012-03-08
| | | | |
| | * | | Fixed a few problems with Plasma material.hwc4872012-03-07
| | | | |
| | * | | File IOhwc4872012-03-07
| | | | |
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-06
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/preloader/Preloader.js
| | * | | Create element models based on nodeName.Nivesh Rajbhandari2012-03-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | turn off the fill color for pen tool paths by defaultPushkar Joshi2012-03-13
| | |_|/ | |/| |
| * | | seemingly working version of the calligraphic brush (seems to work with ↵Pushkar Joshi2012-03-12
| | | | | | | | | | | | | | | | transparency and large stroke widths...seems to work better with smoothing)
| * | | bug fixes for spline interpolationPushkar Joshi2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AND Laplacian smoothing for denoising AND code cleanup (removing blocks of commented code)
| * | | brush stroke options for calligraphic brush stylePushkar Joshi2012-03-08
| | | |
| * | | implement stroke hardness such that it is percentage of the stroke width ↵Pushkar Joshi2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | that's fully the color of the brush AND add a smoothing flag for the brush options
| * | | merge Valerio's architecture changesPushkar Joshi2012-03-06
| | | |
| * | | merge Valerio's architecture changes into pen toolPushkar Joshi2012-03-06
| | |/ | |/|
* | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-03-12
|\| | | | | | | | | | | | | | Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
| * | Squashed commit of preload-fix into MasterValerio Virgillito2012-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 CSSPanelUpdatesEric Guzman2012-02-29
|\| | | | | | | | | Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
| * renaming makeElementModel2 to makeModelFromElementValerio Virgillito2012-02-23
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | CSS Panel UpdateEric Guzman2012-02-22
|/
* Support for data attributes and adding a random string generatorValerio Virgillito2012-02-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
|\ | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * deleted old utils file and move single method into NJUtilsValerio Virgillito2012-02-09
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>