aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Timeline: try to clean up bogus events manually.Jon Reid2012-02-27
* Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-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: More work on clear timeline method.Jon Reid2012-02-27
* | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-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
| | | |\ \ \ \
| | | | * | | | 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
| | | | * | | | Cleaning up ninja-data attributesJose Antonio Marquez2012-02-25
| | | | * | | | Adding prettify code to I/OJose Antonio Marquez2012-02-24
| | | |/ / / /
| | | * | | | Merge pull request #19 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-24
| | | |\ \ \ \
| | | | * | | | - added closeDocument event for timelineAnanya Sen2012-02-24
| | | | * | | | - added flag for timeline to identify new file flowAnanya Sen2012-02-24
| | | | * | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| | | | |\ \ \ \
| | | | * | | | | refresh draw-utils, snap-manager, view-utils for html document stitchingAnanya Sen2012-02-23
| | | | * | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
| | | | |\ \ \ \ \
| | | | * | | | | | switch html document - re-initialize draw-utils and snap-manager on opening a...Ananya Sen2012-02-23
| | | * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Added import/export of RDGE dataJose Antonio Marquez2012-02-24
| | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | * | | | | | | Merge pull request #17 from ericmueller/integrationJose Antonio Marquez Russo2012-02-23
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-23
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | GL save and reload.hwc4872012-02-22
| | | | * | | | | | | | Runtime classeshwc4872012-02-22
| | | | * | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-22
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-02-22
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / | | | | | |/| | | | | | |
| | | | * | | | | | | | | Added all materials back inhwc4872012-02-22
| | | | * | | | | | | | | Adding all the shaders back inhwc4872012-02-22
| | | | * | | | | | | | | Adding bug fixes.hwc4872012-02-22
| | | | * | | | | | | | | Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into integr...hwc4872012-02-21
| | | | |\ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Fixing document mode checkJose Antonio Marquez2012-02-23
| | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 05:32:23 +0000