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

218 Commits

Author SHA1 Message Date
James Chen f4825ec94a Bug fixes for cocostudio. 2013-12-27 20:54:05 +08:00
James Chen b03c8259b1 Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-27 20:18:58 +08:00
minggo 0690305398 Merge pull request #4666 from 2youyouo2/develop 
change play interface name
 2013-12-27 01:50:08 -08:00
chengstory faaf6d3f2b fixed #3457 fixes some bug. 2013-12-27 17:21:13 +08:00
chengstory 4cb227ae0d fixed #3457 ui action can not play. 2013-12-27 12:45:05 +08:00
zhangcheng dd4339b0bb Merge branch '#3457' of git://github.com/chengstory/cocos2d-x into #3457 2013-12-27 12:41:01 +08:00
zhangcheng 1b666d4d41 fixed #3457 scenetest crashed when back to menu. 2013-12-27 12:39:21 +08:00
Liam 0cdf2d15fe merge from develop branch 2013-12-27 10:50:50 +08:00
Liam 2a6c24f8bf update coco action with correct coding rule 2013-12-27 10:43:49 +08:00
zhangcheng 6a9fbfbc60 fixed #3457 update libCocosStudio.vcxproj, add trigger code. 2013-12-27 10:24:50 +08:00
chengstory 7a7d939da0 issue #3457 use C++ 11 auto loop. 2013-12-26 23:51:55 +08:00
chengstory 774e3d8536 issue #3457 
1. replace UIAction NULL to nullptr.
2. modify  class variable  name.
 2013-12-26 23:40:50 +08:00
chengstory cfbbb7889b Merge branch 'develop' into #3457 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2013-12-26 23:01:34 +08:00
chengstory 26df681915 fixed #3457 remove jsoncpp. 2013-12-26 22:45:23 +08:00
CaiWenzhi 26a7f3474c Modify reader 2013-12-26 21:02:47 +08:00
CaiWenzhi ad535e2fcb Add listview and pageview reader 2013-12-26 17:53:22 +08:00
chengstory bd46681867 fixed #3457 continue to fixes failed to build. 2013-12-26 17:37:02 +08:00
chengstory 041e78cb54 Fixes failed to build android. 2013-12-26 17:17:02 +08:00
CaiWenzhi 3206727b9c Modify actionnode 2013-12-26 17:01:31 +08:00
yinkaile 891d8c3a38 change comment 2013-12-26 16:48:19 +08:00
Liam a158e25767 modify coco action with new coding rule 2013-12-26 16:36:21 +08:00
Liam bc54707893 modify coco action with new coding rule 2013-12-26 16:29:59 +08:00
yinkaile f0d4f3f9bf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 16:19:21 +08:00
yinkaile 7027587542 fixed armature update 2013-12-26 15:49:20 +08:00
yinkaile c096743325 change comment 2013-12-26 14:57:38 +08:00
chengstory ab3cf064d1 fixed #4357 failed to build android. 2013-12-26 13:26:23 +08:00
chengstory 8ae7ecff33 Merge branch 'develop' into #3457 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-12-26 12:55:52 +08:00
yinkaile b44090b40b change std::map to std::unordered_map 2013-12-26 10:23:51 +08:00
chengstory 19d75cee01 fixed #3647 fixes ComAttribute warning. 2013-12-26 02:18:28 +08:00
chengstory 8afdf88d25 Test triiger 3.0 2013-12-26 01:17:04 +08:00
CaiWenzhi eaef723bd7 Remove C cast 2013-12-25 22:13:19 +08:00
yinkaile 5eb961b165 fixed warning 2013-12-25 19:46:09 +08:00
yinkaile d72c9d94d7 upload trigger code. 2013-12-25 17:40:54 +08:00
yinkaile 13408e4dc5 change play interface name 2013-12-25 16:46:31 +08:00
CaiWenzhi 2ae8576e0f Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 10:40:05 +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
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
zhangcheng 5214965e4f fixed #3456 2013-12-24 18:33:19 +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
yinkaile 67c3480320 change std::string.compare() to == 2013-12-24 14:21:25 +08:00
yinkaile 44e22584a4 fixed getFileData 2013-12-24 13:35:46 +08:00
yinkaile ff053e71fe change std::string compare method 2013-12-24 11:05:53 +08:00
CaiWenzhi 3885477276 Remove CCDictionary from GUIReader 2013-12-24 10:41:01 +08:00
CaiWenzhi 9aa85d2bd6 Remove NodeRGBA inherit 2013-12-23 15:02:52 +08:00
yinkaile ba809a0096 change const char* to const std::string& 2013-12-23 14:05:46 +08:00
yinkaile 4f003da8cb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-20 10:53:37 +08:00
James Chen e56a4a7c00 Merge pull request #4567 from dumganhar/for_each-gone 
All std::for_each has gone. uses for(const auto& ...) instead.
 2013-12-19 18:50:50 -08:00
minggo 756f8f7a11 Merge pull request #4482 from dabingnn/develop_gridNode 
Develop grid node
 2013-12-19 18:30:42 -08:00