| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-23 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/snap-manager.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| | * | | | switch html document - re-initialize draw-utils and snap-manager on opening ↵ | Ananya Sen | 2012-02-23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-24 | |
| |\ \ \ \ | |_|_|/ |/| | | | ||||
| | * | | | Javascript does not evaluate a return with its expression in a new line. The ↵ | Nivesh Rajbhandari | 2012-02-24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | return expression must begin on the same line as the return keyword. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | Removing duplicate get/setElementPlanes method. | Nivesh Rajbhandari | 2012-02-24 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | Merge pull request #17 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-02-23 | |
| |\ \ \ \ | |_|_|/ |/| | | | Integration | |||
| | * | | | Adding bug fixes. | hwc487 | 2012-02-22 | |
| | | |/ | |/| | ||||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 | |
| |\ \ \ | | |/ | |/| | ||||
| | * | | Removing unused method that was using snapManager. | Nivesh Rajbhandari | 2012-02-22 | |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | Integrating Zoom tool fixes. | Nivesh Rajbhandari | 2012-02-22 | |
| | |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * / | renaming makeElementModel2 to makeModelFromElement | Valerio Virgillito | 2012-02-23 | |
| |/ | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | Fixing the getStageWorldToGlobalMatrix bug | Valerio Virgillito | 2012-02-16 | |
| | | | | | | | removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 | |
| |\ | ||||
| | * | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-02-08 | |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 | |
| |\ \ \ | | |/ | |/| | ||||
| | * | | bug fixes for better anchor point rotation and removing snapping on hover ↵ | Pushkar Joshi | 2012-02-08 | |
| | |/ | | | | | | | and mouse down | |||
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 | |
| |\| | ||||
| | * | Attempt to fix initialization bug for snap-manager | Jose Antonio Marquez | 2012-02-06 | |
| | | | ||||
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 | |
| |\| | ||||
| | * | Handle delete of multiple objects. Also, have deletion go through the ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-02-03 | |
| | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 | |
| |\| | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | |||
| | * | Integrating Pan and Zoom tool and snap manager fixes. | Nivesh Rajbhandari | 2012-02-02 | |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | Adding legal attribution for decompose matrix routine. | Nivesh Rajbhandari | 2012-02-02 | |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | Syncing stage view when rotating stage. | Nivesh Rajbhandari | 2012-01-30 | |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 | |
| |/ | ||||
| * | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 | |
| Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | ||||