Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,303 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

9303 Commits

Author SHA1 Message Date
yinkaile a10d0734f2 Standardize code 2013-06-07 19:48:31 +08:00
yinkaile ba09c20434 Standardize code 2013-06-07 18:50:35 +08:00
yinkaile 6a6245eefd Standardize code 2013-06-07 18:29:47 +08:00
yinkaile 850ea39107 Standardize code 2013-06-07 17:10:53 +08:00
yinkaile 2418afc96d conform declare and initialize order 2013-06-07 16:13:08 +08:00
yinkaile e1e41f7124 move const value to CCDataReaderHelper.cpp 2013-06-07 14:47:08 +08:00
yinkaile d4116f8478 1.remove #pragma endregion 
2.change str.compare("")==0 to str.length()==0
 2013-06-07 14:01:03 +08:00
yinkaile 65974f2243 standardize code 2013-06-07 10:52:32 +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
James Chen a63f67afac Merge pull request #2780 from dumganhar/master 
[Android] Ignoring a warning of 'invalid-offsetof' in the library of spidermonkey. [master]
 2013-06-05 19:22:02 -07:00
James Chen ba295d416f [Android] Ignoring a warning of 'invalid-offsetof' in the library of spidermonkey. [master] 2013-06-06 10:19:46 +08:00
minggo 271d1fa55a Merge pull request #2772 from minggo/lua-win32 
issue #2103:make HelloLua & TestLua work on vs2010
 2013-06-05 03:15:09 -07:00
minggo cdf09c04ea issue #2103:make HelloLua & TestLua work on vs2010 2013-06-05 17:43:49 +08:00
James Chen 95db0c2352 Merge pull request #2771 from CocosRobot/updategeneratedsubmodule_1370421780 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-05 02:04:08 -07:00
CocosRobot 7e866d8060 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-05 08:43:03 +00:00
minggo 3713ff5b71 Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder 
add cocosbuilder lua test sample
 2013-06-05 01:38:57 -07:00
samuele3hu 8e97c69b2f issue #2103 add cocosbuilder lua test sample 2013-06-05 16:25:23 +08:00
minggo a9788a7f9d Merge pull request #2767 from chengstory/master_Components#2 
1.  change “bool isEnabled()”  to "bool isEnabled() const".
 2013-06-05 00:52:32 -07:00
samuele3hu c2e2be1b1b issue #2103 add cocosbuilder lua test sample 2013-06-05 15:51:29 +08:00
samuele3hu 75b26d9cdf Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder 2013-06-05 15:19:01 +08:00
samuele3hu 6dd077b8bd issue #2103 add cocosbuilder lua test sample 2013-06-05 15:17:00 +08:00
chengstory ca3dc682ea 1. change “bool isEnabled()” to "bool isEnabled() const". 
2.  dolete license.
 2013-06-05 15:05:49 +08:00
James Chen 418354df76 Update cocos2dx_extension.ini 2013-06-05 14:53:53 +08:00
James Chen daa37a9837 Merge pull request #2763 from dumganhar/jsb-delegate-crash-master 
fixed #2143: cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash.
 2013-06-04 23:47:00 -07:00
James Chen d0c0d303f5 fixed #2143: cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash. 2013-06-05 14:31:07 +08:00
James Chen 57fee8dc98 issue #2143: Adding CCEditBox::getDelegate. 2013-06-05 14:30:14 +08:00
minggo cc9823d1d9 Merge pull request #2762 from minggo/modify-ios-template 
Modify ios template
 2013-06-04 22:53:11 -07:00
minggo d71e07db4e fixed conflict 2013-06-05 13:48:31 +08:00
minggo b0937a5a2d issue #2257:change copyright of template 2013-06-05 11:25:39 +08:00
James Chen b2c85ef360 Merge pull request #2761 from natural-law/master 
Update the license in the sample code.
 2013-06-04 20:21:55 -07:00
minggo 6491ff75cf issue #2257: make ios template work 2013-06-05 11:21:04 +08:00
zhangbin f26530748a Update the license in the sample code. 2013-06-05 11:19:17 +08:00
James Chen ecffa01475 Merge pull request #2759 from natural-law/master 
Add plugin weibo for iOS [master]
 2013-06-04 20:00:34 -07:00
zhangbin 4939ac1f14 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-06-05 10:25:56 +08:00
zhangbin aa94056b5a Update the JS binding code of plugin. 2013-06-05 10:25:19 +08:00
James Chen 555e8e324d Merge pull request #2757 from dumganhar/ricardoquesada-configuration_set_value-master 
Merge PR #2728 and minor fix.[master]
 2013-06-04 19:17:51 -07:00
zhangbin ae7ff06e95 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-06-05 09:52:35 +08:00
James Chen 26219d4a14 Minor fix in CCConfiguration. 2013-06-05 09:41:03 +08:00
James Chen 2a16a6b17f Merge branch 'configuration_set_value' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-configuration_set_value 2013-06-05 09:36:53 +08:00
James Chen 8a858f83d2 Merge pull request #2753 from dumganhar/master 
[iOS] Fixing compilation errors for HelloLua.
 2013-06-04 06:15:56 -07:00
david feng 9d9bc1f593 fix a library search path error 2013-06-04 21:13:08 +08:00
James Chen ddbdb3e983 [iOS] Fixing compilation errors for HelloLua. 2013-06-04 21:11:44 +08:00
James Chen ce20c48b78 Merge pull request #2751 from dumganhar/template-fix-master 
Updating multi-platform-xxx template for iOS and Mac.
 2013-06-04 05:12:54 -07:00
James Chen 3b673547cc Updating multi-platform-xxx template for iOS and Mac. 2013-06-04 19:49:03 +08:00
James Chen ce2421779d Merge pull request #2750 from CocosRobot/updategeneratedsubmodule_1370342158 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-04 04:23:32 -07:00
CocosRobot 0bc9c19e76 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-04 10:36:03 +00:00
zhangbin 17d0ea1c09 fixed #2254 : Add sample code for plugin weibo on iOS. 2013-06-04 18:32:42 +08:00
minggo 5ee6e9d982 Merge pull request #2749 from chengstory/master_Components 
Master components
 2013-06-04 03:31:42 -07:00