aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
|\
| * Merge pull request #17 from ericmueller/integrationJose Antonio Marquez Russo2012-02-23
| |\ | | | | | | Integration
| | * Adding bug fixes.hwc4872012-02-22
| | |
* | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-23
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
| |\ \
| | * | Removing unused method that was using snapManager.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Integrating Zoom tool fixes.Nivesh Rajbhandari2012-02-22
| | |/ | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * / renaming makeElementModel2 to makeModelFromElementValerio Virgillito2012-02-23
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* / switch html document - re-initialize draw-utils and snap-manager on opening ↵Ananya Sen2012-02-23
|/ | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Fixing the getStageWorldToGlobalMatrix bugValerio Virgillito2012-02-16
| | | | | | removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\
| * Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merging snap manager fix for infinite projection errors when stage view is ↵Nivesh Rajbhandari2012-02-08
| | | | | | | | | | | | | | | | | | changed to top or side. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merging fix for marquee selection that accounts for 3d values.Nivesh Rajbhandari2012-02-08
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
|\ \ \ | | |/ | |/|
| * | bug fixes for better anchor point rotation and removing snapping on hover ↵Pushkar Joshi2012-02-08
| |/ | | | | | | and mouse down
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\|
| * Attempt to fix initialization bug for snap-managerJose Antonio Marquez2012-02-06
| |
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\|
| * Handle delete of multiple objects. Also, have deletion go through the ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * Integrating Pan and Zoom tool and snap manager fixes.Nivesh Rajbhandari2012-02-02
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Adding legal attribution for decompose matrix routine.Nivesh Rajbhandari2012-02-02
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Syncing stage view when rotating stage.Nivesh Rajbhandari2012-01-30
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>