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

23945 Commits

Author SHA1 Message Date
minggo 3f7fc6ead1 Merge pull request #8111 from joewan/v3 
fix compile on ubuntu.
 2014-09-22 09:38:52 +08:00
minggo 81c7d4f638 Merge pull request #8112 from CocosRobot/update_cocosfiles_1411349538 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-22 09:33:30 +08:00
minggo 0368d5ace4 [ci skip] 2014-09-22 09:33:09 +08:00
CocosRobot 93bfc08d67 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-22 01:32:19 +00:00
minggo dd264316d2 [ci skip] 2014-09-22 09:31:57 +08:00
minggo e8b20d8583 Merge pull request #8093 from wohaaitinciu/v3_WebView_win32 
web view win32
 2014-09-22 09:30:29 +08:00
joewanchen f22c15bf1c fix. 2014-09-22 00:08:44 +08:00
joewanchen 3f2895beab fix compile on ubuntu. 2014-09-21 23:49:43 +08:00
minggo c2bac086a7 [ci skip]update version info 2014-09-19 21:54:01 +08:00
minggo 0483589041 Merge pull request #8110 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-09-19 17:05:34 +08:00
minggo a1c0761107 [ci skip] 2014-09-19 17:04:41 +08:00
zhangbin 3b007e0845 Update the reference of submodule cocos2d-console. 2014-09-19 17:03:34 +08:00
minggo a1052e0384 [ci skip] 2014-09-19 17:02:09 +08:00
minggo 6569f1a7f0 Merge pull request #8108 from huangshiwu/v3_wp8test 
fix wp8 directory control bug
 2014-09-19 16:57:02 +08:00
huanghsiwu f73f1a5379 fix wp8 directory control bug --modify 2014-09-19 16:52:11 +08:00
minggo 681621805d Merge pull request #8109 from andyque/fixTests 
fix editbox test
 2014-09-19 16:29:07 +08:00
minggo 653986a3a2 Merge pull request #8106 from super626/v3 
add OBBs to OBB collision test by default, Fix 0.1 version static model load bug and remove unused resource
 2014-09-19 16:16:33 +08:00
huanghsiwu d42cec0708 fix wp8 directory control bug 2014-09-19 15:54:18 +08:00
yangxiao 54cd46b128 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-09-19 14:59:59 +08:00
yangxiao 06c0adcf6d remove unused resource 2014-09-19 14:52:25 +08:00
XiaoYang d1328cfb41 Merge pull request #132 from lvlonggame/v3 
Deal read string length problem!
 2014-09-19 14:47:59 +08:00
lvlong eb89efe510 deal the length problem! 2014-09-19 14:30:02 +08:00
andyque 7615eb8d39 fix editbox test 2014-09-19 14:21:18 +08:00
minggo 47caa00ed5 Merge pull request #8107 from minggo/mac-remove-unneeded-lib 
[ci skip]remove dependence of CoreGraphics for on mac
 2014-09-19 14:04:47 +08:00
minggo 45d311bb34 remove dependence of CoreGraphics for on mac 2014-09-19 14:02:13 +08:00
yangxiao 650f810815 add obb by default 2014-09-19 11:22:37 +08:00
Jeff 2ffbe23c50 The files name: modify underline to hyphen 2014-09-19 10:24:17 +08:00
Jeff e4e2cea97a link error 2014-09-18 19:59:22 +08:00
Jeff 476ede6ccb link error 2014-09-18 19:56:53 +08:00
Jeff 6152b70945 LE 2014-09-18 16:33:46 +08:00
minggo d997201473 Merge pull request #8100 from cocoscodeide/v3 
fix:runtime crash when upload file to Mac/Win32
 2014-09-18 16:08:21 +08:00
minggo 7c8e1c9de5 Merge pull request #8099 from super626/billboard 
Transparent Queue adjustment
 2014-09-18 16:07:54 +08:00
minggo d6e086d4dd Merge pull request #8098 from CocosRobot/update_lua_bindings_1411009391 
[AUTO]: updating luabinding automatically
 2014-09-18 16:06:52 +08:00
minggo daf5f65e86 Merge pull request #8102 from dabingnn/v3_optimiseParticleRendering 
optimise update of particle system for free mode
 2014-09-18 16:05:58 +08:00
Jeff 0ee4ee03c1 CE 2014-09-18 16:00:18 +08:00
Huabing.Xu cf4d0faad3 optimise update of particle system for free mode 2014-09-18 15:24:27 +08:00
Jeff 418ec69abf compile error 2014-09-18 15:18:30 +08:00
Jeff ac6b83f8f9 fix compile error 2014-09-18 14:22:40 +08:00
Jeff c5cc16336a fix compile error 2014-09-18 14:04:54 +08:00
honghui 11c0d6ff25 fix:runtime crash when upload file to Mac/Win32 2014-09-18 12:40:26 +08:00
yangxiao 720264fb98 add comment 2014-09-18 12:04:42 +08:00
yangxiao 25091ca849 add transparent flag to render command 2014-09-18 12:00:44 +08:00
Jeff b9ec99d7f4 compile error & code spelling error 
1.fix compile error on win32
2.modify spelling error
 2014-09-18 11:52:23 +08:00
CocosRobot 7920ff425b [AUTO]: updating luabinding automatically 2014-09-18 03:05:04 +00:00
minggo 35acdc2284 Merge pull request #8089 from cocoscodeide/v3 
fix bug: response not been sent completely
 2014-09-18 11:00:38 +08:00
minggo 5e5129d0d1 Merge pull request #8085 from super626/v3 
Shared GLProgramState by default and Fix BillBoard Anchor Point
 2014-09-18 10:52:35 +08:00
minggo 442f30af1f Merge pull request #8091 from dabingnn/v3_PageTurnZFighting 
new version of avoid z fighting in pageTurn
 2014-09-18 10:50:31 +08:00
honghui 2027203d2e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-18 10:17:27 +08:00
Huabing.Xu 39c6f9bfbd remove setDepthTest(true) because it is not needed to be set for pageTurn 2014-09-18 10:00:36 +08:00
minggo 599903885f Merge pull request #8094 from slackmoehrle/patch-2 
Update README.md
 2014-09-18 09:22:44 +08:00