aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-20
|\
| * Merge pull request #170 from mayhewinator/WorkingBranchmayhewinator2012-04-19
| |\ | | | | | | Set the proper host permissions for Ninja in our manifest.json
| | * Removed hack that required us to use a bogus url for host permissions. ↵John Mayhew2012-04-19
| | | | | | | | | | | | | | | | | | Chrome 18 now sends the "Origin" request header if we request host permissions for http://localhost:/ Setting the new and proper host permissions.
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-04-19
| |\ \
| | * | Merge pull request #169 from mayhewinator/WorkingBranchValerio Virgillito2012-04-19
| | |\| | | | | | | | | Updated Manifest.json for the CRX build
| | | * Updated Manifest.json for the CRX buildJohn Mayhew2012-04-19
| | |/
| * | Merge branch 'refs/heads/master' into cleanupValerio Virgillito2012-04-19
| |\|
| * | cleanup unused code.Valerio Virgillito2012-04-19
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into ↵Jonathan Duran2012-04-19
|\ \ \ | | | | | | | | | | | | TimelineUber
| * | | BreadCrumb Bug FixKruti Shah2012-04-19
| | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-19
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #168 from mqg734/EricMergeValerio Virgillito2012-04-19
| |\ \ \ | | | | | | | | | | Merging Eric's snapping and tool fixes into master.
| | * | | Moving initialzeSnapping routine from RotateObject3DTool tool to ↵Nivesh Rajbhandari2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rotate3DToolBase so Rotate Stage uses the same code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Fixing some more merge issues.Nivesh Rajbhandari2012-04-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * \ \ \ Merge branch 'refs/heads/Snapping_II' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ \
| | | * | | | Allow snapping to unselected objectshwc4872012-04-17
| | | | | | |
| | | * | | | snapping for stage rotation toolhwc4872012-04-16
| | | | | | |
| | | * | | | 3D translation fixeshwc4872012-04-16
| | | | | | |
| | | * | | | 3D rotationhwc4872012-04-13
| | | | | | |
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-13
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping_II Conflicts: js/helper-classes/3D/view-utils.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js js/tools/Translate3DToolBase.js
| | | * | | | | 3D Rotate changeshwc4872012-04-13
| | | | | | | |
| | | * | | | | Rotate3D tool changeshwc4872012-04-11
| | | | | | | |
| | | * | | | | Merge branch 'Snapping' of github.com:ericmueller/ninja-internal into ↵hwc4872012-04-05
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping_II
| | | | * | | | | translate3DObject tool fixes.hwc4872012-04-05
| | | | | | | | |
| | | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-04
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping Conflicts: js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js
| | | | * | | | | | 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 ↵hwc4872012-04-03
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping
| | | | * | | | | | | Translate 3D fix for multi-selection Z translationhwc4872012-04-02
| | | | | | | | | | |
* | | | | | | | | | | Remove more unneeded requiresJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | Remove unneeded requireJonathan Duran2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-19
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #167 from mqg734/BoundsCalculationValerio Virgillito2012-04-18
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | Grid should redraw on elementChanging as well as elementChange.
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-17
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Grid should redraw on elementChanging as well as elementChange.Nivesh Rajbhandari2012-04-17
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Squashed commit of the following:Valerio Virgillito2012-04-18
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |