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

17540 Commits

Author SHA1 Message Date
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
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
minggo 36cfd17e7b Merge pull request #5834 from shujunqiao/autotest 
modify autotest.py for use mac app.
 2014-03-17 17:59:36 +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
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
James Chen 306df0537e Reverts changes in CCApplication.cpp/.mm, pollEvent must after main loop, otherwise, potential crash will happen. 2014-03-15 00:10:39 +08:00
minggo d0bb70ef52 Update README.md 2014-03-14 23:56:25 +08:00
minggo 98f5be028c Update README.md 2014-03-14 23:52:44 +08:00
minggo 5988e5a9f5 Merge pull request #5814 from lihex/develop 
update submodule
 2014-03-14 23:50:41 +08:00
lihex c36bae6c07 update submodule 2014-03-14 23:48:20 +08:00
James Chen 411ae24599 Merge pull request #5813 from CocosRobot/update_cocosfiles_1394811515 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-14 23:39:24 +08:00
CocosRobot ebe7b37ec2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-14 15:38:36 +00:00
minggo 6ff07ed033 [ci skip] 2014-03-14 23:35:28 +08:00
minggo 1e16dfaea5 Merge pull request #5769 from boyu0/support_for_xcode_iphone_64bit_simulator 
update external library, add iOS x86_64 and arm64 architectures, support...
 2014-03-14 23:30:17 +08:00
minggo f054acecef Merge pull request #5812 from minggo/develop 
update readme
 2014-03-14 23:14:36 +08:00
minggo b6b34feb1b update readme 2014-03-14 23:12:01 +08:00
James Chen aa6029ca7d Merge pull request #5811 from dumganhar/develop 
Updates bindings-generator.
 2014-03-14 23:05:13 +08:00
James Chen 7cff033b55 Updates bindings-generator. 2014-03-14 23:04:05 +08:00
minggo 2a58d814b1 Merge pull request #5810 from lihex/develop 
update submodule
 2014-03-14 23:00:33 +08:00
lihex f7a1d1f095 update submodule 2014-03-14 22:56:40 +08:00
minggo bf036ae7b2 Merge pull request #5809 from minggo/develop 
update README
 2014-03-14 22:49:25 +08:00