18 Commits

Author	SHA1	Message	Date
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