aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can...hwc4872012-04-24
|\
| * Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\
| * | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| * | adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| * | more backup fixes for the old stageValerio Virgillito2012-04-20
| * | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| * | Merge branch 'refs/heads/Document' into stage-document-architectureValerio Virgillito2012-04-19
| |\ \
| | * \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-16
| | |\ \
| | * \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-11
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-10
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-04
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-04
| | |\ \ \ \ \ \
| | * | | | | | | Backup for mergeJose Antonio Marquez2012-04-04
| | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-02
| | |\ \ \ \ \ \ \
| | * | | | | | | | Setting up document reworkJose Antonio Marquez2012-04-02
| * | | | | | | | | typo fixValerio Virgillito2012-04-19
| * | | | | | | | | initial stage web templateValerio Virgillito2012-04-18
* | | | | | | | | | canvas interactionhwc4872012-04-23
* | | | | | | | | | limitshwc4872012-04-23
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'refs/heads/master' into cleanupValerio Virgillito2012-04-19
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #168 from mqg734/EricMergeValerio Virgillito2012-04-19
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Moving initialzeSnapping routine from RotateObject3DTool tool to Rotate3DTool...Nivesh Rajbhandari2012-04-18
| | * | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fixing some more merge issues.Nivesh Rajbhandari2012-04-18
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ 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 Sna...hwc4872012-04-13
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | |
| | | * | | | | | | | | | 3D Rotate changeshwc4872012-04-13
| | | * | | | | | | | | | 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
| * | | | | | | | | | | | | | Merge pull request #167 from mqg734/BoundsCalculationValerio Virgillito2012-04-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Grid should redraw on elementChanging as well as elementChange.Nivesh Rajbhandari2012-04-17
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
* | / | | | | | | | | | | | | cleanup unused code.Valerio Virgillito2012-04-19
|/ / / / / / / / / / / / / /
* | | | | | | | / / / / / / Squashed commit of the following:Valerio Virgillito2012-04-18
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Adding back setProperties for canvas because width and height values need to ...Nivesh Rajbhandari2012-04-17
* | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-04-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #165 from mqg734/BoundsCalculationValerio Virgillito2012-04-17
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Drag and drop of images and components should not add 3d values by default.Nivesh Rajbhandari2012-04-16
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #164 from mqg734/ToolTipFixesValerio Virgillito2012-04-17
| |\ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 05:35:57 +0000