James Chen
|
7bc3ef7ca8
|
Merge pull request #4626 from CocosRobot/updategeneratedsubmodule_1387866821
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 22:36:36 -08:00 |
CocosRobot
|
4775b4c4d8
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 06:33:43 +00:00 |
James Chen
|
f573f1092c
|
Update CHANGELOG [ci skip]
|
2013-12-24 14:27:25 +08:00 |
James Chen
|
39c3bc10ed
|
Merge pull request #4614 from 2youyouo2/develop
update armature, using `const std::string&` instead of `const char*`
|
2013-12-23 22:25:50 -08:00 |
yinkaile
|
67c3480320
|
change std::string.compare() to ==
|
2013-12-24 14:21:25 +08:00 |
Huabing.Xu
|
c36d920159
|
remove include reference
|
2013-12-24 14:15:23 +08:00 |
Huabing.Xu
|
eee06ec905
|
update project file:android and linux
|
2013-12-24 14:12:15 +08:00 |
Huabing.Xu
|
9db599c0c9
|
remove class NewClippingNode
|
2013-12-24 14:10:54 +08:00 |
Huabing.Xu
|
e7facf9f85
|
remove NewClippingNode feature function into ClippingNode
|
2013-12-24 14:08:57 +08:00 |
James Chen
|
5a6275f3cc
|
Update CHANGELOG [ci skip]
|
2013-12-24 14:04:55 +08:00 |
James Chen
|
e81d125fd4
|
Merge pull request #4624 from CocosRobot/updategeneratedsubmodule_1387864787
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 22:01:02 -08:00 |
CocosRobot
|
c170559759
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 05:59:50 +00:00 |
James Chen
|
de987ae660
|
Merge pull request #4623 from samuele3hu/NewEventDispatcher
Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding
|
2013-12-23 21:54:52 -08:00 |
yinkaile
|
9f8d95131e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-12-24 13:48:41 +08:00 |
samuele3hu
|
7f4e384886
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
|
2013-12-24 13:43:57 +08:00 |
samuele3hu
|
98e4e802f4
|
Support pass by value for setPosition\setAnchorPoint\setContentSize for lua binding
|
2013-12-24 13:42:32 +08:00 |
yinkaile
|
44e22584a4
|
fixed getFileData
|
2013-12-24 13:35:46 +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 |
James Chen
|
164a4c5263
|
Merge pull request #4621 from CocosRobot/updategeneratedsubmodule_1387856735
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 19:46:31 -08:00 |
CocosRobot
|
e50b6b616b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 03:45:37 +00:00 |
boyu0
|
8e329501ba
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string
Conflicts:
cocos/2d/renderer/CCNewSprite.cpp
cocos/2d/renderer/CCNewSprite.h
cocos/2d/renderer/CCNewTextureAtlas.cpp
cocos/2d/renderer/CCNewTextureAtlas.h
|
2013-12-24 11:44:08 +08:00 |
James Chen
|
3803e5f996
|
Merge pull request #4619 from dabingnn/develop_NewSpriteBatchNode
Develop new sprite batch node
|
2013-12-23 19:41:06 -08:00 |
Huabing.Xu
|
b821a33cfa
|
remove comment code
|
2013-12-24 11:28:42 +08:00 |
Huabing.Xu
|
a607bc9ac1
|
Merge branch 'develop' into develop_NewSpriteBatchNode
* develop:
[JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 11:21:37 +08:00 |
Huabing.Xu
|
12e2cfedf2
|
update project file:android and linux
|
2013-12-24 11:20:21 +08:00 |
CaiWenzhi
|
f355fa6201
|
Fixed bugs
|
2013-12-24 11:18:25 +08:00 |
yinkaile
|
ff053e71fe
|
change std::string compare method
|
2013-12-24 11:05:53 +08:00 |
Huabing.Xu
|
24ac743a3c
|
remove class NewSpriteBatchNode
|
2013-12-24 11:03:59 +08:00 |
James Chen
|
4d19002b04
|
Merge pull request #4618 from dumganhar/develop
[JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
|
2013-12-23 18:52:51 -08:00 |
boyu0
|
3344c5243c
|
change some const char* to const std::string&
|
2013-12-24 10:51:47 +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 |
Huabing.Xu
|
410cfb9ca4
|
move NewSpriteBatchNode feature function into SpriteBatchNode
|
2013-12-24 10:48:57 +08:00 |
CaiWenzhi
|
6dd55921aa
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-24 10:44:57 +08:00 |
James Chen
|
325f2e21a7
|
[JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
|
2013-12-24 10:41:45 +08:00 |
CaiWenzhi
|
3885477276
|
Remove CCDictionary from GUIReader
|
2013-12-24 10:41:01 +08:00 |
James Chen
|
a515c7eb1c
|
Merge pull request #4616 from CocosRobot/updategeneratedsubmodule_1387852095
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 18:36:46 -08:00 |
CocosRobot
|
d22f2aaf67
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-24 02:28:17 +00:00 |
James Chen
|
dfaae3072b
|
Merge pull request #4615 from dabingnn/develop_mergeNewSprite
Develop merge new sprite
|
2013-12-23 18:23:30 -08:00 |
Huabing.Xu
|
8310c18105
|
update project file: android and linux
|
2013-12-24 10:07:53 +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 |
chuanweizhang
|
2308e94c2f
|
modify template
|
2013-12-24 09:42:37 +08:00 |
Huabing.Xu
|
8d58e43ad2
|
remove Class NewSprite
|
2013-12-24 09:40:00 +08:00 |
James Chen
|
a9f014eb22
|
Merge pull request #4612 from CocosRobot/updategeneratedsubmodule_1387807797
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 07:31:57 -08:00 |
CocosRobot
|
a9d8a64e63
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 14:10:01 +00: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
|
d6850c363a
|
Updates Bindings-generator.
|
2013-12-23 22:00:11 +08:00 |
James Chen
|
3327614a99
|
Binds Node::setAnchorPoint manually.
|
2013-12-23 21:54:02 +08:00 |
James Chen
|
5f17984826
|
Don’t hide parent’s addChild method in TMXLayer class.
|
2013-12-23 21:53:23 +08:00 |