8000 Commits · YosukeMitsugi/cocos2d-x · GitHub

More Web Proxy on the site http://driver.im/

Commits

Commits on Mar 18, 2014

Merge pull request #5853 from CocosRobot/update_lua_bindings_1395129281
James Chen
committed
[AUTO]: updating luabinding automatically
CocosRobot
committed
Merge pull request #5848 from samuele3hu/develop_3_fix
James Chen
committed
Merge pull request #5850 from lmskater/fix-submodule-update-fail
James Chen
committed
[Jenkins] make build fail when submodule update fail
lmskater
committed
make FileUtilsWin32::getWritablePath() return value unified whether release or debug
samuele3hu
committed
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_3_fix
samuele3hu
committed
update `bindings-generator` submodule
samuele3hu
committed

Commits on Mar 17, 2014

Merge pull request #5834 from shujunqiao/autotest
minggo
committed
Merge pull request #5838 from natural-law/develop
minggo
committed
Update the reference of submodule "cocos2d-console".
zhangbin
committed
modify autotest.py for use mac app.
CocosRobot
committed
[ci skip]
minggo
committed
Merge pull request #5826 from chuanweizhang2013/cmdconsole
minggo
committed
rename variable
chuanweizhang2013
committed

Commits on Mar 15, 2014

modify recv namelen array
chuanweizhang2013
committed
space
chuanweizhang2013
committed
init Console variable
chuanweizhang2013
committed
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
chuanweizhang2013
committed
Merge pull request #5824 from lihex/develop
minggo
committed
update submodule
lihex
committed

Commits on Mar 14, 2014

Merge pull request #5821 from CocosRobot/update_cocosfiles_1394819251
James Chen
committed
[AUTO][ci skip]: updating cocos2dx_files.json
CocosRobot
committed
Merge pull request #5819 from Dhilan007/develop_menu
James Chen
committed
fixed content size of MenuItem is incorrect when font size or font name change.
WenhaiLin
committed
Merge pull request #5817 from dumganhar/develop
minggo
committed
Merge pull request #5818 from boyu0/support_for_xcode_iphone_64bit_simulator
minggo
committed
build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.
boyu0
committed
Fix potential overflow in Texture::getCachedTextureInfo.
James Chen
committed
[win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte.
James Chen
committed
Update CHANGELOG
minggo
committed
Merge pull request #5816 from lihex/develop
minggo
committed
update submodule
lihex
committed
Merge pull request #5815 from dumganhar/develop
James Chen
committed
Merge branch 'develop' of https://github.com/dumganhar/cocos2d-x into develop
James Chen
committed

0