d1afe6cfa6
Fixing a bug in CCFileUtilsIOS::isFileExist().
2013-04-25 22:02:20 +08:00
93a8b60111
If file path is an empty string, return false directly in CCFileUtils::isFileExist.
2013-04-25 21:51:13 +08:00
612a8a309f
Merge pull request #2193 from Weeds/feature-screen-dimensions
...
fixed #2065 : Adding kResolutionFixedHeight and kResolutionFixedWidth resolution policy.
2013-04-18 00:31:13 -07:00
724402750b
Merge pull request #2390 from scoyo/master
...
Fix for spaces at the beginning of wrapped lines
2013-04-17 19:10:19 -07:00
20e102bc46
Fixed setAccelerometerInterval signature in setAccelerometerIntervalJNI function.
2013-04-18 01:27:33 +01:00
81e4178a42
fix for spaces when wrapping
2013-04-17 13:09:48 +02:00
ddd6d9d155
fixed #2059 : cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string.
2013-04-17 16:08:48 +08:00
78d3c7f048
fixed #1613:not reload resources on Android platform after return from background
2013-04-17 15:34:57 +08:00
e07d11d1e2
Merge pull request #2381 from lgb/blackberry-compile-fix
...
fix compilation error in cocos2dx for BlackBerry PlayBook
2013-04-16 22:00:08 -07:00
af71b881df
fix wrong buffer name
2013-04-17 01:59:23 +04:00
5952597c1a
Set writable path to XDG_CONFIG_HOME if it exists.
2013-04-11 09:20:25 +08:00
cda864b597
Read app name from /proc/self/exe
2013-04-11 08:58:48 +08:00
db5df829fb
Restore codes of init m_strDefaultResRootPath
2013-04-10 18:39:01 +08:00
85c932112f
Merge remote-tracking branch 'upstream/master'
2013-04-10 17:54:50 +08:00
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
e193dbc4cf
Linux: Set writable path to "<user's home>/.config/<app name>"
2013-04-10 11:45:55 +08:00
d03b95ca46
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
cocos2dx/platform/linux/CCFileUtilsLinux.cpp
2013-04-10 11:16:04 +08:00
ba591b0980
Linux: Set writable path to "<user's home>/.config/<app name>"
2013-04-10 10:55:50 +08:00
df888eef65
fixed #2042 : remove libxml2
2013-04-10 09:56:31 +08:00
5d2c67ee8a
fixed #1904:strip libcurl.a on x86 architecture
2013-04-10 09:40:44 +08:00
3c8b26813e
delete libxml2
2013-04-10 09:39:48 +08:00
0f6e2daf31
Correction of passed buffer size to readlink and verification of result return by readlink.
2013-04-09 00:25:31 +02:00
5e2f1e0bd6
Merge pull request #2272 from Weeds/saxparser-fix
...
fixed #2035 : fixed potential crash in CCSaxParser
2013-04-08 07:49:36 -07:00
401b3dca4d
Merge pull request #2282 from DarraghCoy/ccfileutils_create_with_contents_of_file_fix
...
fixed #2031 : Fix CCFileUtils 'createXXXXWithContentsOfFile' path lookup issue.
2013-04-08 02:33:23 -07:00
d3eed7fd1f
Merge pull request #2279 from sjchao/master
...
fixed #2030 : Fixing a display bug when a scrollView nested in another scrollView. The parent's scissor rect need to be considered, when setting the scissor rect in the subScrollView.
2013-04-07 23:55:55 -07:00
7a45e1ddd1
Merge pull request #2322 from dumganhar/iss1592-update-uthash
...
fixed #1592 : Updating uthash to v1.9.8.
2013-04-07 23:31:31 -07:00
831dfb6ade
Merge remote-tracking branch 'origin/iss1592-update-uthash' into iss1592-update-uthash
2013-04-08 11:56:10 +08:00
2c3427dcee
issue #1592 : Fixing complication errors for windows port.
2013-04-08 11:56:04 +08:00
ad68b3d5ed
Merge pull request #2288 from mchinen/master
...
Android: fix emulator for OpenGL ES 2.0
2013-04-07 19:08:00 -07:00
4d5dff6172
Reduce function call in nativeInitBitmapDC to improve performance.
2013-04-07 17:17:19 +08:00
038720a1b2
Merge pull request #2290 from Yodesoft/master
...
fixed #2000 : Improve font rendering performance for linux platform.
2013-04-03 18:59:37 -07:00
15d4e75cdb
JNI fixes, added missing JNIEXPORT / JNICALL declarations
...
This is needed if compiling with custom visibility settings (example :
-fvisibility=hidden)
2013-04-02 22:15:12 +02:00
fa9339916d
Improve font rendering performance
2013-04-02 10:16:51 +08:00
6f5173f448
android:Add emulator detection and config change to allow running OpenGL ES 2.0 projects in the emulator
...
Code taken from forum post by Romain TISSERAND
http://www.cocos2d-x.org/boards/6/topics/12563?r=25446#message-25446
2013-04-01 20:41:33 +09:00
227d2cf60b
Add emulator detection hack to allow running OpenGL ES 2.0 projects in the emulator
2013-03-31 20:47:43 +09:00
d0f8aaad9e
Fix CCFileUtils 'createXXXXWithContentsOfFile' path lookup issue
...
When calling 'CCFileUtils::createCCDictionaryWithContentsOfFile' and 'CCFileUtils::createCCArrayWithContentsOfFile' on iOS/OSX these functions call upon 'CCFileUtils::fullPathForFilename' to resolve the path given into a full path which can be used with system file IO functions. This matches the convention found throughout the cocos2dx library and is expected behaviour. However, on Android and other platforms it appears calling 'CCFileUtils::createCCDictionaryWithContentsOfFile' or 'CCFileUtils:: createCCArrayWithContentsOfFile' does not do the same resolution using 'CCFileUtils::fullPathForFilename' - resulting in file paths which are correctly specified (and which worked on iOS/OSX) to fail to load on these platforms.
Fix this issue by performing a lookup/resolve of the file path using 'CCFileUtils::fullPathForFilename' before doing the low level loading work itself. This brings the behaviour of other platforms in line with iOS and OSX.
2013-03-29 22:51:25 -07:00
cd3a2be720
change comment type
2013-03-29 17:21:29 +08:00
4690a45f3e
change a method name
...
change method name from isScissorEnable() to isScissorEnabled() in
class CCEGLViewProtocal
2013-03-29 17:19:47 +08:00
18c43e29b2
change method name from getIsScissorEnable() to isScissorEnable()
2013-03-29 15:32:30 +08:00
253ebe49e4
add getIsScissorEnable() and getScissorRect() for CCEGLViewProtocal
2013-03-29 01:28:26 +08:00
5372363365
fixed potential crash in CCSaxParser
...
The character array which given to CCSAXParser::parse() may not be NULL
terminated.
Therefore we must also add the size of the data array to the parameter list
of the tinyxml2::XMLDocument::parse() call
2013-03-28 01:07:54 +01:00
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
cdfe693583
- changed cocos2d mac project to support universal build and x86
...
- fixed issues associated with that
2013-03-23 16:04:51 +00:00
71659f4aa9
Merge pull request #2247 from hailongiPhone/master
...
release && set nil
2013-03-22 04:09:47 -07:00
1538c72581
Merge pull request #2197 from dumganhar/ios-default-font
...
[iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found.
2013-03-22 00:10:09 -07:00
2ea447dbfd
Update CCDirectorCaller.mm
...
First destroy CCDirector instance with cocos2d::CCDirector::sharedDirector()->end()
Then create new CCDirector instance with
cocos2d::CCApplication::sharedApplication()->run();
APP will crash at
CCApplication::setAnimationInterval
[[CCDirectorCaller sharedDirectorCaller] setAnimationInterval: interval ];
2013-03-22 15:02:46 +08:00
949700ca1a
issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format
2013-03-21 15:50:41 +08:00
e2e9bc8ce0
Fixing memoryleaks.
2013-03-21 09:00:55 +08:00
9afc6729dc
fix build error caused by libcurl on android x86
2013-03-20 11:53:19 +08:00
ac509f70db
[iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found.
2013-03-19 13:11:33 +08:00
James Chen