aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | | * | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | avoid overriding GlGeomObj translate methodPushkar Joshi2012-02-01
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | when selecting anchor points, first check if the selected anchor position is ↵Pushkar Joshi2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | close enough
| | * | | | | | | | | | | | | | | | | | | | | 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 ↵Pushkar Joshi2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mouse up
| | * | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to user specification
| | * | | | | | | | | | | | | | | | | | | | | | 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 ↵Valerio Virgillito2012-02-09
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selected. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/fileio.js js/mediators/io-mediator.js
| * | | | | | | | | | | | | | | | | | | | | | fixed templates descriptor, changed validation to on key up, fixed minor ui ↵Ananya Sen2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |