aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-03
|\
| * Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| * Handle delete of multiple objects. Also, have deletion go through the mediato...Nivesh Rajbhandari2012-02-03
| * Update grid and planes when elementChange event signifies the "matrix", "left...Nivesh Rajbhandari2012-02-03
| * Update grid and planes when elementChange event signifies the "matrix", "left...Nivesh Rajbhandari2012-02-03
| * Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| |\
| | * Removed border special-casing from PI since the mediator now handles this gen...Nivesh Rajbhandari2012-02-01
| | * Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | * Updated color code to handle shapes.Nivesh Rajbhandari2012-01-31
| | * Merge branch 'refs/heads/Jose-Color' into NiveshColorNivesh Rajbhandari2012-01-31
| | |\
| * | \ Merge branch 'refs/heads/master' into ToolFixesNivesh Rajbhandari2012-02-03
| |\ \ \
| * | | | Update PI when element is changed by one of the tools.Nivesh Rajbhandari2012-02-02
| * | | | Fixing keyboard shortcut and tooltip for hand and 3d tools.Nivesh Rajbhandari2012-02-02
* | | | | Added a counter to the renderer that tracks the number of unloaded texture maps.hwc4872012-02-03
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into wor...hwc4872012-02-03
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'montage-integration' into stagingValerio Virgillito2012-02-02
| |\ \ \ \
| | * \ \ \ Merge pull request #11 from joseeight/MontageV6ColorValerio Virgillito2012-02-02
| | |\ \ \ \
| | | * | | | Fixed the color popups to work with m-js v6Jose Antonio Marquez2012-02-02
| | |/ / / /
| | * | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | * | | | Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-01
| | * | | | Fixes for montage integrationValerio Virgillito2012-02-01
| | * | | | Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-01
| | * | | | removing references to the old components in the app delegateValerio Virgillito2012-02-01
| * | | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| * | | | | Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-02
| * | | | | Fixes for montage integrationValerio Virgillito2012-02-02
| * | | | | Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-02
| * | | | | removing references to the old components in the app delegateValerio Virgillito2012-02-02
| * | | | | Merge branch 'issue-codeattribution' of github.com:mencio/ninja-internal into...Valerio Virgillito2012-02-02
| |\ \ \ \ \
| | * | | | | Switching to alternate dashed line function. Adding code attributions.Valerio Virgillito2012-02-02
| | * | | | | IKNINJA-1083Jose Antonio Marquez2012-02-02
| | * | | | | Added skin for html buttons.Jon Reid2012-02-02
| | * | | | | Fixing the bread-crumb backgroundValerio Virgillito2012-02-02
| | * | | | | Checkbox and Combobox change/changing events were not setting wasSetByCode pr...Nivesh Rajbhandari2012-02-02
| * | | | | | Merge pull request #12 from mqg734/ToolFixesValerio Virgillito2012-02-02
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'pullrequest' of github.com:jreid01/ninja-internal into stagingValerio Virgillito2012-02-02
| |\ \ \ \ \ \
| | * | | | | | Delete unneeded compass log file (IKNINJA 1101).Jon Reid2012-02-01
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'refs/heads/master' into stagingValerio Virgillito2012-02-02
| |\| | | | |
| | * | | | | IKNINJA-1083Jose Antonio Marquez2012-02-01
| | * | | | | Merge pull request #9 from jreid01/pullrequestValerio Virgillito2012-01-31
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Added skin for html buttons.Jon Reid2012-01-31
| | * | | | | Fixing the bread-crumb backgroundValerio Virgillito2012-01-31
| | |/ / / /
| | * | / / Checkbox and Combobox change/changing events were not setting wasSetByCode pr...Nivesh Rajbhandari2012-02-01
| | | |/ / | | |/| |
| * | | | Added skin for html buttons.Jon Reid2012-02-01
| * | | | Fixing the bread-crumb backgroundValerio Virgillito2012-02-01
| * | | | Checkbox and Combobox change/changing events were not setting wasSetByCode pr...Nivesh Rajbhandari2012-02-01
| * | | | Adding browser check for Chrome and redirect page.Valerio Virgillito2012-02-01
| * | | | Removed unused images and reduced the size of the larger image files used for...John Mayhew2012-02-01
| * | | | Adding the version to the main Ninja reel component.Valerio Virgillito2012-01-30
| * | | | Code cleanup - Removed extra log.Valerio Virgillito2012-01-30