aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge pull request #108 from pushkarjoshi/brushtoolValerio Virgillito2012-03-13
|\ | | | | Brushtool
| * 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 branch 'pentool' into brushtoolPushkar Joshi2012-03-06
| |\
| | * merge Valerio's architecture changes into pen toolPushkar Joshi2012-03-06
| | |
| | * Merge branch 'master' into pentoolPushkar Joshi2012-03-06
| | |\
| | * \ Merge branch 'master' into pentoolPushkar Joshi2012-03-05
| | |\ \
| | * \ \ Merge branch 'brushtool' into pentoolPushkar Joshi2012-03-02
| | |\ \ \
| | * | | | show feedback on mouseover on a part of the path where a new anchor will be ↵Pushkar Joshi2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | added if clicked
| * | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-06
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | draw brush stroke as concentric paths overlaid on top of each other...allows ↵Pushkar Joshi2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | us to simulate softness for circular brushes
| * | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-05
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-02
| |\ \ \ \
| * | | | | 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)
* | | | | 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
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Clean upJose 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.
| * | | | | | | Merge branch 'refs/heads/integration' into FileIO-IntegrationJose Antonio Marquez2012-03-09
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js
| | * | | | | | | Canvas IOhwc4872012-03-08
| | | | | | | | |
| * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-08
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js
| * \ \ \ \ \ \ \ \ Merge pull request #30 from ananyasen/FileIO-ananyaJose Antonio Marquez Russo2012-03-08
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | FileIO branch pull request
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-08
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | null the arrays on all documents closed, so that they get garbage collectedAnanya Sen2012-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | minor fixesAnanya Sen2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | added close file menu itemAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-06
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | | removed unnecessary console logsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-06
| | |