Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | | | | | | | | | | * | | | | | 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 | |
| | | | | | | | | |/| | | | | | ||||
| | | | | | | | | | | | | | * | persist undo/redo stack per html document | Ananya Sen | 2012-02-27 | |
| | | | | | | | | | | | | | * | updating to codemirror 2.22 | Ananya Sen | 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 | |
| | | | | * | | | | | | | | 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 | |
| | | | |\ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-24 | |
| | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge pull request #69 from mayhewinator/WorkingBranch | mayhewinator | 2012-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Removing tabs permissions until we make a final decision on whether or not we... | John Mayhew | 2012-02-24 | |
|/ / / / / / / / / / / / | ||||
* | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #68 from mqg734/ToolFixes | Valerio Virgillito | 2012-02-24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | / / / / / / / / / | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||
| | * | | | | | | | | | | Marking inkbottle as the final tool in the set. | Nivesh Rajbhandari | 2012-02-24 | |
| | * | | | | | | | | | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle functio... | Nivesh Rajbhandari | 2012-02-24 | |
| | * | | | | | | | | | | Javascript does not evaluate a return with its expression in a new line. The ... | Nivesh Rajbhandari | 2012-02-24 | |
| | * | | | | | | | | | | Removing duplicate get/setElementPlanes method. | Nivesh Rajbhandari | 2012-02-24 | |
| |/ / / / / / / / / / | ||||
* / / / / / / / / / / | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 | |
|/ / / / / / / / / / | ||||
| | * | | | | | | | | Added import/export of RDGE data | Jose Antonio Marquez | 2012-02-24 | |
| | | | | | * | | | | - save show3DGrid flag per document while switching documents | Ananya Sen | 2012-02-27 | |
| | | | |_|/ / / / | | | |/| | | | | | ||||
| | | * | | | | | | - 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 | |
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||
| | * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 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 branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-02-23 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
* | | | | | | | | | | | Fixing the selection tool properties icons. | Valerio Virgillito | 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 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 | |
| | | | * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 | |
| | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |