Dhilan007
861925e752
fix compiling error in vs project on win7.
2013-12-27 14:38:22 +08:00
James Chen
93ed5a4f0f
long --> ssize_t for TableView callback.
2013-12-26 04:09:24 -08:00
James Chen
902490c79a
Generates execute file in cocos root_dir/bin folder for HelloCpp.
2013-12-26 04:09:03 -08:00
James Chen
9d4a84c40c
Merge pull request #4679 from dabingnn/develop_FixTestCase_labelTestNew
...
Develop fix test case label test new
2013-12-26 00:27:59 -08:00
James Chen
517f3991ef
Merge pull request #4678 from dumganhar/compile-fix
...
Compilation fixes after merge PR #4669
2013-12-26 00:15:24 -08:00
Huabing.Xu
706d0e185a
fix LabelTestNew
2013-12-26 16:11:06 +08:00
Huabing.Xu
69a490ef08
Fix box2dView
2013-12-26 15:48:26 +08:00
Huabing.Xu
5faf89c183
change rendering callback from public to protected
2013-12-26 15:34:22 +08:00
Huabing.Xu
c28f3fb0e9
fix clippingNodeTest
2013-12-26 15:30:13 +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
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
CaiWenzhi
7be4d07b7f
Fixed build error
2013-12-26 11:56:48 +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
Huabing.Xu
ec8f30b4d5
fix tilemapTest
2013-12-26 11:19:09 +08:00
Huabing.Xu
58bb327db9
fix texture2dtest->drawinrect
2013-12-26 10:24:40 +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
CaiWenzhi
96279c12dc
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 18:32:15 +08:00
CaiWenzhi
570b6c95a7
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 17:29:30 +08:00
samuele3hu
1075a711e0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine
2013-12-25 16:58:19 +08:00
Huabing.Xu
2eaba86d76
fix ShadeNodeTest->SpriteBlur
2013-12-25 16:54:09 +08:00
samuele3hu
9cf45a292b
Delete some annotated statement about spine and add some reserve manual lua binding functions
2013-12-25 16:42:40 +08:00
Huabing.Xu
7816635963
fix ShadeNodeTest->ShaderNode
2013-12-25 16:38:43 +08:00
Huabing.Xu
218dc7c115
fix RenderTextureTest->simpleSprite
2013-12-25 16:18:29 +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
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
Huabing.Xu
22a62d9d07
Fix TestBoundingBox
2013-12-25 14:02:13 +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
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
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
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
Huabing.Xu
fac87108f6
fix actionTest->Box2dTest
2013-12-25 10:54:31 +08:00
CaiWenzhi
2ae8576e0f
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-25 10:40:05 +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
CaiWenzhi
0dac69523c
Remove "_renderer" from widget
2013-12-24 20:22:14 +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
James Chen
0305ff15db
Merge pull request #4625 from dabingnn/develop_NewClippingNode
...
Develop new clipping node
2013-12-23 23:20:38 -08:00