| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-20 |
| |\ | |||
| | * | Merge pull request #317 from joseeight/Color | Valerio Virgillito | 2012-06-20 |
| | |\ | | | | | | | Color | ||
| | * \ | Merge pull request #315 from mqg734/IKNinja_1671 | Valerio Virgillito | 2012-06-20 |
| | |\ \ | | | | | | | | | IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated in negative space. | ||
| | | * | | Fix for error when using ZoomTool. | Nivesh Rajbhandari | 2012-06-20 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/ninja-internal' into IKNinja_1671 | Nivesh Rajbhandari | 2012-06-20 |
| | | |\ \ | |||
| | | * | | | IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated ↵ | Nivesh Rajbhandari | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in negative space. I fixed this temporarily by disabling the auto stage scroll calculations when we modify matrices. The correct fix will be to update any matrices and local2Global caches if we update the stage's padding (which I'm doing in a separate fix for a single draw cycle for the stage, but that fix is not ready yet). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Merge pull request #314 from ericmueller/Grid | Valerio Virgillito | 2012-06-20 |
| | |\ \ \ \ | | | | | | | | | | | | | Added logic to handle grid drawing where grid line starts on an object b... | ||
| | | * \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Grid | hwc487 | 2012-06-20 |
| | | |\ \ \ \ | |||
| | | * | | | | | Added logic to handle grid drawing where grid line starts on an object boundary | hwc487 | 2012-06-19 |
| | | | |/ / / | | |/| | | | |||
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-06-20 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | | * | | | | Merge pull request #313 from mqg734/GIO_Fixes | Valerio Virgillito | 2012-06-20 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D space or in Top/Side view. | ||
| | | | * | | | | Merge branch 'refs/heads/ninja-internal' into GIO_Fixes | Nivesh Rajbhandari | 2012-06-19 |
| | | | |\| | | | |||
| | | | * | | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D ↵ | Nivesh Rajbhandari | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | space or in Top/Side view. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | fixing the css panel button hover | Valerio Virgillito | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | remove the un-used css file | Valerio Virgillito | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | fixing the last instances of the old montage components in the css panel | Valerio Virgillito | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-20 |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | fixing the css bugs with montage v11 | Valerio Virgillito | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | fixing the components. | Valerio Virgillito | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-18 |
| | |\ \ \ \ \ \ | |||
| | * | | | | | | | updating the components and descriptor.json to support montage v.11 | Valerio Virgillito | 2012-06-17 |
| | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | Adding transparent background to color chip buttons | Jose Antonio Marquez | 2012-06-20 |
| | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | Add a transparent pattern to the background of color chips consumed in the app, this way you can preview colors in alpha. This was lost, just added back again. Not a big change, just minor CSS, so should only be quickly tested prior to merge. | ||
| * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-20 |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| | * | | | | | Merge pull request #312 from joseeight/Color | Valerio Virgillito | 2012-06-20 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Fixing logic to close color panel popup | ||
| | * | | | | | Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internal | Valerio Virgillito | 2012-06-19 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | IKNINJA 1754 menu not opening on hover | Valerio Virgillito | 2012-06-19 |
| | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internal | Valerio Virgillito | 2012-06-19 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | | * | | | | Reverting last change since this is is being made in a different pull request. | Ananya Sen | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main ↵ | Ananya Sen | 2012-06-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | menu does not work when a main menu drop down is already displayed. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | | | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ↵ | Ananya Sen | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is opened Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | Fixes: IKNINJA-1448 | Jose Antonio Marquez | 2012-06-20 |
| | |_|/ / / |/| | | | | | | | | | | | | | | Improving logic on calculating position of the color stops in the gradient picker. | ||
| * | | | | | Fixing logic to close color panel popup | Jose Antonio Marquez | 2012-06-19 |
| |/ / / / | | | | | | | | | | | | | This resolves closing the color panel popup when a user make a click outside the popup area or resizes the Ninja window. This should be tested prior to merging. | ||
| * | | | | Merge pull request #298 from ericmueller/Textures | Valerio Virgillito | 2012-06-19 |
| |\ \ \ \ | |_|_|/ |/| | | | Textures | ||
| | * | | | Removed Flat material from the materials library | hwc487 | 2012-06-15 |
| | | | | | |||
| | * | | | Fixed a canvas 2D rendering problem. | hwc487 | 2012-06-15 |
| | | | | | |||
| | * | | | Fixed a problem with Uber shader where new values were getting clobbered by ↵ | hwc487 | 2012-06-15 |
| | | | | | | | | | | | | | | | | | old values. | ||
| | * | | | Runtime change for Paris material. | hwc487 | 2012-06-15 |
| | | | | | |||
| | * | | | Re-added Raiders material | hwc487 | 2012-06-15 |
| | | | | | |||
| | * | | | Re-added Paris material | hwc487 | 2012-06-15 |
| | | | | | |||
| | * | | | Fix for setting the specular map in the Uber shader. | hwc487 | 2012-06-15 |
| | | | | | |||
| | * | | | Added correct 'Cancel' behavior to the material editor | hwc487 | 2012-06-15 |
| | | | | | |||
| | * | | | Material changes through the popup editor can effect multiple material ↵ | hwc487 | 2012-06-15 |
| | | | | | | | | | | | | | | | | | instances within a single object. | ||
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-14 |
| | |\ \ \ | | | | | | | | | | | | | | | | Textures | ||
| | * | | | | Fix for line color. | hwc487 | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | Name change for all materials | ||
| | * | | | | Fixed alphabetization of material names. | hwc487 | 2012-06-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Removed console output. Removed texture map field from Mandel material editor. | ||
| | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-14 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | Textures | ||
| | * | | | | | Fixes for runtime Taper material | hwc487 | 2012-06-13 |
| | | | | | | | |||
| | * | | | | | Oval stroke and fill material were stored in inverted order. | hwc487 | 2012-06-13 |
| | | | | | | | |||
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Textures | ||
| | * | | | | | | Material bug fixes - reset texture array. | hwc487 | 2012-06-13 |
| | | | | | | | | |||