Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | | | | | | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | 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 | |
| | | | * | | | | | | | | | | | Cleaning up ninja-data attributes | Jose Antonio Marquez | 2012-02-25 | |
| | | | * | | | | | | | | | | | Adding prettify code to I/O | Jose Antonio Marquez | 2012-02-24 | |
| | | |/ / / / / / / / / / / | ||||
| | | * | | | | | | | | | | | Merge pull request #19 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-24 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | ||||
| | | | * | | | | | | | | | | - added closeDocument event for timeline | Ananya Sen | 2012-02-24 | |
| | | | * | | | | | | | | | | - added flag for timeline to identify new file flow | Ananya Sen | 2012-02-24 | |
| | | | * | | | | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | refresh draw-utils, snap-manager, view-utils for html document stitching | Ananya Sen | 2012-02-23 | |
| | | | * | | | | | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | switch html document - re-initialize draw-utils and snap-manager on opening a... | Ananya Sen | 2012-02-23 | |
| | | * | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-24 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | Added import/export of RDGE data | Jose Antonio Marquez | 2012-02-24 | |
| | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | Merge pull request #17 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-02-23 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int... | hwc487 | 2012-02-23 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | GL save and reload. | hwc487 | 2012-02-22 | |
| | | | * | | | | | | | | | | | | Runtime classes | hwc487 | 2012-02-22 | |
| | | | * | | | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integration | hwc487 | 2012-02-22 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int... | hwc487 | 2012-02-22 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / / / / | | | | | |/| | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | Added all materials back in | hwc487 | 2012-02-22 | |
| | | | * | | | | | | | | | | | | | Adding all the shaders back in | hwc487 | 2012-02-22 | |
| | | | * | | | | | | | | | | | | | Adding bug fixes. | hwc487 | 2012-02-22 | |
| | | | * | | | | | | | | | | | | | Merge branch 'WebGLMaterials' of github.com:mqg734/ninja-internal into integr... | hwc487 | 2012-02-21 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | Fixing document mode check | Jose Antonio Marquez | 20 |