aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'GIO-TextTool' of https://github.com/dhg637/ninja-internalValerio Virgillito2012-07-09
|\
| * Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-03
| |\
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-07-03
| | |\
| * | | Text Tool 2Armen Kesablyan2012-07-03
| * | | Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-02
| |\| |
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-07-02
| | |\ \
| * | | | Bug: Font Name & Size not updating text toolArmen Kesablyan2012-07-02
| |/ / /
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-28
| |\ \ \
* | \ \ \ Merge branch 'Taper' of https://github.com/ericmueller/ninja-internalValerio Virgillito2012-07-09
|\ \ \ \ \
| * | | | | 'V' texture map coordinate was inverted in some cases.hwc4872012-06-29
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taperhwc4872012-06-29
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taperhwc4872012-06-28
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Added capability to split a mesh into multiiple parts to avoid buffer overflo...hwc4872012-06-28
* | | | | | | Merge pull request #375 from mencio/manifestValerio Virgillito2012-07-09
|\ \ \ \ \ \ \
| * | | | | | | updating the manifestValerio Virgillito2012-07-09
|/ / / / / / /
* | | | | | | Merge pull request #372 from mencio/youtube-fixValerio Virgillito2012-07-09
|\ \ \ \ \ \ \
| * | | | | | | Removing the youtube hack now that we have the proper fix from montageValerio Virgillito2012-07-03
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #371 from ananyasen/menu-bug-fixValerio Virgillito2012-07-09
|\ \ \ \ \ \ \
| * | | | | | | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up and no...Ananya Sen2012-07-03
| |/ / / / / /
* | | | | | | Merge pull request #368 from mqg734/CopyPasteWebGLValerio Virgillito2012-07-09
|\ \ \ \ \ \ \
| * | | | | | | IKNinja-1736 and IKNinja-1802 - Copy paste WebGL bugs.Nivesh Rajbhandari2012-07-02
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #366 from joseeight/ColorValerio Virgillito2012-07-09
|\ \ \ \ \ \ \
| * | | | | | | Fix: IKNINJA-1634Jose Antonio Marquez2012-07-02
| |/ / / / / /
* | | | | | | Merge pull request #364 from ananyasen/bugfix-masterValerio Virgillito2012-07-09
|\ \ \ \ \ \ \
| * | | | | | | removing unnecessary variableAnanya Sen2012-06-29
| * | | | | | | Fixed IKNINJA-1763, IKNINJA-1807 - refresh stage after loading is done for im...Ananya Sen2012-06-29
* | | | | | | | Merge pull request #357 from ericmueller/GridFixesValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes a bug in rectangle containment test.hwc4872012-06-29
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri...hwc4872012-06-29
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Fixes for incorrect line/polygon intersections.hwc4872012-06-28
* | | | | | | | | Merge pull request #346 from mqg734/MaterialsUIValerio Virgillito2012-07-09
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | adding missing copyright to the feed reader.Valerio Virgillito2012-07-06
* | | | | | | | | | Merge pull request #373 from kriskowal/bsdValerio Virgillito2012-07-06
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Update copyright boilerplateKris Kowal2012-07-06
|/ / / / / / / / /
* | | | | | | | | adding missing montage to the user library and temporary fix for picas screen...Valerio Virgillito2012-07-03
* | | | | | | | | Merge pull request #369 from aadsm/gh-329_template-creator-restores-elementValerio Virgillito2012-07-03
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | gh-329 Make Template Creator restore the elements after serializationAntónio Afonso2012-07-03
|/ / / / / / / /
| * | | | | | | PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
| * | | | | | | IKNINJA-1246 - Line drawing feedback disappears when using no-color or gradie...Nivesh Rajbhandari2012-07-09
| * | | | | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-02
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | updating to version 7.0Valerio Virgillito2012-06-29
* | | | | | | | Merge pull request #360 from joseeight/DocumentValerio Virgillito2012-06-29
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #363 from ericguzman/stylesControllerPatch_6_29Valerio Virgillito2012-06-29
|\ \ \ \ \ \ \ \
| * | | | | | | | Another null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| * | | | | | | | Null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| * | | | | | | | Styles Controller - getMatchingRules - Add forgotten return statementEric Guzman2012-06-29
| * | | | | | | | Styles controller - adding check for attached element in getMatchedCSSRulesEric Guzman2012-06-29
| * | | | | | | | Styles Controller Patch to ignore unfound rules from getMatchedCSSRulesEric Guzman2012-06-29