aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| | * | | | | | | | | | | | | | | merge new timelineJonathan Duran2012-02-06
| * | | | | | | | | | | | | | | | Fixed bad merge in FlatMaterials.Nivesh Rajbhandari2012-02-09
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #26 from pushkarjoshi/pentoolValerio Virgillito2012-02-09
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | fill all paths even if they are openPushkar Joshi2012-02-08
| | | * | | | | | | | | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-08
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | bug fixes for better anchor point rotation and removing snapping on hover and...Pushkar Joshi2012-02-08
| | | * | | | | | | | | | | | | | | | 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 fix...Pushkar Joshi2012-02-07
| | | * | | | | | | | | | | | | | | | 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
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into wor...hwc4872012-01-31
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | Renderer startup handling of non-animated materials.hwc4872012-01-30
| | | | * | | | | | | | | | | | | | | | | | Merge branch 'staging' of github.com:Motorola-Mobility/ninja-internal into wo...hwc4872012-01-30
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | | | | | | | | | | | avoid overriding GlGeomObj translate methodPushkar Joshi2012-02-01
| | | * | | | | | | | | | | | | | | | | | | | when selecting anchor points, first check if the selected anchor position is ...Pushkar Joshi2012-02-01
| | | * | | | | | | | | | | | | | | | | | | | performance improvement: add most of the GLSubpath functions to its prototypePushkar Joshi2012-02-01
| | | * | | | | | | | | | | | | | | | | | | | handle the case of proper redraw when the alt key is held down even after mou...Pushkar Joshi2012-01-31
| | | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-01-31
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | display the anchor point to be selected on mouse hoverPushkar Joshi2012-01-31
| | | * | | | | | | | | | | | | | | | | | | | | do the fill before the stroke for the path, so the stroke width renders acc. ...Pushkar Joshi2012-01-30
| | | * | | | | | | | | | | | | | | | | | | | | missed a couple of pen tool property files on last checkinPushkar Joshi2012-01-30
| | | * | | | | | | | | | | | | | | | | | | | | Merge pushkar branch on gerritt with github versionPushkar Joshi2012-01-30
| | | | |_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | adding oneway to the 3d bindings to fix a bug where the stage was getting sel...Valerio Virgillito2012-02-09
| | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into SnapManagerFixesNivesh Rajbhandari2012-02-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Changed the rendering for canvas 2D rectangle.Nivesh Rajbhandari2012-02-09
| * | | | | | | | | | | | | | | | | | | | | | Reversed the orientation of one of the triangles for WebGL rendering.Nivesh Rajbhandari2012-02-09
| * | | | | | | | | | | | | | | | | | | | | | Fixed runtime error when using 3d tools without any items selected.Nivesh Rajbhandari2012-02-09
| * | | | | | | | | | | | | | | | | | | | | | Merging snap manager fix for infinite projection errors when stage view is ch...Nivesh Rajbhandari2012-02-08
| * | | | | | | | | | | | | | | | | | | | | | Merging fix for marquee selection that accounts for 3d values.Nivesh Rajbhandari2012-02-08
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fixed several typos in Materials import/export code to support toggling betwe...Nivesh Rajbhandari2012-02-08
| * | | | | | | | | | | | | | | | | | | | | Fixed radio button to update 3d values when switching from local to global an...Nivesh Rajbhandari2012-02-08