Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into GIO-TextTool | Armen Kesablyan | 2012-07-03 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-07-03 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | Text Tool 2 | Armen Kesablyan | 2012-07-03 | |
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into GIO-TextTool | Armen Kesablyan | 2012-07-02 | |
| |\| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-07-02 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | ||||
| * | / | | | | | | | | | | | | | Bug: Font Name & Size not updating text tool | Armen Kesablyan | 2012-07-02 | |
| |/ / / / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge branch 'Taper' of https://github.com/ericmueller/ninja-internal | Valerio Virgillito | 2012-07-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | 'V' texture map coordinate was inverted in some cases. | hwc487 | 2012-06-29 | |
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper | hwc487 | 2012-06-29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper | hwc487 | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | Added capability to split a mesh into multiiple parts to avoid buffer overflo... | hwc487 | 2012-06-28 | |
* | | | | | | | | | | | | | | | | | Merge pull request #375 from mencio/manifest | Valerio Virgillito | 2012-07-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | updating the manifest | Valerio Virgillito | 2012-07-09 | |
|/ / / / / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #372 from mencio/youtube-fix | Valerio Virgillito | 2012-07-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | Removing the youtube hack now that we have the proper fix from montage | Valerio Virgillito | 2012-07-03 | |
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #371 from ananyasen/menu-bug-fix | Valerio Virgillito | 2012-07-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up and no... | Ananya Sen | 2012-07-03 | |
| |/ / / / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #368 from mqg734/CopyPasteWebGL | Valerio Virgillito | 2012-07-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs. | Nivesh Rajbhandari | 2012-07-02 | |
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #366 from joseeight/Color | Valerio Virgillito | 2012-07-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | Fix: IKNINJA-1634 | Jose Antonio Marquez | 2012-07-02 | |
| |/ / / / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #364 from ananyasen/bugfix-master | Valerio Virgillito | 2012-07-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | removing unnecessary variable | Ananya Sen | 2012-06-29 | |
| * | | | | | | | | | | | | | | | | | Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading is done for im... | Ananya Sen | 2012-06-29 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #357 from ericmueller/GridFixes | Valerio Virgillito | 2012-07-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Fixes a bug in rectangle containment test. | hwc487 | 2012-06-29 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri... | hwc487 | 2012-06-29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Fixes for incorrect line/polygon intersections. | hwc487 | 2012-06-28 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #346 from mqg734/MaterialsUI | Valerio Virgillito | 2012-07-09 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUI | Nivesh Rajbhandari | 2012-07-09 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | PI, drawing and editing fixes for shapes and materials. | Nivesh Rajbhandari | 2012-07-09 | |
| * | | | | | | | | | | | | | | | | | IKNINJA-1246 - Line drawing feedback disappears when using no-color or gradie... | Nivesh Rajbhandari | 2012-07-09 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUI | Nivesh Rajbhandari | 2012-07-02 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | Performance fix for WebGL materials playing even when the dialog/file is no l... | Nivesh Rajbhandari | 2012-06-27 | |
| * | | | | | | | | | | | | | | | | | Integrating Materials UI changes. Squashed commit of the following: | Nivesh Rajbhandari | 2012-06-27 | |
| | | | | | | | | | * | | | | | | | | removed unnecessary todo comments | Ananya Sen | 2012-07-09 | |
| | | | | | | | | | * | | | | | | | | Removed the customized xq-dark and lesser-dark themes temporarily until copyr... | Ananya Sen | 2012-07-09 | |
| |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | John Mayhew | 2012-07-09 | |
| | | | | | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |