| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 | |
| |\| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 | |
| | | | | | ||||
| | * | | | Respect play/pause WebGL animation when saving files and re-rendering caused ↵ | Nivesh Rajbhandari | 2012-03-23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | Adding checkbox in PI to start/stop WebGL animation preview. | Nivesh Rajbhandari | 2012-03-22 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-21 | |
| | |\ \ \ | ||||
| | * | | | | fixing the selection of components. Temporary workaround for now. | Valerio Virgillito | 2012-03-18 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to ↵ | Valerio Virgillito | 2012-03-17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "zoomValue" in map component to avoid scaling the map. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | fixing the map styles and temporary disabling the 3d styles for elements. | Valerio Virgillito | 2012-03-17 | |
| | | |_|/ | |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | Adding logic for flatten checkbox in PI. | Nivesh Rajbhandari | 2012-03-24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires minor modifications to both StageController and ComponentController. Also removing unused global3DSettings CSS. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | WebGL needs to have 3d styles to render. | Nivesh Rajbhandari | 2012-03-22 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | Do not set webkit-transform styles on elements unless 3d is used on them. | Nivesh Rajbhandari | 2012-03-21 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | Get matrix and perspective distance from styles controller. | Nivesh Rajbhandari | 2012-03-21 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | IKNINJA-1370 - Toggle WebGL on/off is no longer working in the PI. | Nivesh Rajbhandari | 2012-03-20 | |
| | |/ / |/| | | | | | | | | | | | | | | This bug was injected by some changes in GLWorld.import. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | Support button control in Properties Panel and use them for edit fill and ↵ | Nivesh Rajbhandari | 2012-03-20 | |
| | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | Removing zoom from element's getMatrix. Zoom should only be checked on stage. | Nivesh Rajbhandari | 2012-03-20 | |
| |/ / | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * / | Removing the name attribute from the PI. Fixing the ID and Class attribute ↵ | Valerio Virgillito | 2012-03-14 | |
| |/ | | | | | | from the PI Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | Fixed element mediator, PI, and eye-dropper to handle different borders ↵ | Nivesh Rajbhandari | 2012-03-12 | |
| | | | | | | | sides and gradients. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | gradient support for canvas-2d shapes. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | Gradient support for canvas-2d rectangle. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | preliminary support for setting gradients on webgl shapes. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | Squashed commit of preload-fix into Master | Valerio Virgillito | 2012-03-06 | |
| | | | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | stage and elements fixes | Valerio Virgillito | 2012-03-01 | |
| | | | | | | | | | - Resizing the iframe container when resizing the stage - Removing 3d rules from elements when adding them - Adding a name property in the pi Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | Fix for performance issue when moving shapes. We don't need to call render ↵ | Nivesh Rajbhandari | 2012-02-29 | |
| | | | | | | | | | except if the geometry and materials change. This is more easy to see with shapes like the brush tool. Signed-off-by: Nivesh Rajbhandari <mqg734@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> | |||
| | * | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 | |
| | |\ | ||||
| | | * | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-22 | |
| | | |\ | ||||
| | | * | | Fixing eyedropper tool to get color from image data. This required us to ↵ | Nivesh Rajbhandari | 2012-02-22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | workaround having inconsistent color object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | Do not use color object for stage's border since we don't allow users to ↵ | Nivesh Rajbhandari | 2012-02-22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | modify the stage's border; we only need the border-width. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | Color chips expect a color object, not a css value. | Nivesh Rajbhandari | 2012-02-22 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 | |
| | |\ \ \ | | |/ / | |/| / | | |/ | ||||
| | * | | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-20 | |
| | |\ \ | ||||
| | * \ \ | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-14 | |
| | |\ \ \ | ||||
| | * \ \ \ | Merge branch 'refs/heads/ninja-internal' into ToolFixes | Nivesh Rajbhandari | 2012-02-14 | |
| | |\ \ \ \ | ||||
| | * | | | | | Working around inconsistent color object when getting/setting WebGL values. | Nivesh Rajbhandari | 2012-02-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | Updated ink bottle tool to use new setColor routine in the mediator and ↵ | Nivesh Rajbhandari | 2012-02-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controllers. Signed-off-by: Nivesh Rajbhandari <mqg734@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> | |||
| * | | | | | enabling nested selection | Valerio Virgillito | 2012-02-20 | |
| | |_|_|/ |/| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-16 | |
| |\ \ \ \ | ||||
| | * | | | | Adding a data-RDGE-id attribute to each canvas to save/load canvas data | Valerio Virgillito | 2012-02-16 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-15 | |
| |\| | | | | ||||
| | * | | | | Merge branch 'live-preview-fix' of https://github.com/mencio/ninja-internal ↵ | Valerio Virgillito | 2012-02-14 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | into integration | |||
| | * | | | | Merge branch 'components' of https://github.com/mencio/ninja-internal into ↵ | Valerio Virgillito | 2012-02-14 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/io/document/html-document.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||
| | * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 | |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html | |||
| | * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 | |
| | |\ \ \ \ \ | ||||
| | * \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
| | |\ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 | |
| | |\ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | |||
| | * | | | | | | | | | Updated canvas controller to override setProperties so we don't set styles ↵ | Nivesh Rajbhandari | 2012-01-29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when updating width and height. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | | | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 | |
| | | | | | | | | | | | ||||