aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-20
|\
| * BindingView :Montage UpdatesArmen Kesablyan2012-06-20
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-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-internalArmen Kesablyan2012-06-20
| | |\
| | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-20
| | | |\
| | | * | fixing the css panel button hoverValerio Virgillito2012-06-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | remove the un-used css fileValerio Virgillito2012-06-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | fixing the last instances of the old montage components in the css panelValerio Virgillito2012-06-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | fixing the css bugs with montage v11Valerio Virgillito2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | fixing the components.Valerio Virgillito2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-18
| | | |\ \ \
| | | * | | | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | montage v11 merge into ninjaValerio Virgillito2012-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| |\| | | | |
| | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge pull request #313 from mqg734/GIO_FixesValerio Virgillito2012-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_FixesNivesh Rajbhandari2012-06-19
| | | | |\ \ \ \
| | | | * | | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D ↵Nivesh Rajbhandari2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | space or in Top/Side view. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | Merge pull request #312 from joseeight/ColorValerio Virgillito2012-06-20
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | Fixing logic to close color panel popup
| | | | * | | | | Fixing logic to close color panel popupJose Antonio Marquez2012-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-internalValerio Virgillito2012-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 hoverValerio Virgillito2012-06-19
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | Merge branch 'bugfix-master' of github.com:ananyasen/ninja-internalValerio Virgillito2012-06-19
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Reverting last change since this is is being made in a different pull request.Ananya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main ↵Ananya Sen2012-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 Sen2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is opened Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | * | | | | Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | Textures
| | | | * | | | Removed Flat material from the materials libraryhwc4872012-06-15
| | | | | | | |
| | | | * | | | Fixed a canvas 2D rendering problem.hwc4872012-06-15
| | | | | | | |
| | | | * | | | Fixed a problem with Uber shader where new values were getting clobbered by ↵hwc4872012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old values.
| | | | * | | | Runtime change for Paris material.hwc4872012-06-15
| | | | | | | |
| | | | * | | | Re-added Raiders materialhwc4872012-06-15
| | | | | | | |
| | | | * | | | Re-added Paris materialhwc4872012-06-15
| | | | | | | |
| | | | * | | | Fix for setting the specular map in the Uber shader.hwc4872012-06-15
| | | | | | | |
| | | | * | | | Added correct 'Cancel' behavior to the material editorhwc4872012-06-15
| | | | | | | |
| | | | * | | | Material changes through the popup editor can effect multiple material ↵hwc4872012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instances within a single object.
| | | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-14
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | | | * | | | | Fix for line color.hwc4872012-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Name change for all materials
| | | | * | | | | Fixed alphabetization of material names.hwc4872012-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed console output. Removed texture map field from Mandel material editor.
| | | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-14
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | | | * | | | | | Fixes for runtime Taper materialhwc4872012-06-13
| | | | | | | | | |
| | | | * | | | | | Oval stroke and fill material were stored in inverted order.hwc4872012-06-13
| | | | | | | | | |
| | | | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | | | * | | | | | | Material bug fixes - reset texture array.hwc4872012-06-13
| | | | | | | | | | |