Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | * | | | | | | | | | | Fix for a marquee zoom bug. | hwc487 | 2012-02-01 | |
| | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | mouse wheel for zoom tool | hwc487 | 2012-02-01 | |
| | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-02-01 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | changes to allow minimal rendering ofnon-animated materials. | hwc487 | 2012-02-01 | |
| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working | hwc487 | 2012-01-31 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/stage/stage.reel/stage.js | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-01-31 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working | |||
| | | * | | | | | | | | | | | | | Renderer startup handling of non-animated materials. | hwc487 | 2012-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 ↵ | hwc487 | 2012-01-30 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working | |||
| | | * | | | | | | | | | | | | | | updated from old repo | hwc487 | 2012-01-27 | |
| | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-02-02 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | make GLAnchorPoint functions as part of its prototype | Pushkar Joshi | 2012-02-01 | |
| | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | avoid overriding GlGeomObj translate method | Pushkar Joshi | 2012-02-01 | |
| | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | when selecting anchor points, first check if the selected anchor position is ↵ | Pushkar Joshi | 2012-02-01 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | close enough | |||
| | * | | | | | | | | | | | | | | | performance improvement: add most of the GLSubpath functions to its prototype | Pushkar Joshi | 2012-02-01 | |
| | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | handle the case of proper redraw when the alt key is held down even after ↵ | Pushkar Joshi | 2012-01-31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mouse up | |||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-01-31 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | display the anchor point to be selected on mouse hover | Pushkar Joshi | 2012-01-31 | |
| | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | do the fill before the stroke for the path, so the stroke width renders acc. ↵ | Pushkar Joshi | 2012-01-30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to user specification | |||
| | * | | | | | | | | | | | | | | | | missed a couple of pen tool property files on last checkin | Pushkar Joshi | 2012-01-30 | |
| | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | Merge pushkar branch on gerritt with github version | Pushkar Joshi | 2012-01-30 | |
| | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | adding oneway to the 3d bindings to fix a bug where the stage was getting ↵ | Valerio Virgillito | 2012-02-09 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selected. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
* | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-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 Sen | 2012-02-09 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
* | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: index.html | |||
| * | | | | | | | | | | | | | | | | | Merge pull request #29 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-02-09 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | Updates for Splash screen, icon, license page and credits page | |||
| | * | | | | | | | | | | | | | | | | removed null characters at the end of this file that made GIT treat it as a ↵ | John Mayhew | 2012-02-09 | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |