| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal ↵ | Valerio Virgillito | 2012-02-29 |
| |\ | | | | | | | into integration-candidate | ||
| | * | SnapManager fixes for sag tags. | Nivesh Rajbhandari | 2012-02-29 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge pull request #85 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-02-29 |
| |\ \ | | | | | | | Brushtool | ||
| | * | | prevent extremely long path rendering (temporary fix) | Pushkar Joshi | 2012-02-29 |
| | | | | |||
| | * | | changed the registration point of the brush tool icon and | Pushkar Joshi | 2012-02-29 |
| | | | | | | | | | | | | | added a temporary check to prevent extremely long brush strokes | ||
| | * | | change in comment only | Pushkar Joshi | 2012-02-29 |
| | | | | |||
| | * | | resample the brush stroke so we don't have gaps if the path is drawn rapidly, | Pushkar Joshi | 2012-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 brushtool | Pushkar Joshi | 2012-02-28 |
| | |\ \ | |||
| | * \ \ | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-02-24 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js | ||
| | * | | | | render the brush stroke as a sequence of rectangles, with each rectangle ↵ | Pushkar Joshi | 2012-02-10 |
| | | | | | | | | | | | | | | | | | | | | | having its own linear gradient | ||
| | * | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-02-09 |
| | |\ \ \ \ | |||
| | * | | | | | first phase of simple resampling to prevent tiny segments | Pushkar Joshi | 2012-02-09 |
| | | | | | | | |||
| * | | | | | | Merge pull request #79 from pushkarjoshi/pentool | Valerio Virgillito | 2012-02-28 |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | Pentool | ||
| | * | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-28 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Conflicts: manifest.json | ||
| | * | | | | | new anchor control guide rendering (smaller handles) | Pushkar Joshi | 2012-02-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and clamp min. width and height to 1 while resizing subpaths | ||
| | * | | | | | Bug fixes: | Pushkar Joshi | 2012-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 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-28 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | integration | ||
| | * | | | | Reverting the export for publish property since its only used for testing. | Valerio Virgillito | 2012-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/FileIO | Jose Antonio Marquez Russo | 2012-02-24 |
| | |\ \ \ \ | | | | | | | | | | | | | FileIO branch pull request | ||
| | | * | | | | - added closeDocument event for timeline | Ananya Sen | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-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 Sen | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-24 |
| | |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | |||
| | * | | | | | | Merge pull request #17 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-02-23 |
| | |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Integration | ||
| | * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| | |\ \ \ \ \ \ | |||
| | * | | | | | | | renaming makeElementModel2 to makeModelFromElement | Valerio Virgillito | 2012-02-23 |
| | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-27 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | integration | ||
| | * | | | | | | Javascript does not evaluate a return with its expression in a new line. The ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-02-24 |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | Color fix for line shapes. | hwc487 | 2012-02-27 |
| | | | | | | | |||
| * | | | | | | Changed the hardcoded publish setting for a PI fix. | hwc487 | 2012-02-27 |
| | | | | | | | |||
| * | | | | | | Fixed various rendering bugs. | hwc487 | 2012-02-27 |
| | | | | | | | |||
| * | | | | | | bug fixes for canvas 2d shape drawing. | hwc487 | 2012-02-23 |
| | |_|/ / / |/| | | | | |||
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-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 | ||
| | * | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| | |\ \ \ \ | |||
| | | * | | | | Removing unused method that was using snapManager. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Integrating Zoom tool fixes. | Nivesh Rajbhandari | 2012-02-22 |
| | | |/ / / | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | PulseMaterial and RadialBlurMaterial had typos in their import code. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵ | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d. | ||
| | * | | | | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵ | Nivesh Rajbhandari | 2012-02-22 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | GL save and reload. | hwc487 | 2012-02-22 |
| | | | | | |||
| * | | | | Runtime classes | hwc487 | 2012-02-22 |
| | | | | | |||
| * | | | | Added all materials back in | hwc487 | 2012-02-22 |
| | | | | | |||
| * | | | | Adding all the shaders back in | hwc487 | 2012-02-22 |
| | | | | | |||
| * | | | | Adding bug fixes. | hwc487 | 2012-02-22 |
| |/ / / | |||
| * | | | Fixing the getStageWorldToGlobalMatrix bug | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | | | | | | | removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 |
| |\ \ \ | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html | ||
| | * \ \ | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-02-10 |
| | |\ \ \ | |||