yangws
|
e895d9d073
|
TextInputTest compile ok on android and merge last master code.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input
Conflicts:
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/platform/android/Cocos2dJni.cpp
tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
tests/test.ios/test.xcodeproj/project.pbxproj
tests/test.win32/test.win32.vcproj
|
2011-04-26 18:04:07 +08:00 |
|
natural-law
|
5d2ac1fc0c
|
fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.
|
2011-04-21 14:46:15 +08:00 |
|
yangws
|
85027c40ca
|
CCIMEDispatcher works on ios.
|
2011-04-19 18:11:57 +08:00 |
|
minggo
|
0b7ca9c865
|
fixed #449: remove the code that suppots mac platform
|
2011-04-11 17:04:45 +08:00 |
|
yangws
|
16254a2de1
|
fixed #440 CCMessageBox works on ios.
|
2011-03-31 11:08:46 +08:00 |
|
natural-law
|
1991a65b0b
|
Merge branch 'master' into iss391
Conflicts:
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d-win32.vcproj
cocos2dx/proj.wophone/Makefile.ARM
cocos2dx/proj.wophone/cocos2d-wophone.vcproj
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
tests/test.ios/test.xcodeproj/project.pbxproj
|
2011-03-29 10:20:57 +08:00 |
|
walzer
|
6cc09aa4dc
|
Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396
|
2011-03-28 21:08:56 +08:00 |
|
yangws
|
a5040e0ccb
|
issue 396 ios modified.
|
2011-03-28 13:41:14 +08:00 |
|
natural-law
|
cee82fe9fa
|
issue #434,refactor class CCFileUtils on android and ios.
|
2011-03-26 17:24:37 +08:00 |
|
natural-law
|
55143e3b9e
|
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
|
2011-03-24 10:38:08 +08:00 |
|
walzer
|
ffeb116542
|
Merge branch 'issue_400' of https://github.com/minggo/cocos2d-x into minggo-issue_400
|
2011-03-18 16:32:20 +08:00 |
|
minggo
|
7b71a565ed
|
fixed #400: change project.pbxproj of HelloWorld and test to include CCCamera.cpp
|
2011-03-18 16:09:21 +08:00 |
|
walzer
|
c15c1719ba
|
fixed #410, recheck the header search path & library search path in HelloWorld, Tests, and all xcode3 templates
|
2011-03-18 14:06:04 +08:00 |
|
walzer
|
db1f54ee45
|
[ios] HelloWorld.jpg ->.png, xcode project from iOS4.1 to 4.2 "Lastest iOS"
|
2011-03-14 18:31:16 +08:00 |
|
minggo
|
12981fac89
|
fixed #375
|
2011-03-09 16:19:20 +08:00 |
|
minggo
|
4379a1c96f
|
Move ccxApplication to cocos2dx/platform on ios.
|
2011-03-02 17:05:22 +08:00 |