samuele3hu
|
d06bb83f19
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix
Conflicts:
tests/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua
|
2014-03-12 14:33:39 +08:00 |
samuele3hu
|
9c95c1e456
|
Replace cc.LabelTTF:create with cc.Label:create
|
2014-03-12 14:27:52 +08:00 |
James Chen
|
4a55e98adf
|
[lua] Reverts 'removing tolua.cast in test case, I don't know why it was re-added.
|
2014-03-12 14:06:57 +08:00 |
andyque
|
0634a1accd
|
fix lua resource path
|
2014-03-12 10:19:41 +08:00 |
James Chen
|
b88de91a15
|
Renames 'samples' folder to 'tests', ouch....
|
2014-03-11 19:10:34 +08:00 |