aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
|\
| * Merge pull request #315 from mqg734/IKNinja_1671Valerio Virgillito2012-06-20
| |\ | | | | | | IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated in negative space.
| | * Merge branch 'refs/heads/ninja-internal' into IKNinja_1671Nivesh Rajbhandari2012-06-20
| | |\
| | * | IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated ↵Nivesh Rajbhandari2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in negative space. I fixed this temporarily by disabling the auto stage scroll calculations when we modify matrices. The correct fix will be to update any matrices and local2Global caches if we update the stage's padding (which I'm doing in a separate fix for a single draw cycle for the stage, but that fix is not ready yet). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
|\| | |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-06-20
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-20
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'refs/heads/master' into montage-v11-integrationValerio Virgillito2012-06-18
| |\ \ \
| * | | | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'refs/heads/ninja-internal' into GIO_FixesNivesh Rajbhandari2012-06-19
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge pull request #298 from ericmueller/TexturesValerio Virgillito2012-06-19
| | |\ \ \ | | | |_|/ | | |/| | Textures
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-14
| | | |\| | | | | | | | | | | | | | | | Textures
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
| | | |\ \ | | | | | | | | | | | | | | | | | | Textures
| | | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| | | * | | | Removed references to NJUtilshwc4872012-06-12
| | | | | | |
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-12
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js
| | | * \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | | * \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-31
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| | | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-17
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | | * | | | | | | | Fixing merge issueshwc4872012-05-14
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-11
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
| | | * \ \ \ \ \ \ \ \ Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textureshwc4872012-05-03
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Updated hard-coded linear and radial gradients to use the color values in ↵Nivesh Rajbhandari2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linear/RadialGradientMaterials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-02
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | Textures
| | | * | | | | | | | | | Material editorhwc4872012-05-02
| | | | | | | | | | | | |
| * | | | | | | | | | | | IKNINJA-1519 - Transform tool does not transform objects correctly in 3D ↵Nivesh Rajbhandari2012-06-19
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | space or in Top/Side view. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fixing apply 'no color'Jose Antonio Marquez2012-06-15
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix canvas and standard DOM elements including the root (body or template wrapper).
| * | | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-13
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | fixed document switching issuesValerio Virgillito2012-06-12
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * / | | | | | | | fix bug #1718 (trying to delete a non-existent canvas)Pushkar Joshi2012-06-13
| |/ / / / / / / /
| * | | | | | | | correct mouse cursor on mousemovePushkar Joshi2012-06-12
| | | | | | | | |
| * | | | | | | | allow the addition of anchor points to a closed path (the mouse move cursor ↵Pushkar Joshi2012-06-12
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | still needs to be updated)
| * | | | | | | Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
| |\ \ \ \ \ \ \
| * | | | | | | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-11
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | |