aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | * Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| | | |\
| | | | * Removing unused method that was using snapManager.Nivesh Rajbhandari2012-02-22
| | | | * Integrating Zoom tool fixes.Nivesh Rajbhandari2012-02-22
| | | | * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
| | | | |\ | | |_|_|/ | |/| | |
| | | | * Fixing eyedropper tool to get color from image data. This required us to work...Nivesh Rajbhandari2012-02-22
| | | | * Some more tweaks to not being able to select elements in top/side view.Nivesh Rajbhandari2012-02-20
| | | * | PulseMaterial and RadialBlurMaterial had typos in their import code.Nivesh Rajbhandari2012-02-22
| | | * | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
| | | * | Do not use color object for stage's border since we don't allow users to modi...Nivesh Rajbhandari2012-02-22
| | | * | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ...Nivesh Rajbhandari2012-02-22
| | | * | Color chips expect a color object, not a css value.Nivesh Rajbhandari2012-02-22
| | | * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| | | |\ \ | | |_|/ / | |/| | |
| | | * | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ma...Nivesh Rajbhandari2012-02-22
| | | * | Updated Materials Library and Materials Editor Popup to work with latest vers...mqg7342012-02-21
| | | |/
| | | * Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| | | |\
| | | * | Fix for not being able to select an element in Top/Side view.Nivesh Rajbhandari2012-02-14
| | | * | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| | | |\ \
| | | * | | Get color under mouse point from image or canvas.Nivesh Rajbhandari2012-02-14
| | | * | | Get color from canvas and images.Nivesh Rajbhandari2012-02-14
| | | * | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| | | |\ \ \
| | | * | | | Check if eyedropper is over border or background.Nivesh Rajbhandari2012-02-13
| | | * | | | Fixed issue with tools not drawing their handles when mousing up.Nivesh Rajbhandari2012-02-13
| | | * | | | Working around inconsistent color object when getting/setting WebGL values.Nivesh Rajbhandari2012-02-13
| | | * | | | Fixed eyedropper tool to use new color routines.Nivesh Rajbhandari2012-02-13
| | | * | | | Updated ink bottle tool to use new setColor routine in the mediator and contr...Nivesh Rajbhandari2012-02-13
* | | | | | | local storage integration and versioningValerio Virgillito2012-02-22
|/ / / / / /
* | | | | | user document main reel listener moved to the html-document class.Valerio Virgillito2012-02-21
* | | | | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i...Valerio Virgillito2012-02-21
|\ \ \ \ \ \
| * | | | | | enabling nested selectionValerio Virgillito2012-02-20
| * | | | | | formatting and removing un-used code from the stageValerio Virgillito2012-02-20
| * | | | | | cleanupValerio Virgillito2012-02-20
| * | | | | | Removing the log of the url requestsValerio Virgillito2012-02-20
| * | | | | | Removing the timeline selection code.Valerio Virgillito2012-02-20
| * | | | | | Merge branch 'refs/heads/master' into nested-selectionValerio Virgillito2012-02-20
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nested-selection' of github.com:mencio/ninja-internal into nest...Valerio Virgillito2012-02-20
| |\ \ \ \ \ \ \
| | * | | | | | | formatting cleanupValerio Virgillito2012-02-20
| * | | | | | | | formatting cleanupValerio Virgillito2012-02-20
| |/ / / / / / /
| * | | | | | | cleanup of the breadcrumbValerio Virgillito2012-02-20
* | | | | | | | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
* | | | | | | | Merge pull request #13 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-21
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "check cloud availability before open file picker and new file dialogs"Ananya Sen2012-02-21
| * | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-20
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #11 from ericguzman/StylesControllerUpdatesJose Antonio Marquez Russo2012-02-20
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-20
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #57 from joseeight/CloudFixValerio Virgillito2012-02-20
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Cloud URL localStorage FixJose Antonio Marquez2012-02-20
| | |/ / / / / / /
| * | | | | | | | Merge branch 'StylesControllerUpdates' of github.com:ericguzman/ninja-interna...Eric Guzman2012-02-20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Styles controller - Check for element's window object before querying for mat...Eric Guzman2012-02-20
| | |/ / / / / / /
| * / / / / / / / Styles Controller -Fix invalid variable reference when looking for element's ...Eric Guzman2012-02-20
| |/ / / / / / /
* | | | | | | | Clean up and repairing manifestJose Antonio Marquez2012-02-19