Huabing.Xu
04fec6e95b
Merge branch 'develop' into develop_FixTestCase_ClippingNodeTest
...
* develop:
2013-12-26 15:32:28 +08:00
Huabing.Xu
c28f3fb0e9
fix clippingNodeTest
2013-12-26 15:30:13 +08:00
James Chen
beced4897e
Merge pull request #4675 from dabingnn/develop_FixTestCase_TilemapTest
...
Develop fix test case tilemap test
2013-12-25 22:58:52 -08:00
CaiWenzhi
4d8e3a423c
Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles
2013-12-26 14:58:44 +08:00
yinkaile
c096743325
change comment
2013-12-26 14:57:38 +08:00
CaiWenzhi
530f82ee27
Add refresh layout method
2013-12-26 14:57:30 +08:00
Huabing.Xu
3cdc20612b
Merge branch 'develop' into develop_FixTestCase_TilemapTest
...
* develop:
Update CHANGELOG [ci skip]
[AUTO] : updating submodule reference to latest autogenerated bindings
[GUI] Updates Mac project.
Remove C cast
Fixed bugs about color and opacity
Remove "_renderer" from widget
Fixed bugs
Remove CCDictionary from GUIReader
Add samples
Remove NodeRGBA inherit
2013-12-26 14:57:10 +08:00
chuanweizhang
911c7eae10
modify license time
2013-12-26 14:49:06 +08:00
chengstory
efa7495953
Merge branch 'develop' into #3457
2013-12-26 14:46:36 +08:00
Huabing.Xu
963d637198
use raw new instead of generateCommand
2013-12-26 14:45:44 +08:00
Huabing.Xu
b4c61d5a7c
specialize RenderCommandPool<QuadCommand>
2013-12-26 14:44:21 +08:00
minggo
03c4b57f5b
Merge pull request #4668 from dabingnn/develop_FixTestCase_Texture2dTest
...
Develop fix test case texture2d test
2013-12-25 22:42:20 -08:00
chengstory
2232e0f015
fixed #3457 remove jsoncpp cmakelist.
2013-12-26 13:35:33 +08:00
chengstory
ab3cf064d1
fixed #4357 failed to build android.
2013-12-26 13:26:23 +08:00
chengstory
263c4fbb0a
fixed #3457 remove unused comment.
2013-12-26 12:58:34 +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
James Chen
df690e8f8b
Updates bindings config files.
2013-12-26 12:50:37 +08:00
CaiWenzhi
946dab0b34
Modify android mk
2013-12-26 12:23:58 +08:00
CaiWenzhi
7be4d07b7f
Fixed build error
2013-12-26 11:56:48 +08:00
子龙山人
215c365383
Merge pull request #3 from cocos2d/develop
...
sync original repo
2013-12-25 19:48:09 -08:00
CaiWenzhi
8215e90870
Modify build files
2013-12-26 11:44:55 +08:00
CaiWenzhi
30cc579f0c
Modify Test CMakeList
2013-12-26 11:36:18 +08:00
CaiWenzhi
b1d2aa9b79
Modify CMakeList
2013-12-26 11:25:49 +08:00
Huabing.Xu
ec8f30b4d5
fix tilemapTest
2013-12-26 11:19:09 +08:00
CaiWenzhi
581678b6b0
Modify android mk
2013-12-26 11:06:10 +08:00
chuanweizhang
951b460321
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-26 11:03:56 +08:00
James Chen
4e25d88741
Merge pull request #4670 from CocosRobot/updategeneratedsubmodule_1388026235
...
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
2013-12-25 18:58:22 -08:00
James Chen
dafaff0d83
Update CHANGELOG [ci skip]
2013-12-26 10:52:01 +08:00
CocosRobot
e6727ea087
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-26 02:50:37 +00:00
子龙山人
47ab490559
Merge pull request #2 from cocos2d/develop
...
update
2013-12-25 18:47:04 -08:00
James Chen
7f459ef16b
Merge pull request #4669 from dumganhar/gui-refactor
...
Merge PR #4617 , GUI refactor
2013-12-25 18:46:04 -08:00
James Chen
444389e92d
[GUI] Updates Mac project.
2013-12-26 10:44:41 +08:00
Huabing.Xu
58bb327db9
fix texture2dtest->drawinrect
2013-12-26 10:24:40 +08:00
yinkaile
b553828ed2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-26 10:24:33 +08:00
yinkaile
b44090b40b
change std::map to std::unordered_map
2013-12-26 10:23:51 +08:00
chuanweizhang
0343f55dc7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-26 10:23:00 +08:00
chuanweizhang
c9135eb6b9
modify linux template
2013-12-26 10:22:39 +08:00
Huabing.Xu
ce97b85935
Merge branch 'develop' into develop_FixTestCase_Texture2dTest
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
Add missing file for linux lua binding
Add include_directories for spine
issue #2920 : add version detect.
Delete some annotated statement about spine and add some reserve manual lua binding functions
issue #2920 : add “FIX ME” comment.
Modify iOS project set and some manual lua binding
issue #2920 : temporary fix dictation input crash on ios7.
1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated.
2013-12-26 10:08:25 +08:00
Huabing.Xu
e8fd46f6b8
fix Texture2dTest->DrawAtPoint
2013-12-26 10:03:45 +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
CaiWenzhi
8299e4c494
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 22:05:21 +08:00
James Chen
9679b0c8a7
Merge pull request #4664 from CocosRobot/updategeneratedsubmodule_1387967684
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-25 04:29:10 -08:00
yinkaile
5eb961b165
fixed warning
2013-12-25 19:46:09 +08:00
CocosRobot
6492f61691
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-25 10:34:46 +00:00
chuanweizhang
23192a883c
modify linux tempalte
2013-12-25 18:32:23 +08:00
CaiWenzhi
96279c12dc
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 18:32:15 +08:00
CaiWenzhi
c516860017
Fixed bugs about color and opacity
2013-12-25 18:30:21 +08:00
James Chen
6b3d6da53e
Merge pull request #4662 from samuele3hu/Spine
...
Add Spine lua binding with test case
2013-12-25 02:28:58 -08:00