Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,705 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

17705 Commits

Author SHA1 Message Date
CocosRobot 0c68e4b1d5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 12:39:13 +00:00
James Chen 2b657e71c4 Merge pull request #5727 from natural-law/develop 
Update the reference of submodule "cocos2d-console".
 2014-03-12 20:36:44 +08:00
James Chen 8138df66e1 Merge pull request #5728 from dumganhar/develop 
[travis ci] Sort file list in generate-template-files.py.
 2014-03-12 20:36:20 +08:00
zhangbin be51779c4e Update the reference of submodule "cocos2d-console". 2014-03-12 20:35:05 +08:00
James Chen 04038a912f [travis ci] Sort file list in generate-template-files.py. 2014-03-12 20:34:49 +08:00
James Chen e691602205 Merge pull request #5725 from CocosRobot/update_cocosfiles_1394627042 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-12 20:25:05 +08:00
CocosRobot 6d867fb294 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 12:24:03 +00:00
James Chen b85a265cbb Merge pull request #5724 from dumganhar/develop 
Updates tools/travis-scripts/generate-template-files.py.
 2014-03-12 20:21:55 +08:00
James Chen c4752b260b Updates tools/travis-scripts/generate-template-files.py. 2014-03-12 20:18:55 +08:00
minggo 67e3a25582 Merge pull request #5669 from nutty898/develop_nutty_modify_framework_for315CrashFixed 
Develop nutty modify framework for315 crash fixed
 2014-03-12 19:45:46 +08:00
minggo 7becee3ce7 Merge pull request #5719 from CocosRobot/update_cocosfiles_1394624303 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-12 19:44:33 +08:00
minggo 20a44567b2 Merge pull request #5720 from CocosRobot/update_lua_bindings_1394624410 
[AUTO]: updating luabinding automatically
 2014-03-12 19:44:10 +08:00
CocosRobot e93feaa068 [AUTO]: updating luabinding automatically 2014-03-12 11:41:17 +00:00
CocosRobot 6721b15217 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 11:38:24 +00:00
James Chen 8004f48081 Merge pull request #5718 from samuele3hu/develop_new_fix 
Replace the apis of LableTTF and LableBMFont with the apis of Label
 2014-03-12 19:36:51 +08:00
James Chen 144884481a Merge pull request #5717 from CocosRobot/update_cocosfiles_1394620392 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-12 18:37:24 +08:00
samuele3hu 7e48dbc572 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-12 18:35:06 +08:00
samuele3hu 9713a246ee Replace cc.LabelBMFont:create with cc.Label:createBMFont 2014-03-12 18:33:28 +08:00
CocosRobot 2f582dcdb5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 10:33:14 +00:00
James Chen 27390f3282 Update CHANGELOG [ci skip] 2014-03-12 18:25:15 +08:00
James Chen f609d57a00 Merge pull request #5671 from heliclei/walk-node-tree 
Add enumerateChildrenByName for walking through node tree with callback
 2014-03-12 18:23:43 +08:00
heliclei 2a3cb0847e refactor api name 2014-03-12 18:10:45 +08:00
James Chen d49ada0a57 Merge pull request #5712 from chuanweizhang2013/luamerage 
update cocos_2d files generate rules
 2014-03-12 18:03:56 +08:00
samuele3hu c69d9e75b2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-12 17:58:20 +08:00
samuele3hu 1c32c6d96f Replace cc.LabelTTF:create with cc.Label:create 2014-03-12 17:51:34 +08:00
chuanweizhang2013 884229e898 modify generate-template-files 2014-03-12 17:20:15 +08:00
linchaogithub d1a84cd7e8 [Jenkins] watchdog 2014-03-12 17:18:16 +08:00
CaiWenzhi 4d99736e4a Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-12 17:06:48 +08:00
James Chen 984ecfd501 Merge pull request #5709 from dumganhar/rename-tests 
[win32] HelloCpp -> cpp-empty-test, HelloLua -> lua-empty-test.
 2014-03-12 16:52:35 +08:00
James Chen f01ca554aa Merge pull request #5708 from Dhilan007/develop_label 
fixed incorrect initial value of label's TextVAlignment.
 2014-03-12 16:46:22 +08:00
linchaogithub db68e1feed [jenkins] watchdog 2014-03-12 16:28:23 +08:00
chuanweizhang2013 7a11ad5a3f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-12 16:21:11 +08:00
James Chen 27a7dce447 Adds lua-empty-test to VS project. 2014-03-12 16:20:27 +08:00
chuanweizhang2013 e457e9d84f Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage 2014-03-12 16:16:42 +08:00
chuanweizhang2013 a1e80642bc Merge pull request #13 from cocos2d/develop 
update engine
 2014-03-12 16:15:51 +08:00
Dhilan007 c11ef679da fixed incorrect initial value of label's TextVAlignment. 2014-03-12 16:11:12 +08:00
linchaogithub 1a9b86c32e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-12 16:06:05 +08:00
James Chen 611cccd3e7 [win32] HelloCpp -> cpp-empty-test, HelloLua -> lua-empty-test. 2014-03-12 15:59:48 +08:00
James Chen 9c980dfcfe Merge pull request #5706 from dumganhar/rename-tests 
Rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects. And compilation error fix after changing folder name from 'gui' to 'ui'
 2014-03-12 15:48:29 +08:00
James Chen eae6880599 Adds 'ui' include path in liblua.vcxproj 2014-03-12 15:44:56 +08:00
James Chen bac19d6897 Merge pull request #5705 from CocosRobot/update_lua_bindings_1394610107 
[AUTO]: updating luabinding automatically
 2014-03-12 15:44:20 +08:00
CocosRobot 31b304af26 [AUTO]: updating luabinding automatically 2014-03-12 07:43:13 +00:00
linchaogithub d7aa1312ba [Jenkins] watchdog 2014-03-12 15:36:09 +08:00
James Chen 2ae283d506 Merge pull request #5702 from dumganhar/glview-inherit-order 
Changes the order of inheritance for GLView. Reason:
 2014-03-12 15:34:53 +08:00
James Chen a974e5e42b Merge pull request #5704 from Dhilan007/develop_label 
label: Change default font size from `32` to `12`, it's compatible with old LabelTTF.
 2014-03-12 15:33:30 +08:00
James Chen dd87df1cbc rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects. 2014-03-12 15:30:21 +08:00
Dhilan007 f5daf1af24 label:change default font size 2014-03-12 15:30:14 +08:00
chuanweizhang2013 fafc292d33 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luamerage 2014-03-12 15:28:07 +08:00
James Chen ca27bc4d6f Merge pull request #5703 from Dhilan007/develop_label 
label:fixed crash and incorrect getter.
 2014-03-12 15:23:06 +08:00
Dhilan007 2786b40dc3 using string::empty() for judge whether string is empty. 2014-03-12 15:03:22 +08:00