aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'FileIO-Build-Candidate' of ↵Valerio Virgillito2012-02-27
|\ | | | | | | https://github.com/joseeight/ninja-internal into integration-candidate
| * Merge pull request #20 from joseeight/FileIOJose Antonio Marquez Russo2012-02-26
| |\ | | | | | | File IO Updates
| | * Cleaning up formatting for webGL dataJose Antonio Marquez2012-02-26
| | |
| | * Fixed issue with losing track of Ninja template cssJose Antonio Marquez2012-02-26
| | | | | | | | | | | | Also cleaned up URL getter for app in cleaning string code.
| | * Cleaning up comments for external styles loadingJose Antonio Marquez2012-02-25
| | |
| | * Cleaning up ninja-data attributesJose Antonio Marquez2012-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/OJose Antonio Marquez2012-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/FileIOJose Antonio Marquez Russo2012-02-24
| |\ | | | | | | FileIO branch pull request
| | * - added closeDocument event for timelineAnanya Sen2012-02-24
| | | | | | | | | | | | | | | | | | - minor bug fixes Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * - added flag for timeline to identify new file flowAnanya Sen2012-02-24
| | | | | | | | | | | | | | | | | | - added switchDocument event for timeline Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * 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
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-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 Sen2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
| |\ \ \ \
| * | | | | Added import/export of RDGE dataJose Antonio Marquez2012-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 FileIOJose Antonio Marquez2012-02-23
| |\ \ \ \
| * \ \ \ \ Merge pull request #17 from ericmueller/integrationJose Antonio Marquez Russo2012-02-23
| |\ \ \ \ \ | | | | | | | | | | | | | | Integration
| | * \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-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.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 ↵hwc4872012-02-22
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration
| | * | | | | | | | 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 ↵hwc4872012-02-21
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration
| * | \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js
| * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | File io - drawing the layout on open and make models
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'FileIO' of github.com:joseeight/ninja-internal into file-ioValerio Virgillito2012-02-23
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Temp fix for CSS url dataJose Antonio Marquez2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a temp fix to parse out the app url that is placed in the CSS styles.
| * | | | | | | | | | | | App mode checking fixJose Antonio Marquez2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a way to check for the app to be served over http/https to prevent from adding webRequest events on app load.
| * | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-22
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Cleaning up and commenting CSS IOJose Antonio Marquez2012-02-22
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Logic to save <style> for a fileJose Antonio Marquez2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Saving CSS in <style> tags, need to implement saving CSS to files.
| * | | | | | | | | | | | | Merge pull request #16 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | FileIO branch pull request
| | * | | | | | | | | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-22
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | | | | fix bug when closing the first document tabAnanya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |