Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | - added flag for timeline to identify new file flow | Jonathan Duran | 2012-02-24 | |
| * | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-02-24 | |
| |\| | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | Merge pull request #67 from ntfx47/PullRequest-Timeline | Valerio Virgillito | 2012-02-23 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | Timeline : Fix for the split and element model error | Kruti Shah | 2012-02-23 | |
| * | | | | | | | | | | | Merge pull request #65 from mqg734/NiveshColor | Valerio Virgillito | 2012-02-23 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | Fix to read back colors when re-opening files. | Nivesh Rajbhandari | 2012-02-23 | |
| * | | | | | | | | | | | Fixing app mode check. | Valerio Virgillito | 2012-02-23 | |
| * | | | | | | | | | | | fixing the tools shortcuts - IKNINJA 1199 | Valerio Virgillito | 2012-02-23 | |
| |/ / / / / / / / / / | ||||
* | | / / / / / / / / | Timeline: Add hottext fields to layers and serialize them throughout. | Jon Reid | 2012-02-23 | |
| |_|/ / / / / / / / |/| | | | | | | | | | ||||
* | | | | | | | | | | add back layer selection | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | Remove unneeded selection code | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | Move element selection to click handler | Jonathan Duran | 2012-02-23 | |
|/ / / / / / / / / | ||||
* / / / / / / / / | Remove selection calls from timelinepanel.js | Jonathan Duran | 2012-02-23 | |
|/ / / / / / / / | ||||
* | | | | | | | | Fix for tween repetition arrays getting overwritten on file open | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | Timeline: Reopen Doc Restore TimeLine | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | New Doc | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | Timeline Track Open doc | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | Timeline:Open Doc in TimelinePanel.js | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | Timeline: Create new PropertyTrack subcomponent, and use it in the TimelineTr... | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | Unterminated lines | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | Redo timeline resize code | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | Timeline Reset to clean Master branch. Code scrub. | Jonathan Duran | 2012-02-23 | |
| |_|_|/ / / / |/| | | | | | | ||||
* | | | | | | | Fixing the breadcrumb button - removing toolbutton class since it is not a to... | Valerio Virgillito | 2012-02-23 | |
* | | | | | | | Updating textfield to only use nj-skinned class and updating input-group to c... | Nivesh Rajbhandari | 2012-02-22 | |
* | | | | | | | Adding back the local storage check in the cloudpopup. | Nivesh Rajbhandari | 2012-02-22 | |
* | | | | | | | Buttons in the rectangle properties in the tools options need to float left. | Nivesh Rajbhandari | 2012-02-22 | |
* | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||
| * | | | | | | Merge branch 'refs/heads/master' into new-tool-icons | Armen Kesablyan | 2012-02-22 | |
| |\ \ \ \ \ \ | ||||
| | * | | | | | | Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ex... | John Mayhew | 2012-02-22 | |
| | |/ / / / / | ||||
| * | | | | | | Tool Button Fixes | Armen Kesablyan | 2012-02-16 | |
| * | | | | | | New Icons: Last set had imperfections | Armen Kesablyan | 2012-02-15 | |
| * | | | | | | Tool Icons : New layout | Armen Kesablyan | 2012-02-15 | |
* | | | | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 | |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | Removing unused method that was using snapManager. | Nivesh Rajbhandari | 2012-02-22 | |
| * | | | | | | | Integrating Zoom tool fixes. | Nivesh Rajbhandari | 2012-02-22 | |
| | |_|_|_|_|/ | |/| | | | | | ||||
| * | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-22 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||
| * | | | | | | Fixing eyedropper tool to get color from image data. This required us to work... | Nivesh Rajbhandari | 2012-02-22 | |
| * | | | | | | Some more tweaks to not being able to select elements in top/side view. | Nivesh Rajbhandari | 2012-02-20 | |
* | | | | | | | PulseMaterial and RadialBlurMaterial had typos in their import code. | Nivesh Rajbhandari | 2012-02-22 | |
* | | | | | | | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials. | Nivesh Rajbhandari | 2012-02-22 | |
* | | | | | | | Do not use color object for stage's border since we don't allow users to modi... | Nivesh Rajbhandari | 2012-02-22 | |
* | | | | | | | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ... | Nivesh Rajbhandari | 2012-02-22 | |
* | | | | | | | Color chips expect a color object, not a css value. | Nivesh Rajbhandari | 2012-02-22 | |
* | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||
| * | | | | | | user document main reel listener moved to the html-document class. | Valerio Virgillito | 2012-02-21 | |
| * | | | | | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal i... | Valerio Virgillito | 2012-02-21 | |
| |\ \ \ \ \ \ | ||||
| | * | | | | | | enabling nested selection | Valerio Virgillito | 2012-02-20 | |
| | * | | | | | | formatting and removing un-used code from the stage | Valerio Virgillito | 2012-02-20 |