Commit Graph

23 Commits

Author SHA1 Message Date
yinkaile f2021982f4 Change CCAnimation to CCArmatureAnimation 2013-06-08 11:16:17 +08:00
yinkaile 10ed7ebdf4 merge newest version 2013-06-06 16:22:58 +08:00
yinkaile 3cfba7bc9a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
	extensions/Android.mk
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/Android.mk
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
2013-06-06 12:35:18 +08:00
yinkaile 245b0395b1 1.upload CCArmature 2013-06-06 12:02:54 +08:00
chengstory cfb424a6c9 1. add Component struct. 2013-06-04 17:38:43 +08:00
flamingo a81f2b1303 Update Android.mk 2013-06-04 14:47:10 +08:00
flamingo b806376671 Update Android.mk 2013-06-04 14:46:55 +08:00
James Chen cedb427a6e fixed : Adding WebSocket support for Cpp and JSB.
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
2013-06-02 18:55:57 +08:00
James Chen 2d1172814d issue : Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
James Chen 1eb79530c6 fixed : -DCC_ENABLE_BOX2D_INTEGRATION ~> -DCC_ENABLE_BOX2D_INTEGRATION=1,
-DCC_ENABLE_CHIPMUNK_INTEGRATION ~> -DCC_ENABLE_CHIPMUNK_INTEGRATION=1.
2013-04-17 12:49:25 +08:00
James Chen 4a7bacf0b5 Updating Android.mk. 2013-04-16 18:19:46 +08:00
Rohan Kuruvilla c86e8376dc Adding dependency on CocosDenshion for CocosBuilderReader in Android makefile 2013-03-18 16:06:47 -07:00
minggo c8baa94753 issue : update ios libcurl and add android project 2013-02-25 14:33:04 +08:00
James Chen 3fa771f0c4 fixed : Using sqlite3 to implement sys.LocalStorage for iOS and android. 2013-01-07 17:22:06 +08:00
James Chen e8cf71407d issue : Deleted physics_nodes in cocos2dx since it was moved to extension. 2012-11-20 16:27:47 +08:00
James Chen 0d0234de2a issue : Updated Project configurations for android and win32 since physics_nodes was moved to Extension folder. 2012-11-20 16:22:14 +08:00
James Chen f7229f74d8 issue : Synchronizing CCControlExtension to latest version. 2012-09-25 16:57:51 +08:00
minggo 4bff6927b8 issue #1470:re-publish ccb 2012-09-19 17:43:11 +08:00
James Chen 1460f4e42f issue : Updated project configuration for all platforms.
CCTableView::viewWithSource --> CCTableView::create, adding TableViewTest.
2012-09-10 13:39:12 +08:00
James Chen bcbd161398 issue : First commit CCEditBox for android port. 2012-08-22 09:47:04 +08:00
Walzer 08198c082e issue , http wrapper has been tested on iOS, mac, android port. 2012-08-09 10:45:11 +08:00
Walzer b8fa32dbc0 use extensions/GUI instead of extensions/UI 2012-07-30 22:57:59 +08:00
James Chen 557f654cf3 Built successfully on android. 2012-07-20 17:06:00 +08:00