| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-28 |
| |\ | |||
| | * | Merge branch 'refs/heads/integration-candidate' | Valerio Virgillito | 2012-02-28 |
| | |\ | |||
| | | * | Fix for double clicking in the resizer | Valerio Virgillito | 2012-02-27 |
| | | * | Merge branch 'refs/heads/integration-candidate' into Timeline | Jonathan Duran | 2012-02-27 |
| | | |\ | |||
| | | | * | Reverting the export for publish property since its only used for testing. | Valerio Virgillito | 2012-02-27 |
| | | * | | Timeline : Reopening Doc has layer 1 default fix | Jonathan Duran | 2012-02-27 |
| | | * | | Timeline: RetrieveStoredTweens calling fixed | Jonathan Duran | 2012-02-27 |
| | | * | | Merge branch 'refs/heads/integration-candidate' into Timeline | Jonathan Duran | 2012-02-27 |
| | | |\| | |||
| | | | * | Merge branch 'local-storage-version' of https://github.com/mencio/ninja-inter... | Valerio Virgillito | 2012-02-27 |
| | | | |\ | |||
| | | | | * | removing the old settings class and disabling panel settings until the new pa... | Valerio Virgillito | 2012-02-24 |
| | | | | * | clearing the old local setting and using the new version/prefix local settings. | Valerio Virgillito | 2012-02-24 |
| | | | | * | prefixing the local storage and using the new local-storage object. | Valerio Virgillito | 2012-02-24 |
| | | | | * | fixing the right panel disappearing when collapsed and re-enabled | Valerio Virgillito | 2012-02-24 |
| | | | | * | Merge branch 'refs/heads/master' into local-storage-version | Valerio Virgillito | 2012-02-24 |
| | | | | |\ | |||
| | | | | * \ | Merge branch 'refs/heads/master' into local-storage-version | Valerio Virgillito | 2012-02-23 |
| | | | | |\ \ | |||
| | | | | * | | | local storage integration and versioning | Valerio Virgillito | 2012-02-22 |
| | | | * | | | | Merge branch 'FileIO-Build-Candidate' of https://github.com/joseeight/ninja-i... | Valerio Virgillito | 2012-02-27 |
| | | | |\ \ \ \ | |||
| | | | | * \ \ \ | Merge pull request #20 from joseeight/FileIO | Jose Antonio Marquez Russo | 2012-02-26 |
| | | | | |\ \ \ \ | |||
| | | | * | \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-24 |
| | | | |\ \ \ \ \ \ | |||
| | | | * | | | | | | | Moved all color updating routines to a single function. | Nivesh Rajbhandari | 2012-02-24 |
| | | | * | | | | | | | Distinguish between border top/right/bottom/left colors. Also, fall back to s... | Nivesh Rajbhandari | 2012-02-24 |
| | | | * | | | | | | | Adjusting fill and ink bottle cursors to match the tips of the icons. | Nivesh Rajbhandari | 2012-02-24 |
| | | * | | | | | | | | Timeline : Selection Fix | Jonathan Duran | 2012-02-27 |
| | | * | | | | | | | | Timeline: Order of tweens and corresponding layers taken care over | Jonathan Duran | 2012-02-25 |
| | | * | | | | | | | | Timeline : Adding Tweens Properties | Jonathan Duran | 2012-02-25 |
| | | * | | | | | | | | Merge branch 'refs/heads/Timeline-local' into Timeline | Jonathan Duran | 2012-02-25 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | Timeline: Add grids to property tracks. First take on clearTimeline method on... | Jon Reid | 2012-02-24 |
| | | | * | | | | | | | | Timeline: Bug fixes: Delete corresponding track when a style is deleted from ... | Jon Reid | 2012-02-24 |
| | | | * | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-24 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | |||
| | | | * | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-24 |
| | | | |\ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-24 |
| | | | |\ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-23 |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | |||
| | | | * | | | | | | | | | | Timeline: Add hottext fields to layers and serialize them throughout. | Jon Reid | 2012-02-23 |
| | | * | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-02-25 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | / / / / / / | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||
| | | * | | | | | | | | | | - 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 |
| | | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | / / / / / / | | | | |/ / / / / / | | | |/| | | | | | | |||
| | | * | | | | | | | | 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 |
| * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-27 |
| |\| | | | | | | | | | |||
| | * | | | | | | | | | adding the template-creator class | Valerio Virgillito | 2012-02-27 |
| | | |_|/ / / / / / | |/| | | | | | | | |||
| * | | | | | | | | | Updating legal copy | Jose Antonio Marquez | 2012-02-27 |
| * | | | | | | | | | Updating credits | Jose Antonio Marquez | 2012-02-27 |
| * | | | | | | | | | Merge pull request #21 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-27 |
| |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-27 |
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||
| * | | | | | | | | | | Cleaning up pretty functions in IO | Jose Antonio Marquez | 2012-02-27 |
| * | | | | | | | | | | Cleaning up and adding TODOs | Jose Antonio Marquez | 2012-02-26 |
| | |_|_|_|_|_|/ / / |/| | | | | | | | | |||
| * | | | | | | | | | Cleaning up formatting for webGL data | Jose Antonio Marquez | 2012-02-26 |
| * | | | | | | | | | Fixed issue with losing track of Ninja template css | Jose Antonio Marquez | 2012-02-26 |
| * | | | | | | | | | Cleaning up comments for external styles loading | Jose Antonio Marquez | 2012-02-25 |