dumganhar
|
9ff00c7c83
|
use utf-8 for displaying chinese
remove Gbk_Unicode.c Gbk_Unicode.h
|
2011-09-29 17:29:38 +08:00 |
|
dumganhar
|
db4d51496e
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada
Conflicts:
cocos2dx/platform/CCAccelerometer_platform.h
cocos2dx/platform/CCApplication_platform.h
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/CCEGLView_platform.h
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/platform/CCSAXParser.h
cocos2dx/platform/CCStdC.h
tests/AppDelegate.cpp
tests/tests/Box2DTestBed/Tests/EdgeShapes.h
|
2011-09-29 16:03:37 +08:00 |
|
dumganhar
|
bd2266fe4c
|
use timer as gameloop, can change FPS by using setAnimationInterval
modify some project setting
|
2011-09-29 15:52:16 +08:00 |
|
dumganhar
|
3c795073e0
|
Merge branch 'master' into bada
Conflicts:
HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/CCamera.cpp
cocos2dx/cocoa/NSData.cpp
cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
cocos2dx/platform/CCFileUtils_platform.h
cocos2dx/platform/CCXApplication_platform.h
cocos2dx/platform/CCXCocos2dDefine_platform.h
cocos2dx/platform/CCXEGLView_platform.h
cocos2dx/platform/CCXMath.h
cocos2dx/platform/CCXUIAccelerometer_platform.h
cocos2dx/platform/CCXUIImage_platform.h
cocos2dx/platform/ccxCommon_platform.h
cocos2dx/platform/config_platform.h
cocos2dx/platform/platform.h
cocos2dx/support/base64.cpp
cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
tests/AppDelegate.cpp
tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
|
2011-09-19 13:42:08 +08:00 |
|
laschweinski
|
c977f3e07c
|
commit debug and release makefile
|
2011-08-28 16:44:20 +08:00 |
|
Walzer
|
63ffc574d7
|
fixed #601, update Chipmunk from 5.3.4 to 5.3.5. Only tested on iOS now.
|
2011-07-11 10:34:03 +08:00 |
|
Walzer
|
08b26402d5
|
fixed #594, but find a new bug #597
|
2011-07-08 14:27:37 +08:00 |
|
Walzer
|
2db1f2350c
|
issue #503, new files in chipmunk 5.3.4
|
2011-05-21 14:58:54 +08:00 |
|
Walzer
|
948c6d750e
|
issue #503, chippmunk library is upgraded from 5.1 to 5.3.4, which is usd in cocos2d-iphone 0.99.5 & 1.0.0-rc
|
2011-05-21 14:58:22 +08:00 |
|
Leon
|
96f4f5c9fd
|
fix some compiling warning for iOS
|
2010-12-17 23:44:19 +08:00 |
|
minggo
|
53753b65b5
|
merge bada platform
|
2010-12-15 18:05:02 +08:00 |
|
Walzer
|
fee1ce8f09
|
fixed #124, chipmunk done!
|
2010-09-04 10:18:14 +00:00 |