aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-20
| |\
| | * Merge pull request #313 from mqg734/GIO_FixesValerio Virgillito2012-06-20
| | |\
| | | * Merge branch 'refs/heads/ninja-internal' into GIO_FixesNivesh Rajbhandari2012-06-19
| | | |\
| | | * | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D spac...Nivesh Rajbhandari2012-06-19
| | * | | Merge pull request #312 from joseeight/ColorValerio Virgillito2012-06-20
| | |\ \ \
| | | * | | Fixing logic to close color panel popupJose Antonio Marquez2012-06-19
| | | | |/ | | | |/|
| * | | | fixing the css panel button hoverValerio Virgillito2012-06-20
| * | | | remove the un-used css fileValerio Virgillito2012-06-20
| * | | | fixing the last instances of the old montage components in the css panelValerio Virgillito2012-06-20
| * | | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
| |\| | |
| * | | | fixing the css bugs with montage v11Valerio Virgillito2012-06-18
| * | | | fixing the components.Valerio Virgillito2012-06-18
| * | | | 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
| * | | | | montage v11 merge into ninjaValerio Virgillito2012-06-17
* | | | | | Notify for adding multiple elements together, to fix IKNINJA-1775 [Drawing a ...Ananya Sen2012-06-20
* | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'IKNINJA-1754' of github.com:mencio/ninja-internalValerio Virgillito2012-06-19
| |\ \ \ \ \
| | * | | | | IKNINJA 1754 menu not opening on hoverValerio Virgillito2012-06-19
| | | |_|/ / | | |/| | |
| * | | | | 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
| | * | | | Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another main men...Ananya Sen2012-06-19
| | * | | | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ...Ananya Sen2012-06-18
* | | | | | adding some error handlingAnanya Sen2012-06-19
* | | | | | parse html in memory, instead of using a doom elementAnanya Sen2012-06-19
* | | | | | IKNINJA-1754Ananya Sen2012-06-19
* | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
|\| | | | |
| * | | | | Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | 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 o...hwc4872012-06-15
| | * | | | 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 instan...hwc4872012-06-15
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-14
| | |\ \ \ \
| | * | | | | Fix for line color.hwc4872012-06-14
| | * | | | | Fixed alphabetization of material names.hwc4872012-06-14
| | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-14
| | |\ \ \ \ \
| | * | | | | | 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 Tex...hwc4872012-06-13
| | |\ \ \ \ \ \
| | * | | | | | | Material bug fixes - reset texture array.hwc4872012-06-13
| | * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| | |\ \ \ \ \ \ \
| | * | | | | | | | Removed a console message.hwc4872012-06-13
| | * | | | | | | | Removed references to NJUtilshwc4872012-06-12
| | * | | | | | | | Moved Flat material to the top of the drop down.hwc4872012-06-12