boyu0
6bc0a7066f
change CustomCommand variable to class member.
2013-12-26 21:19:12 +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
chengstory
91edad5152
Merge branch 'develop' into #3457
2013-12-26 16:56:43 +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
yinkaile
f0d4f3f9bf
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-26 16:19:21 +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
boyu0
f878864794
Specialize GroupCommand and CustomCommand, change generateCommand to new.
2013-12-26 15:41:47 +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
chengstory
efa7495953
Merge branch 'develop' into #3457
2013-12-26 14:46:36 +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
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
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
yinkaile
b553828ed2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-26 10:24:33 +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
8afdf88d25
Test triiger 3.0
2013-12-26 01:17:04 +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
yinkaile
369b4da721
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #3456
2013-12-25 16:55:56 +08:00
Huabing.Xu
2eaba86d76
fix ShadeNodeTest->SpriteBlur
2013-12-25 16:54:09 +08:00
yinkaile
ebf9833958
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-25 16:47:14 +08:00
yinkaile
13408e4dc5
change play interface name
2013-12-25 16:46:31 +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
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
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
James Chen
451d76f6b0
Merge pull request #4611 from dumganhar/spine-test
...
Merge PR #4572 , Spine JS test support.
2013-12-23 22:55:58 -08:00
yinkaile
67c3480320
change std::string.compare() to ==
2013-12-24 14:21:25 +08:00
Huabing.Xu
e7facf9f85
remove NewClippingNode feature function into ClippingNode
2013-12-24 14:08:57 +08:00
yinkaile
9f8d95131e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-24 13:48:41 +08:00
Edward Zhou
4082c86070
1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated.
2013-12-24 11:55:53 +08:00
Huabing.Xu
b61bf3ad95
LabelBMFont inherit SpriteBatchNode instead of NewSpriteBatchNode
...
remove NewSpriteBatchNode testcase to SpriteBatchNode
2013-12-24 10:51:35 +08:00
yinkaile
4de3e520d8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-24 10:51:24 +08:00
CaiWenzhi
6dd55921aa
Merge branch 'develop' into develop_nutty_modify_framework_newrender
2013-12-24 10:44:57 +08:00
Huabing.Xu
c4f4f91cb4
Merge branch 'develop' into develop_mergeNewSprite
...
* develop:
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates Bindings-generator.
Binds Node::setAnchorPoint manually.
Don’t hide parent’s addChild method in TMXLayer class.
[AUTO] : updating submodule reference to latest autogenerated bindings
Updates JS-tests to the latest version.
[Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
Updates js tests to the latest version.
Removes unneeded binding glue codes, Sprite::setPosition.
Bindings-generator skips Node::setContentSize. Binds it manually.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3353:Add the DisplayLinkDirector lua binding
issue #2771 : fix warning log and fix typo.
issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-24 10:03:21 +08:00
James Chen
05f6a5b09b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
2013-12-23 22:05:20 +08:00
James Chen
44f9009a5d
Merge pull request #4610 from dumganhar/lastest-js-test
...
Updates JS-test to the latest version and some binding fixes
2013-12-23 06:04:49 -08:00
James Chen
b08995ae67
Updates JS-tests to the latest version.
2013-12-23 21:14:55 +08:00
Huabing.Xu
e66eb6464d
use Sprite instead of NewSprite
2013-12-23 21:07:25 +08:00
James Chen
a48544c814
Merge pull request #4598 from boyu0/iss2771_physical
...
issue #2771 : fix warning log and fix typo.
2013-12-23 05:00:03 -08:00
James Chen
cafebe7295
Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-23 20:28:51 +08:00
James Chen
92ee688b73
Updates js tests to the latest version.
2013-12-23 20:26:13 +08:00
Huabing.Xu
75597bc47f
Merge branch 'develop' into develop_mergeNewRenderTexture
...
* develop:
[LUA] Removes CCCameraDeprecated table in Deprecated.lua.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583 ).
issue #3403:Delete Camera manual lua binding
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-23 18:34:12 +08:00
Huabing.Xu
9c97fc6f19
remove NewRenderTexture include file
2013-12-23 18:08:50 +08:00
Huabing.Xu
41a77fed61
TestCase Use RenderTexture instead of NewRenderTexture
2013-12-23 17:13:41 +08:00
CaiWenzhi
a19000b49f
Add samples
2013-12-23 15:35:35 +08:00
boyu0
69f1834e61
issue #2771 : fix warning log and fix typo.
2013-12-23 14:30:43 +08:00
yinkaile
8d9035c5e8
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-12-23 14:06:22 +08:00
yinkaile
ba809a0096
change const char* to const std::string&
2013-12-23 14:05:46 +08:00
samuele3hu
f0dc7f0b15
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
2013-12-23 11:19:55 +08:00
samuele3hu
7daace0b2a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-23 09:43:05 +08:00
samuele3hu
50bcdee725
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
2013-12-22 22:11:17 +08:00
samuele3hu
97f26176e8
issue #3403:Add the EventDispatcher lua binding and the releated test cases
2013-12-22 22:10:21 +08:00
Dhilan007
786b7d9912
update vs project for remove CCCamera.
2013-12-22 17:19:59 +08:00
minggo
3d37a26e21
Merge pull request #4523 from Dhilan007/increase_test_pressure
...
increase label test pressure.
2013-12-21 17:08:20 -08:00
Ricardo Quesada
49903ea779
Director emits events after visit, after draw and after update. And when the projection changes
...
Adds helper functions on EventDispatcher
Adds test in NewEventDispatcherTest
2013-12-21 10:55:16 -08:00
Ricardo Quesada
eea2e70d1e
Adds events in director
2013-12-21 00:56:28 -08:00
Ricardo Quesada
eadbaa3bf5
Adds comment to ActionCamera file
2013-12-20 19:37:14 -08:00
Ricardo Quesada
b8b7714431
Camera is working OK in 2d projection
2013-12-20 19:19:24 -08:00
Ricardo Quesada
d8ad5291f4
Nore camera
2013-12-20 16:33:31 -08:00
James Chen
0db2067f97
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-spine
2013-12-20 20:11:41 +08:00
byeonggee.seo
ef1709bc3d
Add SpineTest to TestJavascript 1
2013-12-20 19:20:13 +09:00
minggo
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
Ricardo Quesada
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00