aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-24
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-24
| |\
| | * Marking inkbottle as the final tool in the set.Nivesh Rajbhandari2012-02-24
| | * Adding back Ink Bottle tool in the tool bar so QE can test ink bottle functio...Nivesh Rajbhandari2012-02-24
| | * Javascript does not evaluate a return with its expression in a new line. The ...Nivesh Rajbhandari2012-02-24
| | * Removing duplicate get/setElementPlanes method.Nivesh Rajbhandari2012-02-24
| * | Adding some missing copyrightsValerio Virgillito2012-02-24
| |/
* | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-24
|\ \
| * | - added flag for timeline to identify new file flowJonathan Duran2012-02-24
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-24
| |\|
* | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-23
|\ \ \ | | |/ | |/|
| * | Merge pull request #67 from ntfx47/PullRequest-TimelineValerio Virgillito2012-02-23
| |\ \
| | * | Timeline : Fix for the split and element model errorKruti Shah2012-02-23
| * | | Merge pull request #65 from mqg734/NiveshColorValerio Virgillito2012-02-23
| |\ \ \
| | * | | Fix to read back colors when re-opening files.Nivesh Rajbhandari2012-02-23
| * | | | Fixing app mode check.Valerio Virgillito2012-02-23
| * | | | fixing the tools shortcuts - IKNINJA 1199Valerio Virgillito2012-02-23
| |/ / /
* | | / Timeline: Add hottext fields to layers and serialize them throughout.Jon Reid2012-02-23
| |_|/ |/| |
* | | add back layer selectionJonathan Duran2012-02-23
* | | Remove unneeded selection codeJonathan Duran2012-02-23
* | | Move element selection to click handlerJonathan Duran2012-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 the breadcrumb button - removing toolbutton class since it is not a to...Valerio 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/master' into new-tool-iconsArmen Kesablyan2012-02-22
| |\
| | * Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ex...John Mayhew2012-02-22
| * | Tool Button FixesArmen Kesablyan2012-02-16
| * | New Icons: Last set had imperfectionsArmen Kesablyan2012-02-15
| * | Tool Icons : New layoutArmen Kesablyan2012-02-15
* | | 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