| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge pull request #182 from ericmueller/Canvas-interaction | Valerio Virgillito | 2012-04-30 |
| |\ | | | | | Canvas interaction | ||
| | * | canvas interaction | hwc487 | 2012-04-26 |
| | | | |||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 |
| | |\ | | | | | | | | | | Canvas-interaction | ||
| | * \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-24 |
| | |\ \ | | | | | | | | | | | | | Canvas-interaction | ||
| | * | | | canvas interaction | hwc487 | 2012-04-23 |
| | | | | | |||
| * | | | | Fixing the element model and adding get element | Valerio Virgillito | 2012-04-26 |
| | |_|/ |/| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-24 |
| |\ \ \ | | |/ | |/| | |||
| | * | | adjusting the bread crumb to work with the new template | Valerio Virgillito | 2012-04-23 |
| | | | | | | | | | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | initial stage web template | Valerio Virgillito | 2012-04-18 |
| | |/ | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-17 |
| |\| | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | * | Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ↵ | Nivesh Rajbhandari | 2012-04-05 |
| | | | | | | | | | | | | | cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'refs/heads/WebGLFileIO' into ToolFixes | Nivesh Rajbhandari | 2012-04-04 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFileIO | Nivesh Rajbhandari | 2012-03-30 |
| | | |\ | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Updated shapes to always check for its stroke and fill colors and materials ↵ | Nivesh Rajbhandari | 2012-03-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | instead of relying on the shapeModel cache because it can get out of sync. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-06 |
| |\| | | | |||
| | * | | | Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵ | John Mayhew | 2012-04-03 |
| | | | | | | | | | | | | | | | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support. | ||
| | * | | | removed old unused import and export functions. | John Mayhew | 2012-04-03 |
| | | | | | |||
| | * | | | Namespaced the canvas runtime file and updated all dependencies | John Mayhew | 2012-04-03 |
| | | |/ | |/| | |||
| * / | | working File I/O for pen tool created paths and some minor bug fixes ↵ | Pushkar Joshi | 2012-04-03 |
| |/ / | | | | | | | (correctly setting the canvas for brush stroke file I/O, correct plane matrix for file I/O) | ||
| * / | File IO for the brush stroke AND changing the data type of brush stroke from ↵ | Pushkar Joshi | 2012-03-27 |
| |/ | | | | GEOM_TYPE_CUBIC_BEZIER to GEOM_TYPE_BRUSH_STROKE | ||
| * | Removing m-js components I/O and fix for webGL | Jose Antonio Marquez | 2012-03-23 |
| | | | | | Removed saving m-js components as new components broke I/O when present. Also made a fix for checking length of webGL array since first item now is non-user data. (That is to be removed) | ||
| * | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-22 |
| |\ | | | | | | | FileIO-Montage-Components | ||
| | * | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Adding Ninja URL method to io-mediator | Jose Antonio Marquez | 2012-03-22 |
| |/ | |||
| * | Temp I/O functionality for M-JS components | Jose Antonio Marquez | 2012-03-18 |
| | | | | | Added the ability to save montages component serialization from Ninja. Very rough, but functional. | ||
| * | Corrections for Uber shader IO | hwc487 | 2012-03-14 |
| | | |||
| * | Fixed BumpMetal material | hwc487 | 2012-03-13 |
| | | |||
| * | Add temp delay for webGL preview | Jose Antonio Marquez | 2012-03-10 |
| | | | | | Added a padded launch webGL preview delay. This is very temporary, just a work around until RDGE issues are fixed. | ||
| * | further removal of authortime asset path replacement. | hwc487 | 2012-03-09 |
| | | |||
| * | Removed asset path replacement at authortime. | hwc487 | 2012-03-09 |
| | | |||
| * | Adding webGL I/O runtime functionality | Jose Antonio Marquez | 2012-03-09 |
| | | | | | There is a problem that needs to be resolved in the CanvasRuntime. | ||
| * | Merge branch 'refs/heads/integration' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 |
| |\ | | | | | | | | | Conflicts: js/document/html-document.js | ||
| | * | Canvas IO | hwc487 | 2012-03-08 |
| | | | |||
| * | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-08 |
| |\ \ | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js | ||
| | * | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵ | Ananya Sen | 2012-03-08 |
| | | | | | | | | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | Merge pull request #30 from ananyasen/FileIO-ananya | Jose Antonio Marquez Russo | 2012-03-08 |
| |\ \ \ | | | | | | | | | FileIO branch pull request | ||
| | * | | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananya | Ananya Sen | 2012-03-08 |
| | |\| | | |||
| | * | | | minor fixes | Ananya Sen | 2012-03-07 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | added close file menu item | Ananya Sen | 2012-03-06 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | Merge branch 'refs/heads/FileIO-jose' into FileIO-ananya | Ananya Sen | 2012-03-06 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | removed unnecessary console logs | Ananya Sen | 2012-03-06 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵ | Ananya Sen | 2012-03-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a video then wait for a while Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | Adding I/O functionality to RDGE | Jose Antonio Marquez | 2012-03-08 |
| | | | | | | | | | | | | | | | | | | | | | Added webGL/Canvas file I/O for Ninja, it also created routine for saving data for runtime, however, the runtime RDGE library needs an update for runtime to work, so right now I/O will only work for Ninja. | ||
| * | | | | | Merge pull request #29 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-08 |
| |\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | Integration | ||
| | * | | | removed an unused parameter to CanvasDataManager | hwc487 | 2012-03-08 |
| | | | | | |||
| | * | | | Commented out code for loading for runtime | hwc487 | 2012-03-08 |
| | | | | | |||
| | * | | | Fixed a few problems with Plasma material. | hwc487 | 2012-03-07 |
| | | | | | |||
| | * | | | File IO | hwc487 | 2012-03-07 |
| | | | | | |||
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-06 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/preloader/Preloader.js | ||