Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,178 Commits 2 Branches 34 Tags 1.2 GiB
Commit Graph

19178 Commits

Author SHA1 Message Date
CocosRobot 789ebb7d67 last version, need ignore 2014-03-18 14:49:49 +08:00
James Chen 2fd3e3df65 Merge pull request #5850 from lmskater/fix-submodule-update-fail 
[Jenkins] make build fail when submodule update fail
 2014-03-18 14:48:25 +08:00
lm 716f480eb4 [Jenkins] make build fail when submodule update fail 2014-03-18 14:37:23 +08:00
andyque 8c25fd5e8f modify android-build-autotest in autotest.py. 2014-03-18 14:30:01 +08:00
andyque a4bba6d03a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into autotest 2014-03-18 14:07:24 +08:00
andyque 761456d480 test android part of autotest.py. 2014-03-18 14:06:33 +08:00
Dhilan007 a286ed8374 fixed typo. 2014-03-18 13:48:41 +08:00
samuele3hu 76abe8d1c9 make FileUtilsWin32::getWritablePath() return value unified whether release or debug 2014-03-18 10:51:07 +08:00
samuele3hu 402b6f0f28 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_3_fix 2014-03-18 10:40:12 +08:00
samuele3hu 309422f791 update `bindings-generator` submodule 2014-03-18 10:36:37 +08:00
Dhilan007 d59fb25e2a update test case of issue 4428. 2014-03-18 10:26:45 +08:00
Dhilan007 4d5c7fc634 Add a test case to reproduce issue 4428. 2014-03-18 10:20:25 +08:00
chuanweizhang2013 da26dc0138 Merge pull request #18 from cocos2d/develop 
update cocos2d-x
 2014-03-18 10:13:18 +08:00
chuanweizhang2013 05a5e93d04 fixed win32 exit 2014-03-18 09:41:14 +08:00
Sergey f65ef462e5 getCurrentLanguageCode() for all platforms return iso 639-1 language code 
iPhone template improvements(for game center support)
 2014-03-17 22:34:21 +04:00
heliclei fe1bc368ec refactor upload:encode file with base64, detach upload from main loop 2014-03-18 00:46:17 +08:00
heliclei 4657b28c2d refactor upload:encode file with base64, detach upload from main loop 2014-03-18 00:42:36 +08:00
chuanweizhang2013 6b2ce283e4 fixed win32 don't exit 2014-03-17 20:46:49 +08:00
Dhilan007 46a4c17097 change access specifier of SpriteBatchNode::addSpriteWithoutQuad. 2014-03-17 19:31:58 +08:00
Dhilan007 cc671835f8 closed issue#4428:fixed label display incorrect if invoking getLetter and it's multi-line. 2014-03-17 18:33:15 +08:00
minggo 36cfd17e7b Merge pull request #5834 from shujunqiao/autotest 
modify autotest.py for use mac app.
 2014-03-17 17:59:36 +08:00
linchaogithub 88232d86bd [jenkins-watchdog] ['JENKINS_ADMIN']replace['username'],['JENKINS_ADMIN_PW']replace['password'] 2014-03-17 16:10:26 +08:00
minggo 9c92929781 Merge pull request #5838 from natural-law/develop 
Update the reference of submodule "cocos2d-console".
 2014-03-17 15:26:57 +08:00
zhangbin bf68f180b4 Update the reference of submodule "cocos2d-console". 2014-03-17 15:25:07 +08:00
chuanweizhang2013 e89f20a0b3 update win32 prebuilt 2014-03-17 15:00:21 +08:00
linchaogithub bcdf74f4ee [jenkins-watchdog] int(os.environ['jenkins-job-watchdog-threshold'])replace os.environ['jenkins-job-watchdog-threshold'] 2014-03-17 14:53:03 +08:00
chuanweizhang2013 08a04e6408 update release writepath 2014-03-17 14:44:20 +08:00
CocosRobot 7fd3017b5f modify autotest.py for use mac app. 2014-03-17 11:49:18 +08:00
minggo 86569cf456 [ci skip] 2014-03-17 11:27:13 +08:00
minggo 7cbab6a9f7 Merge pull request #5826 from chuanweizhang2013/cmdconsole 
console variable init
 2014-03-17 11:24:54 +08:00
chuanweizhang2013 295bf7f7f2 rename variable 2014-03-17 11:06:50 +08:00
chuanweizhang2013 6c1e2ee181 add win32 2014-03-16 21:17:19 +08:00
chuanweizhang2013 d0f90401ce Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage 2014-03-16 17:36:48 +08:00
chuanweizhang2013 b44b5ce52f add send \n 2014-03-16 17:32:08 +08:00
honghui 441c5cd8d4 update prebuilt 2014-03-16 17:04:22 +08:00
chuanweizhang2013 1cf064a7d7 Merge branch 'cmdconsole' into luamerage 2014-03-16 10:06:46 +08:00
chuanweizhang2013 9e43eb639f Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage 2014-03-15 18:34:02 +08:00
chuanweizhang2013 2f62cd2383 modify recv namelen array 2014-03-15 18:30:58 +08:00
chuanweizhang2013 ec6c4ddf64 modify recv namelen array 2014-03-15 18:28:42 +08:00
chuanweizhang2013 9167d39959 space 2014-03-15 18:18:56 +08:00
chuanweizhang2013 0a9ec91d6c init Console variable 2014-03-15 18:13:29 +08:00
chuanweizhang2013 4fa24e4c86 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-15 17:37:32 +08:00
chuanweizhang2013 d8119321e4 release c++ compile 2014-03-15 17:30:49 +08:00
minggo 343a77991f Merge pull request #5824 from lihex/develop 
update submodule
 2014-03-15 12:27:11 +08:00
lihex da7b6d565c update submodule 2014-03-15 12:20:22 +08:00
cw e5331c827d update win32 prebuilt 2014-03-15 11:12:01 +08:00
cw 1e551f8ca4 Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage 
Conflicts:
	templates/lua-template-runtime/src/main.lua
 2014-03-15 10:37:26 +08:00
cw ea9a9bceb2 update lua debugger 2014-03-15 10:34:21 +08:00
chuanweizhang2013 59011f86a0 Merge pull request #17 from cocos2d/develop 
update coco2d-x
 2014-03-15 10:05:46 +08:00
James Chen c1ca37e591 Merge pull request #5821 from CocosRobot/update_cocosfiles_1394819251 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-15 01:48:11 +08:00