Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Drag plane not being set. Injection from a recent checkin of mine. | hwc487 | 2012-05-14 |
| | |||
* | removed some console output. | hwc487 | 2012-05-14 |
| | |||
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs | hwc487 | 2012-05-11 |
|\ | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js | ||
* | | Fixed an inaccuracy snapping to the stage. | hwc487 | 2012-05-10 |
|/ | |||
* | fixes for 2D and 3D translation. | hwc487 | 2012-05-07 |
| | |||
* | Offset side and top working planes by half the stage width/height. | Nivesh Rajbhandari | 2012-05-01 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Creating shapes in a container | hwc487 | 2012-04-27 |
| | |||
* | canvas interaction | hwc487 | 2012-04-26 |
| | |||
* | canvas interaction | hwc487 | 2012-04-23 |
| | |||
* | Allow snapping to unselected objects | hwc487 | 2012-04-17 |
| | |||
* | 3D rotation | hwc487 | 2012-04-13 |
| | |||
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-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 | ||
| * | offsets should be calculated on offsetParent instead of parentElement. | Nivesh Rajbhandari | 2012-04-11 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Single perspective fix. | Nivesh Rajbhandari | 2012-04-09 |
| | | | | | | | | | | | | Note that rotating multiple objects when the stage is rotated still doesn't work and flatten still doesn't work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Adding replaceElement routine and event so Timeline can avoid removing and ↵ | Nivesh Rajbhandari | 2012-04-04 |
| | | | | | | | | | | | | adding layers and PI and SelectionController can avoid deselecting and reselecting the element. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | translate3DObject tool fixes. | hwc487 | 2012-04-05 |
|/ | |||
* | Need to set elementModel.isIn2DSnapCache flag to false when removing element ↵ | Nivesh Rajbhandari | 2012-04-04 |
| | | | | | | from SnapManager's cache. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 |
| | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | File IO for the brush stroke AND changing the data type of brush stroke from ↵ | Pushkar Joshi | 2012-03-27 |
| | | | | GEOM_TYPE_CUBIC_BEZIER to GEOM_TYPE_BRUSH_STROKE | ||
* | Fixed snap-manager to stop snapping after first level children. | Nivesh Rajbhandari | 2012-03-17 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-03-06 |
|\ | |||
| * | Squashed commit of preload-fix into Master | Valerio Virgillito | 2012-03-06 |
| | | | | | | | | | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Create drag plane parallel to working plane and offset by where the user ↵ | Nivesh Rajbhandari | 2012-03-06 |
|/ | | | | | | clicked in z. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Fix for elements flying off into space when moving elements that overlap. | Nivesh Rajbhandari | 2012-03-01 |
| | | | | | | This was happening because our hit record's element and the browser's element from point did not match. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | SnapManager fixes for sag tags. | Nivesh Rajbhandari | 2012-02-29 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
|\ | |||
| * | 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> | ||
* | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
|\ | |||
| * | 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> | ||
* | | 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-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> | ||
* | | 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> |