| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 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 |
| | | | |||
| * | | Merge pull request #20 from joseeight/FileIO | Jose Antonio Marquez Russo | 2012-02-26 |
| |\| | | | | | File IO Updates | ||
| | * | 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 |
| | | | | | | | | | Also cleaned up URL getter for app in cleaning string code. | ||
| | * | Cleaning up comments for external styles loading | Jose Antonio Marquez | 2012-02-25 |
| | | | |||
| | * | Cleaning up ninja-data attributes | Jose Antonio Marquez | 2012-02-25 |
| | | | | | | | | | Added logic to load cross-domain CSS from CDN, but need to explore how to load without impacting permissions. | ||
| | * | Adding prettify code to I/O | Jose Antonio Marquez | 2012-02-24 |
| |/ | | | | This is a possible set of methods to be used to prettify code. Added temporarily until approved. | ||
| * | Merge pull request #19 from ananyasen/FileIO | Jose Antonio Marquez Russo | 2012-02-24 |
| |\ | | | | | FileIO branch pull request | ||
| | * | - added closeDocument event for timeline | Ananya Sen | 2012-02-24 |
| | | | | | | | | | | | | | - minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | - added flag for timeline to identify new file flow | Ananya Sen | 2012-02-24 |
| | | | | | | | | | | | | | - added switchDocument event for timeline Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | 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 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | switch html document - re-initialize draw-utils and snap-manager on opening ↵ | Ananya Sen | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | 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 | ||
| | | * | | | | Removing tabs permissions until we make a final decision on whether or not ↵ | John Mayhew | 2012-02-24 |
| | |/ / / / | | | | | | | | | | | | | | | | we will require it. | ||
| | * | | | | 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 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Tool fixes - Adding back the InkBottle tool. Also Fixed some typos in 3d helper classes. | ||
| | | | * | | | | Marking inkbottle as the final tool in the set. | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵ | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | Javascript does not evaluate a return with its expression in a new line. The ↵ | Nivesh Rajbhandari | 2012-02-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return expression must begin on the same line as the return keyword. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | | | | Removing duplicate get/setElementPlanes method. | Nivesh Rajbhandari | 2012-02-24 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * / / / / | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | / | Added import/export of RDGE data | Jose Antonio Marquez | 2012-02-24 |
| | |_|_|/ |/| | | | | | | | | | | | This is only the IO aspect, the data getter seems broken for 2D canvas and does not allow for save, and nothing works for setting the data on load. However, the IO aspect of saving and opening the data are not incorporated. | ||
| * | | | | 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 | ||
| | | * | | | Timeline : Fix for the split and element model error | Kruti Shah | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | Merge pull request #17 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-02-23 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Integration | ||
| | * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-02-23 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/src/tools/rdge-compiled.js js/preloader/Preloader.js | ||
| | * | | | | | | 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 ↵ | hwc487 | 2012-02-22 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration | ||
| | * | | | | | | | | 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 ↵ | hwc487 | 2012-02-21 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration | ||
| * | \ \ \ \ \ \ \ \ | 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. | ||
| | | * | | | | | | | | Fix to read back colors when re-opening files. | Nivesh Rajbhandari | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js | ||
| | * | | | | | | | | | Fixing app mode check. | Valerio Virgillito | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | | fixing the tools shortcuts - IKNINJA 1199 | Valerio Virgillito | 2012-02-23 |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | Merge pull request #64 from imix23ways/Timeline | Valerio Virgillito | 2012-02-23 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Timeline | ||
| | | * | | | | | | | | Remove selection calls from timelinepanel.js | Jonathan Duran | 2012-02-23 |
| | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||