minggo
|
8b20639d75
|
issue #838: HelloWorld support x86
|
2011-11-23 11:02:18 +08:00 |
minggo
|
b105b6005e
|
[android] fixed #623: refactor Cocos2dJni.cpp
|
2011-07-25 14:12:30 +08:00 |
minggo
|
62ea6a2d46
|
issue #623: create JniHelper and use it somewhere
|
2011-07-22 18:14:29 +08:00 |
Walzer
|
bc44855091
|
issue #536, integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet.
|
2011-07-19 15:14:59 +08:00 |
minggo
|
dd42936bb3
|
[android] fixed #610: remove the support of ndk-r4
|
2011-07-14 10:37:40 +08:00 |
natural-law
|
7d7f3a9241
|
fixed #562, Upgrade folder sprite_nodes to rc3.
|
2011-07-01 16:11:31 +08:00 |
Walzer
|
00568c229a
|
[android] back to shared library link
|
2011-06-25 11:21:16 +08:00 |
minggo
|
d4bd6e63d2
|
synchrolize java code to HelloLua
|
2011-06-23 12:47:02 +08:00 |
minggo
|
2f97a43439
|
issue #528: refactor lua ok on Android
|
2011-06-21 10:18:43 +08:00 |
minggo
|
49f1518893
|
fix a bug when compile in android
|
2011-06-14 15:43:45 +08:00 |
minggo
|
a7a22e528b
|
remove the usage of NDController
|
2011-06-14 14:46:39 +08:00 |
minggo
|
8003de7468
|
update to latest code and merge
|
2011-06-14 11:01:38 +08:00 |
liswei
|
1591c7edc8
|
fixed #512 fix warnings in /Wall flag
|
2011-06-10 17:51:37 +08:00 |
minggo
|
83e1e0ebd1
|
tests run ok when it don't enable lua
|
2011-06-01 20:29:05 +08:00 |
minggo
|
a8b6b850de
|
use precompile macro to cantrol if enable lua support
|
2011-06-01 17:51:08 +08:00 |
minggo
|
dedbd638d3
|
lua runs ok on Android
|
2011-06-01 14:35:28 +08:00 |
minggo
|
697368cf20
|
support lua
|
2011-05-31 14:04:14 +08:00 |
minggo
|
2c0bd49513
|
issue #455: CCUserDefault ok on win32 & Android
|
2011-05-06 15:31:51 +08:00 |
minggo
|
bb4fc1c446
|
[android] fixed #477: set default ndk version to ndk-r5
|
2011-04-29 09:59:05 +08:00 |
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 |
yangws
|
252f3efe1a
|
CCIMEDispatcher works on android.
|
2011-04-22 16:33:41 +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 |
minggo
|
3d6fd051ab
|
issue #449: refactor CCTransition
|
2011-04-11 16:09:14 +08:00 |
minggo
|
37bb33d9e5
|
fixed #452: refactor CCDirector CCNode CCGrid
|
2011-04-11 15:10:09 +08:00 |
natural-law
|
d4dbedca4d
|
fixed #451,remove the code of support mac platform.
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
|
2011-04-11 11:24:10 +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 |
natural-law
|
cee82fe9fa
|
issue #434,refactor class CCFileUtils on android and ios.
|
2011-03-26 17:24:37 +08:00 |
walzer
|
ff91c91ea9
|
issue #427 android HelloWorld ok
|
2011-03-25 12:01:56 +08:00 |
natural-law
|
55143e3b9e
|
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
|
2011-03-24 10:38:08 +08:00 |
minggo
|
1ce64f1ecf
|
issue #400: rename CCamera.cpp to CCCamera.cpp
|
2011-03-18 14:54:24 +08:00 |
minggo
|
75e2ecc16d
|
issue #387: move platform_support into cocos2dx/platform
|
2011-03-09 14:40:05 +08:00 |
minggo
|
f1d13ca2e1
|
issue #375: android compiled ok
|
2011-03-08 13:49:58 +08:00 |
minggo
|
d3f93b658d
|
rename libs to libraries and modify cocos2dx/Android.mk
|
2011-03-07 10:00:33 +08:00 |
minggo
|
89b4d07ed8
|
[android] fixed #368: move Application code to cocos2dx/platform/ccxApplication
|
2011-03-01 19:53:39 +08:00 |
minggo
|
0453eb0266
|
[android] issue #338:refactor platform_support
|
2011-02-24 19:42:45 +08:00 |
natural-law
|
237042f7dd
|
fixed #309,App will not crash any more when surface re-created.
|
2011-01-10 17:54:44 +08:00 |
natural-law
|
ec7fbd0e69
|
Fix bugs.
1. Run tests and HelloWorld in cocos2d-android.
2. Modify the makefile of cocos2d-uphone.
|
2011-01-07 11:30:19 +08:00 |
natural-law
|
01cd90f2cc
|
update layers_scenes_transition_nodes to 0.99.5.
|
2010-12-27 09:40:45 +08:00 |
natural-law
|
6ee16ce878
|
update menu_nodes to 0.99.5
|
2010-12-25 11:15:19 +08:00 |
natural-law
|
0f0a8ed956
|
rename the files related to label_nodes.
|
2010-12-24 14:00:49 +08:00 |
natural-law
|
4a765d33a3
|
rename the CCXXXAction files to CCActionXXX.
|
2010-12-22 15:15:04 +08:00 |
Walzer
|
63bfa195db
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
|
2010-12-17 20:36:24 +08:00 |
minggo
|
012812a8f5
|
Because platform/android/ccx_Common_android.cpp is rename to platform/android/ccxCommon_android.cpp, so the Android.mk should change too.
|
2010-12-17 11:48:46 +08:00 |
natural-law
|
95e697d316
|
fixed #262 Add namespace for the project CocosDenshion.
|
2010-12-15 18:28:18 +08:00 |
unknown
|
acc30e35b1
|
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
|
2010-12-14 11:10:46 +08:00 |
minggo
|
a33823706d
|
fixed #259
|
2010-12-14 09:42:39 +08:00 |
natural-law
|
8cb331994d
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
|
2010-12-13 17:55:02 +08:00 |
natural-law
|
2706e3a003
|
fixed #251 CCKeypadDelegate implement
|
2010-12-13 14:10:39 +08:00 |
minggo
|
6b37bc97d4
|
fixed #220: run tests on android
|
2010-12-09 10:50:02 +08:00 |
minggo
|
534a55eaa1
|
issue #220: All tests run on android emulator, but the effect of some tests are wrong
|
2010-12-06 09:51:21 +08:00 |
minggo
|
9a2ff2407a
|
commit the change before merging master of cocos2d-x
|
2010-11-29 15:08:21 +08:00 |
minggo
|
59a986438f
|
Remove unneeded predefined macro _ADNROID, because ndk build chain has already defined a macro named ANDROID
|
2010-11-23 18:02:42 +08:00 |
Walzer
|
820c2f0714
|
issue #211 cocos2d-x back to cocos2dx
|
2010-11-18 15:01:42 +00:00 |
Walzer
|
b4328354af
|
issue #211 cocos2dx -> cocos2d-x
|
2010-11-18 14:07:17 +00:00 |
Ming
|
ca066d0bac
|
fixed #191
|
2010-11-04 09:32:22 +00:00 |