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

17606 Commits

Author SHA1 Message Date
CocosRobot 781ff463a2 [AUTO]: updating luabinding automatically 2014-03-19 01:56:50 +00:00
James Chen 0fad41a9cc Update CHANGELOG [ci skip] 2014-03-19 09:53:12 +08:00
James Chen a5e9630db1 Merge pull request #5843 from Dhilan007/develop_label 
closed #4428: fixed display incorrect of multi-line label if invoking 'getLetter'.
 2014-03-19 09:52:14 +08:00
Jeong YunWon 2f1a7ebf42 Elastic bounceback for ScrollView 
Add iOS-like elastic bounceback.
If you scroll content of scroll view out of insets,
its content will be scrolled 0.35 of user scrolled distance.
 2014-03-18 18:51:07 +09:00
lm 426b006bfb [Jenkins] build all samples on android 2014-03-18 17:27:57 +08:00
James Chen 88849e1510 Merge pull request #5853 from CocosRobot/update_lua_bindings_1395129281 
[AUTO]: updating luabinding automatically
 2014-03-18 16:15:54 +08:00
CocosRobot fc5a34e500 [AUTO]: updating luabinding automatically 2014-03-18 07:55:30 +00:00
James Chen 7a16ffff84 Merge pull request #5848 from samuele3hu/develop_3_fix 
Update `bindings-generator` submodule and resolve a error about the return value of FileUtilsWin32::getWritablePath()
 2014-03-18 15:52:07 +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
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
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
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
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
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 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
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
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
CocosRobot 8bd3bdf021 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-14 17:47:32 +00:00
James Chen 2e13d45848 Merge pull request #5819 from Dhilan007/develop_menu 
fixed content size of MenuItem is incorrect when font size or font name ...
 2014-03-15 01:27:05 +08:00
Dhilan007 e20676f939 fixed content size of MenuItem is incorrect when font size or font name change. 2014-03-15 01:24:23 +08:00
minggo 1c96c595ac Merge pull request #5817 from dumganhar/develop 
Fix potential overflow in Texture::getCachedTextureInfo and where uses MultiByteToWideChar and WideCharToMultiByte
 2014-03-15 01:23:00 +08:00
minggo dfb3b6719c Merge pull request #5818 from boyu0/support_for_xcode_iphone_64bit_simulator 
build lua.a for arm64bit and iOS simulator 64 bit architectures, change ...
 2014-03-15 01:22:28 +08:00
boyu0 f23db68151 build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files. 2014-03-15 01:19:06 +08:00
James Chen a47923e06d Fix potential overflow in Texture::getCachedTextureInfo. 2014-03-15 01:09:22 +08:00
James Chen c033591e6a [win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte. 2014-03-15 01:05:04 +08:00
minggo b0a6e34cc8 Update CHANGELOG 2014-03-15 00:52:19 +08:00
minggo 1b1bf1f8f3 Merge pull request #5816 from lihex/develop 
update submodule
 2014-03-15 00:37:59 +08:00
lihex c0416fe554 update submodule 2014-03-15 00:37:00 +08:00
James Chen 7337f87cb7 Merge pull request #5815 from dumganhar/develop 
Reverts changes in CCApplication.cpp/.mm, pollEvent must after main loop, otherwise, potential crash will happen.
 2014-03-15 00:14:10 +08:00
James Chen a8c960c7f1 Merge branch 'develop' of https://github.com/dumganhar/cocos2d-x into develop 2014-03-15 00:12:30 +08:00
James Chen 1f1ead6d3f Merge pull request #28 from cocos2d/develop 
update with upstream
 2014-03-15 00:12:10 +08:00