aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose 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
| | |\ | | |/ | |/|
| | * - save show3DGrid flag per document while switching documentsAnanya Sen2012-02-27
* | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-27
|\| |
| * | Cleaning up pretty functions in IOJose Antonio Marquez2012-02-27
| * | Cleaning up and adding TODOsJose Antonio Marquez2012-02-26
* | | 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
|\ \ \ \
| * \ \ \ Merge pull request #69 from mayhewinator/WorkingBranchmayhewinator2012-02-24
| |\ \ \ \
| | * | | | Removing tabs permissions until we make a final decision on whether or not we...John Mayhew2012-02-24
| |/ / / /
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-24
| |\ \ \ \
| | * \ \ \ Merge pull request #68 from mqg734/ToolFixesValerio Virgillito2012-02-24
| | |\ \ \ \
| | | * | | | Marking inkbottle as the final tool in the set.Nivesh Rajbhandari2012-02-24
| | | * | | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle functio...Nivesh Rajbhandari2012-02-24
| | | * | | | Javascript does not evaluate a return with its expression in a new line. The ...Nivesh Rajbhandari2012-02-24
| | | * | | | Removing duplicate get/setElementPlanes method.Nivesh Rajbhandari2012-02-24
| | |/ / / /
| * / / / / Adding some missing copyrightsValerio Virgillito2012-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 #67 from ntfx47/PullRequest-TimelineValerio Virgillito2012-02-23
| |\ \ \
| | * | | Timeline : Fix for the split and element model errorKruti Shah2012-02-23
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-23
| |\ \ \ \
| * | | | | Fixing the selection tool properties icons.Valerio Virgillito2012-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 pull request #65 from mqg734/NiveshColorValerio Virgillito2012-02-23
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Fix to read back colors when re-opening files.Nivesh Rajbhandari2012-02-23