| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-20 |
| |\ | | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-20 |
| | |\ | |||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-06-20 |
| | | |\ | |||
| | | * | | 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> | ||
| * | | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-20 |
| |\| | | | | | |||
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 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> | ||
| | | * | | | | | Merge pull request #312 from joseeight/Color | Valerio Virgillito | 2012-06-20 |
| | | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | Fixing logic to close color panel popup | ||
| | | | * | | | | 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 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> | ||
| | | * | | | | 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 |
| | | | | | | | | | | |||
| | | | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-13 |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json | ||
| | | | * | | | | | | | Removed a console message. | hwc487 | 2012-06-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed cloud material from the pulldown. | ||
| | | | * | | | | | | | Removed references to NJUtils | hwc487 | 2012-06-12 |
| | | | | | | | | | | | |||
| | | | * | | | | | | | Moved Flat material to the top of the drop down. | hwc487 | 2012-06-12 |
| | | | | | | | | | | | |||
| | | | * | | | | | | | Incremented RDGE library number | hwc487 | 2012-06-12 |
| | | | | | | | | | | | |||
| | | | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-06-12 |
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js | ||
| | | | * | | | | | | | | |||