aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-28
|\
| * Merge branch 'refs/heads/integration-candidate'Valerio Virgillito2012-02-28
| |\
| | * Fix for double clicking in the resizerValerio Virgillito2012-02-27
| | * Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-27
| | |\
| | | * Reverting the export for publish property since its only used for testing.Valerio Virgillito2012-02-27
| | * | Timeline : Reopening Doc has layer 1 default fixJonathan Duran2012-02-27
| | * | Timeline: RetrieveStoredTweens calling fixedJonathan Duran2012-02-27
| | * | Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-27
| | |\|
| | | * Merge branch 'local-storage-version' of https://github.com/mencio/ninja-inter...Valerio Virgillito2012-02-27
| | | |\
| | | | * removing the old settings class and disabling panel settings until the new pa...Valerio Virgillito2012-02-24
| | | | * clearing the old local setting and using the new version/prefix local settings.Valerio Virgillito2012-02-24
| | | | * prefixing the local storage and using the new local-storage object.Valerio Virgillito2012-02-24
| | | | * fixing the right panel disappearing when collapsed and re-enabledValerio Virgillito2012-02-24
| | | | * Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-24
| | | | |\
| | | | * \ Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
| | | | |\ \
| | | | * | | local storage integration and versioningValerio Virgillito2012-02-22
| | | * | | | Merge branch 'FileIO-Build-Candidate' of https://github.com/joseeight/ninja-i...Valerio Virgillito2012-02-27
| | | |\ \ \ \
| | | | * \ \ \ Merge pull request #20 from joseeight/FileIOJose Antonio Marquez Russo2012-02-26
| | | | |\ \ \ \
| | | * | \ \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-24
| | | |\ \ \ \ \ \
| | | * | | | | | | Moved all color updating routines to a single function.Nivesh Rajbhandari2012-02-24
| | | * | | | | | | Distinguish between border top/right/bottom/left colors. Also, fall back to s...Nivesh Rajbhandari2012-02-24
| | | * | | | | | | Adjusting fill and ink bottle cursors to match the tips of the icons.Nivesh Rajbhandari2012-02-24
| | * | | | | | | | Timeline : Selection FixJonathan Duran2012-02-27
| | * | | | | | | | Timeline: Order of tweens and corresponding layers taken care overJonathan Duran2012-02-25
| | * | | | | | | | Timeline : Adding Tweens PropertiesJonathan Duran2012-02-25
| | * | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineJonathan Duran2012-02-25
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Timeline: Add grids to property tracks. First take on clearTimeline method on...Jon Reid2012-02-24
| | | * | | | | | | | Timeline: Bug fixes: Delete corresponding track when a style is deleted from ...Jon Reid2012-02-24
| | | * | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-24
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-24
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-24
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-23
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Timeline: Add hottext fields to layers and serialize them throughout.Jon Reid2012-02-23
| | * | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-25
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | / / / / / / | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | - added flag for timeline to identify new file flowJonathan Duran2012-02-24
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-24
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | / / / / / / | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | add back layer selectionJonathan Duran2012-02-23
| | * | | | | | | | Remove unneeded selection codeJonathan Duran2012-02-23
| | * | | | | | | | Move element selection to click handlerJonathan Duran2012-02-23
* | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-27
|\| | | | | | | | |
| * | | | | | | | | adding the template-creator classValerio Virgillito2012-02-27
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Updating legal copyJose Antonio Marquez2012-02-27
* | | | | | | | | Updating creditsJose Antonio Marquez2012-02-27
* | | | | | | | | Merge pull request #21 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-27
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-27
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Cleaning up pretty functions in IOJose Antonio Marquez2012-02-27
* | | | | | | | | | Cleaning up and adding TODOsJose Antonio Marquez2012-02-26
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Cleaning up formatting for webGL dataJose Antonio Marquez2012-02-26
* | | | | | | | | Fixed issue with losing track of Ninja template cssJose Antonio Marquez2012-02-26
* | | | | | | | | Cleaning up comments for external styles loadingJose Antonio Marquez2012-02-25