Commit Graph

94 Commits

Author SHA1 Message Date
minggo ccbd0a831d issue #2304:use function to simplify acceremeter call back 2013-06-19 16:10:53 +08:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
Maciej Czerniak 1e71ea85f3 add Polish language support 2013-06-11 16:46:38 +02:00
Maciej Czerniak eb79c01003 add missing Norwegian language for linux platform 2013-06-11 16:39:33 +02:00
Rene Klacan c8b4291731 keyboard support throught compiler directive 2013-06-02 04:11:43 +02:00
Rene Klacan 50ad3e1c80 KeyboardDispatcher + tests for it on linux 2013-05-31 14:29:32 +02:00
James Chen 93a8b60111 If file path is an empty string, return false directly in CCFileUtils::isFileExist. 2013-04-25 21:51:13 +08:00
yodesoft 5952597c1a Set writable path to XDG_CONFIG_HOME if it exists. 2013-04-11 09:20:25 +08:00
yodesoft cda864b597 Read app name from /proc/self/exe 2013-04-11 08:58:48 +08:00
yodesoft db5df829fb Restore codes of init m_strDefaultResRootPath 2013-04-10 18:39:01 +08:00
yodesoft 85c932112f Merge remote-tracking branch 'upstream/master' 2013-04-10 17:54:50 +08:00
James Chen 32406efec2 Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog
Conflicts:
	cocos2dx/proj.linux/cocos2dx.mk
2013-04-10 14:17:23 +08:00
yodesoft e193dbc4cf Linux: Set writable path to "<user's home>/.config/<app name>" 2013-04-10 11:45:55 +08:00
yodesoft d03b95ca46 Merge remote-tracking branch 'upstream/master'
Conflicts:
	cocos2dx/platform/linux/CCFileUtilsLinux.cpp
2013-04-10 11:16:04 +08:00
yodesoft ba591b0980 Linux: Set writable path to "<user's home>/.config/<app name>" 2013-04-10 10:55:50 +08:00
elMiro 0f6e2daf31 Correction of passed buffer size to readlink and verification of result return by readlink. 2013-04-09 00:25:31 +02:00
yodesoft fa9339916d Improve font rendering performance 2013-04-02 10:16:51 +08:00
Andre Rudlaff 89f08bb441 [Linux] fixed font rendering crash for certain fonts
face->size->metrics->ascender seems to be unreliable for some fonts,
additionally the freetype documentation says that it may be used
differently for different fonts.
Therefore it may happen that the ascender of a font face is less then
the glyphs bounding box resulting in accessing invalid memory.

The fix is to use the bbox attribute instead of the ascender
2013-03-28 00:54:11 +01:00
Sam Clegg 04c1a863a0 Remove tailing newlines from CCLog messaages.
Some CCLog message contained trailing newlines which
made the logs hard to read on many platforms.  The solution
here is to stip trailing newlines on those platforms, and also
to remove the newlines from the existing log messages.
2013-03-16 09:01:21 -07:00
Andre Rudlaff a1602a992b fontcache map is now static, as we do not need external linkage for it. 2013-03-15 17:54:24 +01:00
Andre Rudlaff d3ecb09c9b Merge branch 'master' into feature-linux-fontcache 2013-03-15 08:54:15 +01:00
Andre Rudlaff e8ee3a9b83 [Linux] fixed font rendering artifacts, added simple line break
This patch fixed the size calculations for true type fonts (especially for
italic fonts)
Additinally a very simple greedy line break algorithm has been added for
true type labels.
2013-03-15 00:24:25 +01:00
Andre Rudlaff 67ad11dbee [Linux] add cache for font family -> font path mapping
As FcFontMach is quite an expensive call the results of getFontFile() are
now cached in an std::map if either a ttf file is packed with the app or
if a font file has been found by using fontconfig
2013-03-13 00:11:35 +01:00
Sam Clegg 38878b084b Fix all compiler warnings produced by gcc.
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -08:00
James Chen cda7da3d43 fixed #1712: Adding default dpi for marmalade and mac since i don't know how to get DPI for these platforms. 2013-02-17 17:13:06 +08:00
James Chen 541dd357fa issue #1712: Getting DPI support for Linux. 2013-02-17 16:54:45 +08:00
James Chen edfe4c2a0c issue #1712: Adding empty CCDevice.cpp for linux, mac and marmalade. 2013-02-17 16:26:59 +08:00
Ben Ward 5f6ce9db92 Adding Portuguese and Arabic language support 2013-02-11 15:29:56 +00:00
minggo 0c5bcb3f7b issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
minggo 744bfb3cb2 Merge pull request #1945 from dualface/add_CCLuaObjcBridge
add CCLuaObjcBridge
2013-02-03 19:32:17 -08:00
dualface f8c372ca9b fix CCLuaLog() 2013-02-02 15:05:30 +08:00
James Chen e25c79f1ec issue #1687: CCFileUtils::isFileExist now support relative path. 2013-02-01 22:19:58 +08:00
James Chen 3a9346e6ff issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms. 2013-02-01 11:20:46 +08:00
James Chen 6b0417902c Merge pull request #1932 from Weeds/feature_linux-font-alignment
fixed #1689: [Linux] fixed horizontal font alignment.
2013-01-29 22:22:01 -08:00
Andre Rudlaff 9b8f3ca01e [Linux] fixed horizontal font alignment
kAlignTop and kAlignBottom should center text horizontally
2013-01-30 02:04:59 +01:00
Andre Rudlaff 5959c24b80 [Linux] fixed loading truetype fonts from resource directory
We should use CCFileUtils to get the full path to font resources.
Additionally the input font is converted to lowercase for checking if it is
a ttf file. So we can also load .TTF or .tTf files.
2013-01-30 01:43:21 +01:00
James Chen bb431c54ed Comments some logs in CCFileUtils. 2013-01-29 19:12:55 +08:00
James Chen 2694cb150b CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths. 2013-01-29 09:56:38 +08:00
James Chen c160d3ed0a Using full path in CCFileUtils::getFileData. 2013-01-28 23:37:04 +08:00
James Chen 733a334ec2 issue #1683: Fixed compilation errors for linux. 2013-01-28 18:32:34 +08:00
James Chen 13881ba8a8 issue #1683: Updating CCApplication.h/.cpp for linux. 2013-01-28 11:56:56 +08:00
James Chen 345f18ebeb issue #1683: Refactoring CCFileUtils::setResourceRootPath for BB, Linux, MAC. 2013-01-28 10:48:47 +08:00
James Chen c24ca63a0c issue #1683: Making CCApplication::setResourceRootPath deprecated. 2013-01-28 10:36:37 +08:00
James Chen d532670640 Removing some CCLOG. 2013-01-27 20:16:46 +08:00
James Chen be6c0c9d9b Updated CCFileUtils of linux. 2013-01-26 23:20:40 +08:00
James Chen 119115502d issue #1683: Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray. 2013-01-26 22:31:57 +08:00
James Chen 3328cfd6a4 Refactoring some logic of CCFileUtils. 2013-01-26 14:19:14 +08:00
James Chen 2c399de28e issue #1683: Moved CCFileUtils::setResourceDirectory. And fix a compatible issue for android. 2013-01-25 22:55:20 +08:00
James Chen 73389d68d5 Refactor CCFileUtils for Linux port. 2013-01-24 16:44:13 +08:00
fape 320d532e15 add Hungarian language support 2012-12-05 11:31:05 +01:00