aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | | | | | | | | 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>
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #26 from pushkarjoshi/pentoolValerio Virgillito2012-02-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pentool
| | | | * | | | | | | | | | | | | | | fill all paths even if they are openPushkar Joshi2012-02-08
| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | 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
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | don't use colorToHex function because it only works for 3D color (needs a ↵Pushkar Joshi2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix to colorToHex)
| | | | * | | | | | | | | | | | | | | Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentoolPushkar Joshi2012-02-02
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Removed a console log and set the Plasma material to animating.hwc4872012-02-01
| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Fixed plane orientations for view orientations other than front.hwc4872012-02-01
| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | listen for the appMouseUp event in the Pan toolhwc4872012-02-01
| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | factor in the zoom factor when drawing the stage compass.hwc4872012-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-02-01
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | changes to allow minimal rendering ofnon-animated materials.hwc4872012-02-01
| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-01-31
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/stage/stage.reel/stage.js
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-31
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working
| | | | | * | | | | | | | | | | | | | | | | Renderer startup handling of non-animated materials.hwc4872012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed zoom from the document bar to keep the location center of the viewable portion of the document fixed.
| | | | | * | | | | | | | | | | | | | | | | Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-01-30
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working
| | | | | * | | | | | | | | | | | | | | | | | updated from old repohwc4872012-01-27
| | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-02
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | make GLAnchorPoint functions as part of its prototypePushkar Joshi2012-02-01
| | | | | | | | | | | | |