aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes
Commit message (Collapse)AuthorAge
* Merge branch 'master' into brushtoolPushkar Joshi2012-03-05
|\
| * Fix for jumping issue when moving items that have any 3d on them.Nivesh Rajbhandari2012-03-02
| | | | | | | | | | | | We can't translate 3d moves into 2d space due to perspective, so we must update the matrix3d values instead of the top-left values if items have 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Fix for elements flying off into space when moving elements that overlap.Nivesh Rajbhandari2012-03-01
| | | | | | | | | | | | This was happening because our hit record's element and the browser's element from point did not match. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'master' into brushtoolPushkar Joshi2012-03-02
|\|
| * Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal ↵Valerio Virgillito2012-02-29
| |\ | | | | | | | | | into integration-candidate
| | * SnapManager fixes for sag tags.Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #85 from pushkarjoshi/brushtoolValerio Virgillito2012-02-29
| |\ \ | | | | | | | | Brushtool
| * \ \ Merge pull request #79 from pushkarjoshi/pentoolValerio Virgillito2012-02-28
| |\ \ \ | | | | | | | | | | Pentool
| * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-28
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | integration
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | integration
| * | | | | Color fix for line shapes.hwc4872012-02-27
| | | | | |
| * | | | | Changed the hardcoded publish setting for a PI fix.hwc4872012-02-27
| | | | | |
| * | | | | Fixed various rendering bugs.hwc4872012-02-27
| | | | | |
| * | | | | bug fixes for canvas 2d shape drawing.hwc4872012-02-23
| | | | | |
* | | | | | Catmull-Rom spline sampling for the brush stroke, and options for stroke ↵Pushkar Joshi2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | size, stroke hardness and both stroke colors (left and right --- temporarily using the stroke and fill colors respectively)
* | | | | | first attempt at rendering the brush stroke as a collection of polylines ↵Pushkar Joshi2012-03-01
| |_|_|_|/ |/| | | | | | | | | | | | | | (number of polylines equals the stroke width)
* | | | | prevent extremely long path rendering (temporary fix)Pushkar Joshi2012-02-29
| | | | |
* | | | | changed the registration point of the brush tool icon andPushkar Joshi2012-02-29
| | | | | | | | | | | | | | | | | | | | added a temporary check to prevent extremely long brush strokes
* | | | | change in comment onlyPushkar Joshi2012-02-29
| | | | |
* | | | | resample the brush stroke so we don't have gaps if the path is drawn rapidly,Pushkar Joshi2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and, allow to change the stroke color, and, more efficient stroke rendering by drawing translated radial gradients (instead of creating new gradients for each stroke sample)
* | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-28
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-28
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: manifest.json
| | * | | Reverting the export for publish property since its only used for testing.Valerio Virgillito2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the enable webGL in the PI for shapes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge pull request #19 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-24
| | |\ \ \ | | | | | | | | | | | | FileIO branch pull request
| | | * | | - added closeDocument event for timelineAnanya Sen2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| | | |\ \ \
| | | * \ \ \ Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | switch html document - re-initialize draw-utils and snap-manager on opening ↵Ananya Sen2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge pull request #17 from ericmueller/integrationJose Antonio Marquez Russo2012-02-23
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| | Integration
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-23
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/preloader/Preloader.js
| | | * | | | GL save and reload.hwc4872012-02-22
| | | | | | |
| | | * | | | Runtime classeshwc4872012-02-22
| | | | | | |
| | | * | | | Added all materials back inhwc4872012-02-22
| | | | | | |
| | | * | | | Adding all the shaders back inhwc4872012-02-22
| | | | | | |
| | | * | | | Adding bug fixes.hwc4872012-02-22
| | | | |_|/ | | | |/| |
| | * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | renaming makeElementModel2 to makeModelFromElementValerio Virgillito2012-02-23
| | | |/ / | | |/| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | new anchor control guide rendering (smaller handles)Pushkar Joshi2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | and clamp min. width and height to 1 while resizing subpaths
| * | | | Bug fixes:Pushkar Joshi2012-02-28
| | |_|/ | |/| | | | | | | | | | | | | | | | | | 1152: allow deleting of multiple paths from inside pen tool 1128: keyboard hotkey shortcut 'P' for pen tool 941: changing width or height of the path scales the path
* | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-24
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
| * | | Javascript does not evaluate a return with its expression in a new line. The ↵Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | return expression must begin on the same line as the return keyword. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Removing duplicate get/setElementPlanes method.Nivesh Rajbhandari2012-02-24
| | |/ | |/| | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \
| | * | Removing unused method that was using snapManager.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Integrating Zoom tool fixes.Nivesh Rajbhandari2012-02-22
| | |/ | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | PulseMaterial and RadialBlurMaterial had typos in their import code.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
| * | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵Nivesh Rajbhandari2012-02-22
| |/ | | | | | | | | | | materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>