aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Rotate3D tool changeshwc4872012-04-11
* Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into Snappin...hwc4872012-04-05
|\
| * translate3DObject tool fixes.hwc4872012-04-05
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-04
| |\
| * | Cap fix for vecUtils.hwc4872012-04-04
| * | turned off translation handles during a multi-object drag.hwc4872012-04-04
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-04-03
| |\ \
| * | | Translate 3D fix for multi-selection Z translationhwc4872012-04-02
| * | | Snapping fixes.hwc4872012-04-02
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna...hwc4872012-03-29
| |\ \ \
| * | | | merge from mainhwc4872012-03-29
* | | | | Merge pull request #155 from ericguzman/PresetsPIValerio Virgillito2012-04-05
|\ \ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \ \
| * | | | | | Presets Controller - Update to not use "_element" property of selection.Eric Guzman2012-04-04
* | | | | | | Merge pull request #158 from ananyasen/integration-candidateValerio Virgillito2012-04-05
|\ \ \ \ \ \ \
| * | | | | | | - disable ok when text box is cleared using backspace and cross, for file nam...Ananya Sen2012-04-04
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #153 from mencio/componentsValerio Virgillito2012-04-05
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fixing the number fields to not have units.Valerio Virgillito2012-04-04
| * | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | removing some of the button propertiesValerio Virgillito2012-03-30
| * | | | | | | Merge branch 'components' of github.com:mencio/ninja-internal into componentsValerio Virgillito2012-03-30
| |\ \ \ \ \ \ \
| | * | | | | | | completing the component simple piValerio Virgillito2012-03-30
| * | | | | | | | completing the component simple piValerio Virgillito2012-03-30
| |/ / / / / / /
| * | | | | | | IKNINJA-1191 - Fixed the order of the componentsValerio Virgillito2012-03-30
| * | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-30
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Removing properties from Montage componentsValerio Virgillito2012-03-28
| * | | | | | | removed trace statementValerio Virgillito2012-03-27
| * | | | | | | Cleanup of the components panelValerio Virgillito2012-03-26
* | | | | | | | Merge pull request #157 from ananyasen/ninja-internal-master-patch1Valerio Virgillito2012-04-04
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #156 from mayhewinator/WorkingBranchValerio Virgillito2012-04-04
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor...John Mayhew2012-04-04
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #154 from mqg734/ToolFixesValerio Virgillito2012-04-04
|\ \ \ \ \ \ \
| * | | | | | | Need to set elementModel.isIn2DSnapCache flag to false when removing element ...Nivesh Rajbhandari2012-04-04
* | | | | | | | Merge pull request #149 from dhg637/BugFixesValerio Virgillito2012-04-04
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge branch 'refs/heads/master' into BugFixesArmen Kesablyan2012-04-04
| |\| | | | | | |
| * | | | | | | | Bug #1060: Fixed CSS Lint issueArmen Kesablyan2012-03-30
| * | | | | | | | Bug Fix: Height and width of panels not be keptArmen Kesablyan2012-03-29
| * | | | | | | | Resizing BugsArmen Kesablyan2012-03-29
| * | | | | | | | Bug #1073: Panels interact with hottest drag dropArmen Kesablyan2012-03-28
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #150 from ericguzman/PresetsPIValerio Virgillito2012-04-04
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-04-04
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| |_|_|_|_|/ |/| | | | |
| * | | | | Animation Presets - Only combine animations if pre-existing animations existEric Guzman2012-04-02
| * | | | | Presets Controller - Remove unused method callEric Guzman2012-03-30
| * | | | | Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-29
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Presets - Remove style transition when transition doesn't start. Also added t...Eric Guzman2012-03-29
| | | | * | removed unnecessary call to exportMaterials from init(). this call should not...John Mayhew2012-04-04