aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | | | | | | | | | | | | | | | | | | | | | * Timeline: Fixing the animated ElementKruti Shah2012-04-12
| | | | | | | | | | | | | | | | | | | | | | | * Timeline : Replace Element Taken Care ofKruti Shah2012-04-12
| | | | | | | | | | | | | | | | | | | | | | | * Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-12
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-11
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * | Timeline: Change Master Layer configuration menu to be on click; bug fix:Jon Reid2012-04-11
| | | | | | | | | | | | | | | | | | | | | | | * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-12
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #161 from mqg734/PerspectiveFixValerio Virgillito2012-04-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Single perspective fix.Nivesh Rajbhandari2012-04-09
| | | | | | | | | | | | | | | | | | | | | | | * | | Merge branch 'refs/heads/timeline-kruti-local' into TimelineUberJonathan Duran2012-04-12
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | |_|/ | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | * | Timeline:Changing function nameKruti Shah2012-04-12
| | | | | | | | | | | | | | | | | | | | | | | * | | More Absolute vs Relative changes and cleanupJonathan Duran2012-04-11
| | | | | | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | * | Timeline: Bug fix: Drag and Drop now working again.Jon Reid2012-04-10
| | | | | | | | | | | | | | | | | | | | | | | * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-10
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * | Abs. vs. Rel. animation postion functionsJonathan Duran2012-04-10
| | | | | | | | | | | | | | | | | | | | | | | | * | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-10
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-10
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | / | | | | | | | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | |/|
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Grow/shrink Line, Oval and Rectangles when changing stroke size.Nivesh Rajbhandari2012-04-06
| * | | | | | | | | | | | | | | | | | | | | | | | | -webkit-transform-style needs to be set to preserve-3d for shapes regardless ...Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix for line tool not working because PI requests fill color for line as well...Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Updated canvas-runtime.js to support gradients for rectangle and oval in canv...Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ca...Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Fixing 3d tool reset to redraw handles.Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Adding back fix in mediator to not set 3d styles unless necessary.Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Undoing bad auto-merge resize-composer.js.Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Fixing curly brackets from auto-merge.Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Changing .default to ["default"] to avoid WebStorm errors.Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Undoing some minor spacing differences from auto-merge.Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Undoing mistakes from auto-merge.Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Removing unnecessary code element = element.Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Commenting out console logs.Nivesh Rajbhandari2012-04-05
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | We should require VecUtils instead of referring to the global reference since...Nivesh Rajbhandari2012-04-04
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/EricSnapping' into WebGLFileIONivesh Rajbhandari2012-04-04
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_