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

9481 Commits

Author SHA1 Message Date
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
zhangbin 65dfb60442 issue #2254 : Add plugin weibo for iOS. 2013-06-04 18:31:42 +08:00
chengstory a5f8e2c27e no message 2013-06-04 17:54:05 +08:00
chengstory cfb424a6c9 1. add Component struct. 2013-06-04 17:38:43 +08:00
James Chen d2648d6166 Merge pull request #2748 from dumganhar/iss2253-refactor-editbox-master 
fixed #2253: [CCEditBox iOS] Adding UITextField only when keyboard was opened, removing it when keyboard was closed.
 2013-06-04 02:19:18 -07:00
James Chen 8874699cbb Update AUTHORS [ci skip] 2013-06-04 17:17:04 +08:00
sunxiaoyu d41a78453a Update CCEditBoxImplIOS.mm 
02c6647306
 2013-06-04 17:16:45 +08:00
James Chen d421c262ef Merge pull request #2746 from dumganhar/update-spine-runtime-master 
fixed #2252: Updating spine-runtime to the latest version. [master]
 2013-06-04 00:40:05 -07:00
minggo 7bd9717944 make lua works ok on iOS 2013-06-04 15:12:16 +08:00
James Chen 22a0605342 Updating AUTHORS. 2013-06-04 15:08:06 +08:00
James Chen 37df435089 fixed #2252: Fixing a bug that stdio.h is in c++ namespace. 2013-06-04 15:05:27 +08:00
James Chen 988269f9fa fixed #2252: Updating iOS and mac project configuration. 2013-06-04 15:03:10 +08:00
flaming0 1d3516da44 Update for spine runtime. 2013-06-04 14:47:19 +08:00
flamingo a81f2b1303 Update Android.mk 2013-06-04 14:47:10 +08:00
flamingo 66943ee667 Update Makefile 
For nacl (spine runtime)
 2013-06-04 14:47:02 +08:00
flamingo b806376671 Update Android.mk 2013-06-04 14:46:55 +08:00
flaming0 39ce9b4813 Update spine runtime 2013-06-04 14:46:46 +08:00
flaming0 3daf21996c Update for spine runtime 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-04 14:46:31 +08:00
James Chen 43791a5e2a Update generate-jsbindings.sh [ci skip], push to an unique branch. 2013-06-04 15:15:50 +09:00
minggo c21812b270 Merge pull request #2729 from ricardoquesada/timeval_64bit_fix 
cc_timeval works on 64bit machines, like OS X
 2013-06-03 22:47:45 -07:00
James Chen b3e00a2105 Merge pull request #2741 from CocosRobot/updategeneratedsubmodule_1370323397 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-03 22:25:33 -07:00
James Chen 22053d4b85 Merge pull request #2742 from dumganhar/master 
fixed #2251: A logical error in CCDrawNode::drawPolygon.
 2013-06-03 22:24:37 -07:00
CocosRobot be08d6c81d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-04 05:23:21 +00:00