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 |
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 |