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

14420 Commits

Author SHA1 Message Date
yinkaile 13408e4dc5 change play interface name 2013-12-25 16:46:31 +08:00
James Chen ef743b84ce Merge pull request #4638 from dumganhar/getStringFromFile 
Don’t use FileUtils::getInstance()->getFileData, use getStringFromFile and getDataFromFile instead.
 2013-12-24 04:50:41 -08:00
James Chen 17a6dbebb6 Compilation error fixes. 2013-12-24 19:05:35 +08:00
James Chen 1f5611ae05 Adds missing ‘)’. 2013-12-24 18:23:36 +08:00
James Chen d08cb63a82 Update CHANGELOG [ci skip] 2013-12-24 18:19:32 +08:00
James Chen 0ff85852cc Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead. 2013-12-24 18:08:40 +08:00
James Chen f664a72d6e Merge pull request #4635 from dabingnn/develop_FixClippingNodeBug 
fix clippingNode bug
 2013-12-24 01:50:51 -08:00
Huabing.Xu b6dc3d0371 fix clippingNode bug 2013-12-24 17:16:28 +08:00
James Chen 9976b94e59 Merge pull request #4634 from CocosRobot/updategeneratedsubmodule_1387875601 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-24 01:03:36 -08:00
CocosRobot c3b7406b43 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 09:00:04 +00:00
James Chen 940ae80167 Merge pull request #4529 from dumganhar/data-refactor 
close #3495 :Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData.
 2013-12-24 00:41:39 -08:00
James Chen 81d073aff0 Reverts FileUtil::getFileData to virtual function. 2013-12-24 16:29:55 +08:00
James Chen d33b2c41c7 Merge branch 'develop' into data-refactor 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-12-24 16:24:17 +08:00
James Chen 91ef6ea1e5 Update CHANGELOG [ci skip] 2013-12-24 15:57:39 +08:00
James Chen f527b50ce6 Merge pull request #4630 from dumganhar/iss3492-bmfont-fix 
closed #3492: LabelBMFont string can't be shown integrally.
 2013-12-23 23:56:38 -08:00
James Chen 7ee0771101 closed #3492: LabelBMFont string can't be shown integrally. 
Issue URL:  http://www.cocos2d-x.org/issues/3492
 2013-12-24 15:55:45 +08:00
James Chen 16195b4571 Merge pull request #4629 from Dhilan007/update_vsProject 
update vs project for remove some file into renderer.
 2013-12-23 23:49:48 -08:00
Dhilan007 f140ece282 update vs project for remove some file into renderer. 2013-12-24 15:34:40 +08:00
James Chen 1421c42da9 Merge pull request #4628 from CocosRobot/updategeneratedsubmodule_1387870286 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-23 23:32:24 -08:00
CocosRobot 3875d89ce6 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 07:31:29 +00:00
James Chen 0305ff15db Merge pull request #4625 from dabingnn/develop_NewClippingNode 
Develop new clipping node
 2013-12-23 23:20:38 -08:00
Huabing.Xu 5cc45493ef remove commented codes 2013-12-24 15:13:37 +08:00
Huabing.Xu ccf47e6422 remove commented codes 2013-12-24 15:11:01 +08:00
James Chen 451d76f6b0 Merge pull request #4611 from dumganhar/spine-test 
Merge PR #4572, Spine JS test support.
 2013-12-23 22:55:58 -08:00
Huabing.Xu 07bc4d34a8 some rename for global variables and member functions. 2013-12-24 14:53:49 +08:00
James Chen 7bc3ef7ca8 Merge pull request #4626 from CocosRobot/updategeneratedsubmodule_1387866821 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-23 22:36:36 -08:00
CocosRobot 4775b4c4d8 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 06:33:43 +00:00
James Chen f573f1092c Update CHANGELOG [ci skip] 2013-12-24 14:27:25 +08:00
James Chen 39c3bc10ed Merge pull request #4614 from 2youyouo2/develop 
update armature, using `const std::string&` instead of `const char*`
 2013-12-23 22:25:50 -08:00
yinkaile 67c3480320 change std::string.compare() to == 2013-12-24 14:21:25 +08:00
Huabing.Xu c36d920159 remove include reference 2013-12-24 14:15:23 +08:00
Huabing.Xu eee06ec905 update project file:android and linux 2013-12-24 14:12:15 +08:00
Huabing.Xu 9db599c0c9 remove class NewClippingNode 2013-12-24 14:10:54 +08:00
Huabing.Xu e7facf9f85 remove NewClippingNode feature function into ClippingNode 2013-12-24 14:08:57 +08:00
James Chen 5a6275f3cc Update CHANGELOG [ci skip] 2013-12-24 14:04:55 +08:00
James Chen e81d125fd4 Merge pull request #4624 from CocosRobot/updategeneratedsubmodule_1387864787 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-23 22:01:02 -08:00
CocosRobot c170559759 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 05:59:50 +00:00
James Chen de987ae660 Merge pull request #4623 from samuele3hu/NewEventDispatcher 
Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding
 2013-12-23 21:54:52 -08:00
yinkaile 9f8d95131e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-24 13:48:41 +08:00
samuele3hu 7f4e384886 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher 2013-12-24 13:43:57 +08:00
samuele3hu 98e4e802f4 Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding 2013-12-24 13:42:32 +08:00
yinkaile 44e22584a4 fixed getFileData 2013-12-24 13:35:46 +08:00
James Chen 164a4c5263 Merge pull request #4621 from CocosRobot/updategeneratedsubmodule_1387856735 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-23 19:46:31 -08:00
CocosRobot e50b6b616b [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-24 03:45:37 +00:00
James Chen 3803e5f996 Merge pull request #4619 from dabingnn/develop_NewSpriteBatchNode 
Develop new sprite batch node
 2013-12-23 19:41:06 -08:00
Huabing.Xu b821a33cfa remove comment code 2013-12-24 11:28:42 +08:00
Huabing.Xu a607bc9ac1 Merge branch 'develop' into develop_NewSpriteBatchNode 
* develop:
  [JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
  [AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-24 11:21:37 +08:00
Huabing.Xu 12e2cfedf2 update project file:android and linux 2013-12-24 11:20:21 +08:00
yinkaile ff053e71fe change std::string compare method 2013-12-24 11:05:53 +08:00
Huabing.Xu 24ac743a3c remove class NewSpriteBatchNode 2013-12-24 11:03:59 +08:00