James Chen
00d16aadc5
Merge pull request #4658 from dumganhar/develop
...
Some warning fixes.
2013-12-25 00:09:33 -08:00
James Chen
142b189305
Some warning fixes.
2013-12-25 16:06:39 +08:00
James Chen
3da854c8cd
Merge pull request #4656 from dabingnn/develop_FixTestCase_LabelTest
...
Develop fix test case label test
2013-12-24 23:20:45 -08:00
Huabing.Xu
7333a636c1
fix Label->LabelBMFontBounds
2013-12-25 15:13:11 +08:00
Huabing.Xu
19522152d5
fix Label->Atlas4
2013-12-25 15:05:49 +08:00
Huabing.Xu
cfb06722d5
Merge branch 'develop' into develop_FixTestCase_LabelTest
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
change “string.compare()” to “==“
fix android compile error
[AUTO] : updating submodule reference to latest autogenerated bindings
fix TestCpp project can't work on debug mode on vs.
Updates JS tests for SpineTest.
Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
change some const char* to const std::string&
change some const char* to const std::string&
2013-12-25 14:55:57 +08:00
Huabing.Xu
e8d57154dd
fix Label->Atlas1
2013-12-25 14:52:49 +08:00
James Chen
2b5a3afd1e
Merge pull request #4655 from CocosRobot/updategeneratedsubmodule_1387953575
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-24 22:52:01 -08:00
boyu0
3764005d88
issue #2920 : add “FIX ME” comment.
2013-12-25 14:46:29 +08:00
CocosRobot
c71cd5a407
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-25 06:39:38 +00:00
James Chen
55b0ef85d8
Merge pull request #4631 from boyu0/const_char_star_to_std_string
...
Change const char* to const std::string&
2013-12-24 22:34:34 -08:00
minggo
599aabc55b
Merge pull request #4653 from dabingnn/develop_FixTestCase_ArmatureSceneTest
...
Develop fix test case armature scene test
2013-12-24 22:32:43 -08:00
boyu0
2c2953abc1
change “string.compare()” to “==“
2013-12-25 14:20:37 +08:00
Huabing.Xu
22a62d9d07
Fix TestBoundingBox
2013-12-25 14:02:13 +08:00
boyu0
f2e18f32a9
fix android compile error
2013-12-25 13:57:17 +08:00
samuele3hu
9fd64df099
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
2013-12-25 13:48:10 +08:00
samuele3hu
45cfe00ec4
Modify iOS project set and some manual lua binding
2013-12-25 13:47:22 +08:00
Huabing.Xu
699424e3c7
remove ArmatureTestLayer::draw
2013-12-25 11:53:50 +08:00
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