minggo
|
9d1a70d569
|
update console to latest version
|
2014-03-11 16:47:16 +08:00 |
CocosRobot
|
b6ebd84534
|
[AUTO]: updating luabinding automatically
|
2014-03-11 08:38:10 +00:00 |
James Chen
|
2f877de428
|
Merge pull request #5657 from Dhilan007/develop_label
closed #4337:label support create by font name,compatible with old labelTTF
|
2014-03-11 16:29:29 +08:00 |
Dhilan007
|
b72d009eac
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-03-11 16:16:07 +08:00 |
James Chen
|
b2e3f62a84
|
Merge pull request #5673 from Dhilan007/develop_gblur
re-open configuration for generate binding glue codes.
|
2014-03-11 16:02:12 +08:00 |
Dhilan007
|
41c8b6064e
|
re-open generate binding glue codes.
|
2014-03-11 15:30:48 +08:00 |
heliclei
|
80417f0f35
|
correct naming convetion
|
2014-03-11 15:27:28 +08:00 |
Dhilan007
|
c2ef7b8796
|
fix incorrect implementation of Label::getContentSize
|
2014-03-11 15:03:16 +08:00 |
minggo
|
08e2c9a79f
|
Merge pull request #5672 from minggo/develop
set ANDROID_SDK_ROOT to correct path
|
2014-03-11 14:55:56 +08:00 |
minggo
|
6c564e4c97
|
set ANDROID_SDK_ROOT to correct path
|
2014-03-11 14:54:14 +08:00 |
cw
|
e3410d5ee1
|
merage cocos2d-x lua templateMerge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-03-11 14:42:33 +08:00 |
Dhilan007
|
792e182e12
|
typo fix and coding style improvements.
|
2014-03-11 14:32:07 +08:00 |
heliclei
|
8db680b9ee
|
add EnumChildNodesByName, walk node tree with callback
|
2014-03-11 13:58:43 +08:00 |
CaiWenzhi
|
ae8286bc5e
|
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
|
2014-03-11 13:47:33 +08:00 |
yinkaile
|
c60e0676f7
|
Merge pull request #3 from geron-cn/develop
repair bug: changedisplay(armature,i>=0) does not reblind parentbone
|
2014-03-11 13:44:27 +08:00 |
Geron
|
09c6d196a2
|
Merge pull request #1 from 2youyouo2/develop
merge kaile
|
2014-03-11 12:37:55 +08:00 |
minggo
|
4f621e71ca
|
Merge pull request #5670 from minggo/develop
ask to set ANT_ROOT, and add more redeable information
|
2014-03-11 12:00:46 +08:00 |
minggo
|
c72586ddbe
|
ask to set ANT_ROOT, and add more redeable information
|
2014-03-11 11:57:51 +08:00 |
CaiWenzhi
|
3554047b62
|
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
|
2014-03-11 11:56:39 +08:00 |
CaiWenzhi
|
6efa17cddf
|
Add event type to ListView
|
2014-03-11 11:53:44 +08:00 |
James Chen
|
21df081bd0
|
Merge pull request #5667 from lihex/develop
fix the lua template
|
2014-03-11 11:34:14 +08:00 |
lihex
|
4fd2040366
|
Merge branch 'develop' of https://github.com/lihex/cocos2d-x into develop
|
2014-03-11 11:24:46 +08:00 |
lihex
|
901116bc5b
|
fix the lua template
|
2014-03-11 11:24:14 +08:00 |
James Chen
|
c22740d96b
|
Merge pull request #5651 from lmskater/fix-comment-trigger
[Jenkins] fix the crash in comment trigger
|
2014-03-11 11:00:10 +08:00 |
James Chen
|
a6ece431b9
|
Merge pull request #5664 from CocosRobot/update_lua_bindings_1394506283
[AUTO]: updating luabinding automatically
|
2014-03-11 10:54:58 +08:00 |
James Chen
|
e522f3b03b
|
Update CHANGELOG [ci skip]
|
2014-03-11 10:52:28 +08:00 |
CocosRobot
|
725440fe3f
|
[AUTO]: updating luabinding automatically
|
2014-03-11 02:52:22 +00:00 |
James Chen
|
3622b03c7b
|
Merge pull request #5662 from boyu0/bug4324_physicscontact_memory_leak
closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method.
|
2014-03-11 10:48:15 +08:00 |
geron-cn
|
9083de94b4
|
repair bug: changedisplay(armature,i>=0) does not reblind parentbone
|
2014-03-11 10:21:43 +08:00 |
chuanweizhang2013
|
12922e5b89
|
Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
|
2014-03-11 09:41:33 +08:00 |
boyu0
|
23f42da548
|
closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method.
|
2014-03-11 05:09:08 +08:00 |
minggo
|
5e7f2dee8f
|
Merge pull request #5643 from nutty898/develop_nutty_modify_framework_for315CrashFixed
Develop nutty modify framework for315 crash fixed
|
2014-03-10 21:49:22 +08:00 |
minggo
|
2aa5c7aadd
|
Merge pull request #5649 from dabingnn/develop_fix_clippingNodeShaderBug
closed #4315: fixed clippingNode alphaTest Bug
|
2014-03-10 21:45:47 +08:00 |
Dhilan007
|
11d3acd478
|
fixed inappropriate usage of inline.
|
2014-03-10 20:35:36 +08:00 |
minggo
|
e9b13772e8
|
Merge pull request #5660 from minggo/develop
update console to latest codes
|
2014-03-10 20:03:32 +08:00 |
minggo
|
376ae24c10
|
update console to latest codes
|
2014-03-10 20:01:22 +08:00 |
James Chen
|
df55fea441
|
Merge pull request #5659 from dumganhar/re-add-lua
Re-add lua template.
|
2014-03-10 19:51:56 +08:00 |
minggo
|
d0ba5dd55a
|
Merge pull request #5658 from minggo/develop
set ANT_ROOT environment variable
|
2014-03-10 19:49:05 +08:00 |
Dhilan007
|
8bac35ae2a
|
closed #4337:label support create by font name,compatible with old labelTTF.
|
2014-03-10 19:42:43 +08:00 |
minggo
|
0f50127851
|
set ANT_ROOT environment variable
|
2014-03-10 19:38:56 +08:00 |
James Chen
|
cf5dacb24e
|
Re-add lua template.
|
2014-03-10 19:33:57 +08:00 |
James Chen
|
47ab58f238
|
Merge pull request #5656 from CocosRobot/update_lua_bindings_1394450746
[AUTO]: updating luabinding automatically
|
2014-03-10 19:30:08 +08:00 |
CocosRobot
|
8aa11f005b
|
[AUTO]: updating luabinding automatically
|
2014-03-10 11:27:21 +00:00 |
James Chen
|
c8f8f65b04
|
Merge pull request #5655 from dumganhar/re-add-lua
Corrects a mistake in generate-bindings.sh
|
2014-03-10 19:20:35 +08:00 |
James Chen
|
38160ff7d7
|
Corrects a mistake in generate-bindings.sh
|
2014-03-10 19:18:55 +08:00 |
James Chen
|
784a88dc0e
|
Merge pull request #5653 from dumganhar/re-add-lua
Re-add CocosRobot send bindings glue codes to cocos2d-x repo.
|
2014-03-10 18:32:28 +08:00 |
James Chen
|
2fbdad0b7e
|
Update CHANGELOG [ci skip]
|
2014-03-10 18:30:12 +08:00 |
James Chen
|
63292b5ba6
|
Merge pull request #5544 from heliclei/node-string-tag
CCNode:Add String tag, to support runtime manipulation
|
2014-03-10 18:26:51 +08:00 |
James Chen
|
6ffb597fe8
|
Merge pull request #5652 from CocosRobot/update_cocosfiles_1394444955
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-03-10 18:25:44 +08:00 |
James Chen
|
7d3a6c999d
|
Updates before-install.sh.
|
2014-03-10 18:24:28 +08:00 |