Re: Font fallback support
Posted: Thu Dec 18, 2014 12:21
Hi, please rebase against CEGUI default. Your contribution can't be cleanly applied because there were too many changes between 0.7 and 0.8.
Rejects from the first diff:
Caused by file renames.
Ideally squash it into a single commit with no indentation issues. No idea why you can't pull request, that should be possible and many people do it all the time.
Rejects from the first diff:
Code: Select all
unable to find 'cegui/include/CEGUIConfig_xmlHandler.h' for patching
4 out of 4 hunks FAILED -- saving rejects to file cegui/include/CEGUIConfig_xmlHandler.h.rej
unable to find 'cegui/include/CEGUIFont.h' for patching
3 out of 3 hunks FAILED -- saving rejects to file cegui/include/CEGUIFont.h.rej
unable to find 'cegui/include/CEGUIFont_xmlHandler.h' for patching
1 out of 1 hunks FAILED -- saving rejects to file cegui/include/CEGUIFont_xmlHandler.h.rej
unable to find 'cegui/include/CEGUIFreeTypeFont.h' for patching
1 out of 1 hunks FAILED -- saving rejects to file cegui/include/CEGUIFreeTypeFont.h.rej
unable to find 'cegui/include/CEGUIPixmapFont.h' for patching
1 out of 1 hunks FAILED -- saving rejects to file cegui/include/CEGUIPixmapFont.h.rej
unable to find 'cegui/include/CEGUISystem.h' for patching
6 out of 6 hunks FAILED -- saving rejects to file cegui/include/CEGUISystem.h.rej
unable to find 'cegui/src/CEGUIConfig_xmlHandler.cpp' for patching
4 out of 4 hunks FAILED -- saving rejects to file cegui/src/CEGUIConfig_xmlHandler.cpp.rej
unable to find 'cegui/src/CEGUIFont.cpp' for patching
5 out of 5 hunks FAILED -- saving rejects to file cegui/src/CEGUIFont.cpp.rej
unable to find 'cegui/src/CEGUIFont_xmlHandler.cpp' for patching
2 out of 2 hunks FAILED -- saving rejects to file cegui/src/CEGUIFont_xmlHandler.cpp.rej
unable to find 'cegui/src/CEGUIFreeTypeFont.cpp' for patching
2 out of 2 hunks FAILED -- saving rejects to file cegui/src/CEGUIFreeTypeFont.cpp.rej
unable to find 'cegui/src/CEGUIPixmapFont.cpp' for patching
1 out of 1 hunks FAILED -- saving rejects to file cegui/src/CEGUIPixmapFont.cpp.rej
unable to find 'cegui/src/CEGUISystem.cpp' for patching
6 out of 6 hunks FAILED -- saving rejects to file cegui/src/CEGUISystem.cpp.rej
abort: patch failed to apply
Caused by file renames.
Ideally squash it into a single commit with no indentation issues. No idea why you can't pull request, that should be possible and many people do it all the time.