aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | | | * | | | | | | | | | 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 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
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |