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

9748 Commits

Author SHA1 Message Date
James Chen 42c9abd69e Merge pull request #2779 from dumganhar/develop 
[Android] Only ignore warning of 'invalid-offsetof' in the library of spidermonkey.
 2013-06-05 19:17:31 -07:00
James Chen 3c69a17752 [Android] Only ignore warning of 'invalid-offsetof' in the library of spidermonkey. 2013-06-06 10:12:44 +08:00
Ricardo Quesada 479062fdb7 on dealloc, log "this" with %p, not %x. 
Also adds %p where it was missing.
And make a few fixes on the iOS project
 2013-06-05 18:21:05 -07:00
Ricardo Quesada 3441ca5563 MenuItemToggle is fixed 
Supports callbacks now.
Updated MenuTest to supports the new API.
Updated CHANGELOG and version
Updatged Xcode project for Mac
 2013-06-05 17:51:40 -07:00
James Chen 8a54af1699 Merge pull request #2775 from CocosRobot/updategeneratedsubmodule_1370437282 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-05 06:04:59 -07:00
CocosRobot 8c6d6e9ef8 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-05 13:01:25 +00:00
James Chen 5c1e5c871a Merge pull request #2773 from dumganhar/ricardoquesada-menuitem_function_callback 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/2756
 2013-06-05 05:56:32 -07:00
James Chen a5263673fb Fixing compilation errors on Android. 2013-06-05 19:56:23 +08:00
James Chen 1bb73e50df Fixing a warning in Bug-458.cpp 2013-06-05 18:18:59 +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
James Chen 2d81a66444 [Linux] Don't treat the warning of deprecated-declarations as error. 2013-06-05 17:48:04 +08:00
minggo cdf09c04ea issue #2103:make HelloLua & TestLua work on vs2010 2013-06-05 17:43:49 +08:00
James Chen cda02af1e7 Using CC_DEPRECATED_ATTRIBUTE to mark functions as deprecated. Don't bind CCMenuItem::setCallback automatically. 2013-06-05 17:35:19 +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
James Chen dc8cfeb648 Merge branch 'menuitem_function_callback' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_function_callback 2013-06-05 16:40:25 +08: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 7c2ce0da64 Merge pull request #2766 from dumganhar/jsb-delegate-crash-develop 
fixed #2143: cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash.
 2013-06-04 23:58:56 -07:00
James Chen e4a8cad3c2 Updating cocos2dx_extension.ini 2013-06-05 14:56:06 +08:00
James Chen 5d92a98287 fixed #2143: cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash. 2013-06-05 14:55:13 +08:00
James Chen 47c8205e39 issue #2143: Adding CCEditBox::getDelegate. 2013-06-05 14:55:13 +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 3acdb327fb Merge pull request #2760 from natural-law/develop 
Add plugin weibo for iOS on branch develop
 2013-06-04 20:23:26 -07: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 457942f05b Update the license in the sample code. 2013-06-05 11:19:54 +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 d947da8dce Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-05 10:32:44 +08:00
zhangbin 828158d009 Update the JS binding code of plugin. 2013-06-05 10:30:44 +08:00
zhangbin b2ef2ac916 fixed #2254 : Add sample code for plugin weibo on iOS. 2013-06-05 10:30:44 +08:00
zhangbin 7b00055d9e issue #2254 : Add plugin weibo for iOS. 2013-06-05 10:30:43 +08: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 669c4d22b6 Merge pull request #2758 from dumganhar/ricardoquesada-configuration_set_value-develop 
Merge PR #2728 and minor fix.[develop]
 2013-06-04 19:20:03 -07: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 993070b27e Minor fix in CCConfiguration. 2013-06-05 09:47:29 +08:00