aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\
| * Fixing app mode check.Valerio Virgillito2012-02-23
| * fixing the tools shortcuts - IKNINJA 1199Valerio Virgillito2012-02-23
| * Merge pull request #64 from imix23ways/TimelineValerio Virgillito2012-02-23
| |\
| | * Remove selection calls from timelinepanel.jsJonathan Duran2012-02-23
| | * Fix for tween repetition arrays getting overwritten on file openJonathan Duran2012-02-23
| | * Timeline: Reopen Doc Restore TimeLineJonathan Duran2012-02-23
| | * New DocJonathan Duran2012-02-23
| | * Timeline Track Open docJonathan Duran2012-02-23
| | * Timeline:Open Doc in TimelinePanel.jsJonathan Duran2012-02-23
| | * Timeline: Create new PropertyTrack subcomponent, and use it in the TimelineTr...Jonathan Duran2012-02-23
| | * Unterminated linesJonathan Duran2012-02-23
| | * Redo timeline resize codeJonathan Duran2012-02-23
| | * Timeline Reset to clean Master branch. Code scrub.Jonathan Duran2012-02-23
| |/
* | Fixing document mode checkJose Antonio Marquez2012-02-23
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\|
| * Fixing the breadcrumb button - removing toolbutton class since it is not a to...Valerio Virgillito2012-02-23
| * Merge pull request #60 from mqg734/WebGLMaterialsValerio Virgillito2012-02-23
| |\
| | * Updating textfield to only use nj-skinned class and updating input-group to c...Nivesh Rajbhandari2012-02-22
| | * Adding back the local storage check in the cloudpopup.Nivesh Rajbhandari2012-02-22
| | * Buttons in the rectangle properties in the tools options need to float left.Nivesh Rajbhandari2012-02-22
| | * Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| | |\ | | |/ | |/|
| | * 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
* | | | | | | Adding url clean up to HTML on saveJose Antonio Marquez2012-02-23
* | | | | | | Merge pull request #18 from mencio/file-ioJose Antonio Marquez Russo2012-02-23
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FileIO' of github.com:joseeight/ninja-internal into file-ioValerio Virgillito2012-02-23
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |