aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
* Merge from /joseeight/ninja-internal/tree/FileIOAnanya Sen2012-02-10
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@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>
| * | Fixed runtime error when using 3d tools without any items selected.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | 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
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into pentoolPushkar Joshi2012-02-08
| |\| | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
| * | bug fixes for better anchor point rotation and removing snapping on hover ↵Pushkar Joshi2012-02-08
| | | | | | | | | | | | and mouse down
| * | some minor bug fixes and code cleanupPushkar Joshi2012-02-07
| | |
| * | Merge branch 'master' into pentoolPushkar Joshi2012-02-07
| |\ \
| * \ \ Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentoolPushkar Joshi2012-02-02
| |\ \ \
| | * | | listen for the appMouseUp event in the Pan toolhwc4872012-02-01
| | | | |
| | * | | Fix for a marquee zoom bug.hwc4872012-02-01
| | | | |
| | * | | mouse wheel for zoom toolhwc4872012-02-01
| | | | |
| | * | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-01-31
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/stage/stage.reel/stage.js
| | * | | | updated from old repohwc4872012-01-27
| | | | | |
| * | | | | avoid overriding GlGeomObj translate methodPushkar Joshi2012-02-01
| | | | | |
| * | | | | handle the case of proper redraw when the alt key is held down even after ↵Pushkar Joshi2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | mouse up
| * | | | | display the anchor point to be selected on mouse hoverPushkar Joshi2012-01-31
| | | | | |
| * | | | | Merge pushkar branch on gerritt with github versionPushkar Joshi2012-01-30
| |/ / / /
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ \ \ \ | | | | | | | | | | | | Pi bugs fixes for 964, 616, 1084
| | * | | | IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel.Valerio Virgillito2012-02-07
| | | |_|/ | | |/| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Updated tools and PI to get/set materials by binding to appModel's materials ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
| |/ / / | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\| | |
| * | | Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
| |\ \ \ | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Removed border special-casing from PI since the mediator now handles this ↵Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generically. Updated mediator's set stroke routine to use the setColor routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | |/ / | | | | | | | | | | | | 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>
| * | Forgot to remove a require in previous checkin.Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | 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>