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

14658 Commits

Author SHA1 Message Date
James Chen 88d30bd26a Merge pull request #4648 from CocosRobot/updategeneratedsubmodule_1387943362 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-24 19:50:49 -08:00
James Chen 17c391f447 Merge pull request #4645 from Dhilan007/update_vs_project 
fix TestCpp project can't work on debug mode on vs.
 2013-12-24 19:50:25 -08:00
CocosRobot 9aa48cac37 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-25 03:49:23 +00:00
James Chen 51fb4e5d1f Merge pull request #4647 from dabingnn/develop_FixTestCase_DrawPrimitiveTest 
change indent to spaces
 2013-12-24 19:49:20 -08:00
Huabing.Xu 02c28cf891 change indent to spaces 2013-12-25 11:46:40 +08:00
James Chen 8fdd6249f0 Merge pull request #4646 from dabingnn/develop_FixTestCase_DrawPrimitiveTest 
fix actionTest->DrawPrimitiveTest
 2013-12-24 19:46:32 -08:00
James Chen 5fc06cf7ac Merge pull request #4644 from dumganhar/spine-remove-cc 
Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
 2013-12-24 19:44:18 -08:00
Huabing.Xu 598d295c6c fix actionTest->DrawPrimitiveTest 2013-12-25 11:44:05 +08:00
Dhilan007 c168dc4731 fix TestCpp project can't work on debug mode on vs. 2013-12-25 11:38:46 +08:00
James Chen 856265950d Updates JS tests for SpineTest. 2013-12-25 11:24:02 +08:00
James Chen 538da31773 Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings. 2013-12-25 11:18:14 +08:00
James Chen 30eb05b600 Merge pull request #4642 from dumganhar/deprecate-ccstring 
Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead.
 2013-12-24 19:02:35 -08:00
James Chen 6fce4f9061 Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead. 2013-12-25 11:00:51 +08:00
minggo 665b8634bb Merge pull request #4641 from dabingnn/develop_FixTestCase_Box2dTest 
fix actionTest->Box2dTest
 2013-12-24 18:57:40 -08:00
Huabing.Xu fac87108f6 fix actionTest->Box2dTest 2013-12-25 10:54:31 +08:00
boyu0 62fc889a54 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 
Conflicts:
	cocos/2d/platform/CCFileUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCImageCommon_cpp.h
	cocos/2d/platform/CCSAXParser.cpp
	cocos/2d/platform/CCSAXParser.h
 2013-12-25 10:41:37 +08:00
minggo f964d91d0d Merge pull request #4639 from dabingnn/develop_FixTestCase_ActionTest 
Develop fix test case action test
 2013-12-24 18:40:59 -08:00
CaiWenzhi 2ae8576e0f Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 10:40:05 +08:00
boyu0 622431758e issue #2920: temporary fix dictation input crash on ios7. 2013-12-25 10:22:52 +08:00
Huabing.Xu 960c64d787 fix actionTest->ActionCardinalSpline，ActionCatmullRom 2013-12-25 10:20:29 +08:00
Huabing.Xu c29b796c15 fix actionTest->ActionCardinalSplineStacked 2013-12-25 09:58:35 +08:00
Huabing.Xu 122f97f20a fix actionTest->ActionFollow, ActionCatmullRomStacked 2013-12-25 09:51:55 +08:00
chengstory e4e22b52cb Merge branch 'develop' into #3456 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
 2013-12-24 22:05:13 +08:00
chengstory 64f0987fea issue #3456 ios test rapidjson. 2013-12-24 21:23:24 +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
zhangcheng 2c6f95ecea issue #3456 replace jsoncpp to rapidjson. 2013-12-24 20:33:55 +08:00
CaiWenzhi 0dac69523c Remove "_renderer" from widget 2013-12-24 20:22:14 +08:00
James Chen 17a6dbebb6 Compilation error fixes. 2013-12-24 19:05:35 +08:00
zhangcheng 5214965e4f fixed #3456 2013-12-24 18:33:19 +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
samuele3hu e497f823ea Merge branch 'lua_spine_dev' of https://github.com/edwardzhou/cocos2d-x into Spine 2013-12-24 16:14:10 +08:00
boyu0 1a453a26ab Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 
Conflicts:
	cocos/2d/renderer/CCNewSpriteBatchNode.cpp
	cocos/2d/renderer/CCNewSpriteBatchNode.h
 2013-12-24 16:07:25 +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
boyu0 6e6ccbd5f9 change some const char* to const std::string& 2013-12-24 15:49:58 +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