aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* PI for pen and brush strokesPushkar Joshi2012-03-14
|
* Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
|\
| * 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>
| | | * Fixed element mediator, PI, and eye-dropper to handle different borders ↵Nivesh Rajbhandari2012-03-12
| | | | | | | | | | | | | | | | | | | | | | | | sides and gradients. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * Adding gradientMode value in defaultGradient object.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
| | | |\ | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Fixing selection tool when moving multiple selection in 3d mode.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | 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>
| | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
| | | |\ \
| | | * | | Eyedropper support for getting color value from webgl shapes.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-08
| | | |\ \ \
| | | * | | | Eyedropper now supports strokes in rectangle shapes.Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-07
| | | |\ \ \ \
| | | * | | | | 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 branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-06
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-06
| | | |\ \ \ \ \ \
| | | * | | | | | | Create drag plane parallel to working plane and offset by where the user ↵Nivesh Rajbhandari2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clicked in z. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | Do not use transform code if transform mode is off.Nivesh Rajbhandari2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | We should show snap marker on mouse move even if user hasn't moused down yet.Nivesh Rajbhandari2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | Merge pull request #108 from pushkarjoshi/brushtoolValerio Virgillito2012-03-13
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Brushtool
| | * \ \ \ \ \ \ \ \ Merge pull request #105 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-13
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | File I/O adding webGL/canvas data functionality
| | | * | | | | | | | | Cleaning up webGL runtimeJose Antonio Marquez2012-03-13
| | | | | | | | | | | |
| | | * | | | | | | | | Clean up and TODOsJose Antonio Marquez2012-03-12
| | | | | | | | | | | |
| | | * | | | | | | | | Add temp delay for webGL previewJose Antonio Marquez2012-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a padded launch webGL preview delay. This is very temporary, just a work around until RDGE issues are fixed.
| | | * | | | | | | | | Temp Runtime WebGL FixJose Antonio Marquez2012-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a temporary fix to allow for webGL runtime functionality. Copying the desired folder name into a static name. There is a lag in doing this, so obviously now ideal. Need to discuss adding dynamic path-ing during author and runtime.
| | | * | | | | | | | | Setting local path to assetsJose Antonio Marquez2012-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is still no resolving issues with webGL runtime.
| | | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixing Issues for Windows LibJose Antonio Marquez2012-03-09
| | | | | | | | | | | | |
| | | * | | | | | | | | | Merge pull request #33 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integration
| | | | * | | | | | | | | | remap hard coded strings in rdge internal code.hwc4872012-03-09
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal ↵hwc4872012-03-09
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into integration Conflicts: js/document/html-document.js
| | | | * | | | | | | | | | | further removal of authortime asset path replacement.hwc4872012-03-09
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Removing duplicate fileJose Antonio Marquez2012-03-09
| | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |