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

27287 Commits

Author SHA1 Message Date
Nite Luo 07cda0db37 Merge branch 'patch-12' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12 2015-01-31 09:46:31 -08:00
samuele3hu fec0d9c41d Set default value for `Content-Type` of headfield in `PUT` method 2015-01-31 22:15:15 +08:00
samuele3hu 75dc45bfea Remove useless blank line 2015-01-31 15:21:03 +08:00
samuele3hu e6d50d7086 Fix the error that the binary data would be truncated 2015-01-31 14:31:24 +08:00
Vladimir Perminov bb2d2c9a07 Fix visual studio project out of date 
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
 2015-01-30 17:37:19 +03:00
minggo a1c8c615ac Merge pull request #10308 from minggo/v3 
[ci skip]update console submodule
 2015-01-30 20:13:04 +08:00
minggo 49489ba3ad update console 2015-01-30 20:06:43 +08:00
minggo f4266c9ae3 update console submodule 2015-01-30 14:58:20 +08:00
Huabing.Xu 8abc09f5ee Merge pull request #10295 from dabingnn/v3_updateReleaseNotes 
[ci skip] update releasenotes
 2015-01-30 14:26:53 +08:00
Huabing.Xu 7b5b1557ff [ci skip] update releasenotes 2015-01-30 14:25:26 +08:00
minggo 1fa09a3af8 [ci skip]update CHANGELOG 2015-01-30 11:27:08 +08:00
minggo 9b83bdcee6 Merge pull request #10287 from pandamicro/v3_origin 
cocos2d/cocos2d-js#1313: Remove dangerous code in AssetsManagerEx::setStoragePath
 2015-01-30 11:23:10 +08:00
pandamicro 897416eb4e cocos2d/cocos2d-js#1313: Remove dangerous code in AssetsManagerEx::setStoragePath 2015-01-30 11:12:35 +08:00
minggo bf4465df77 Merge pull request #10285 from samuele3hu/v3_4_rc1 
[ci skip]Fix z-fighting error by using setDepthTest of cc.Director
 2015-01-30 11:09:20 +08:00
samuele3hu 4f782e2330 Fix z-fighting error by using setDepthTest of cc.Director 2015-01-30 11:03:47 +08:00
minggo 8efbafd09e Merge pull request #10281 from Dhilan007/v3-win32-fix 
Fixed compile error on win32
 2015-01-29 19:48:29 +08:00
WenhaiLin 6873713c31 Fixed compile error on win32 2015-01-29 19:38:55 +08:00
minggo dff7d6f639 Merge pull request #10277 from super626/v3 
fix bug on loading .mtl
 2015-01-29 19:21:31 +08:00
Huabing.Xu 0ac7fca9f0 Merge pull request #10278 from huangshiwu/v3_fixbug 
add glBindBuffer for drawnode and clippingnode to avoid crash
 2015-01-29 18:24:55 +08:00
huangshiwu cd00de572d add glBindBuffer for drawnode and clippingnode to avoid crash 2015-01-29 18:06:20 +08:00
yangxiao 3eeeaf051f fix load mtl 2015-01-29 17:54:22 +08:00
kompjoefriek 89152b2856 Tabs to spaces 
Changed indenting tabs to spaces
 2015-01-29 10:40:00 +01:00
WenhaiLin 7cb3d65443 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audioengine-freeze-fix 2015-01-29 16:35:56 +08:00
minggo 73e8026336 Merge pull request #10274 from darkdukey/forceDepthTest 
Force depth test
 2015-01-29 16:29:13 +08:00
Nite Luo 5532cb30b6 Tweak the name 2015-01-29 00:24:32 -08:00
Nite Luo 893cd0612d Merge branch 'fixForceDepth' into forceDepthTest 2015-01-29 00:21:46 -08:00
Nite Luo 995b7225dd Add test-case for force depth bug 2015-01-29 00:21:33 -08:00
Nite Luo f914297703 Fix force depth write logic 2015-01-28 23:55:26 -08:00
minggo f30174bf67 [ci skip]update CHANGELOG 2015-01-29 13:57:27 +08:00
minggo 18a45e36eb Merge pull request #10271 from Dhilan007/v3-systemfont-win32-fix 
Label:Fixed system font can't display the proper text when the text contains '&' on win32.
 2015-01-29 13:56:11 +08:00
minggo a301ccceeb Merge pull request #10272 from MSOpenTech/wp8-fix 
WP8 libcocos2d build fix: increased build heap memory option to /Zm384
 2015-01-29 13:49:18 +08:00
WenhaiLin 99056726ec Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audioengine-freeze-fix 2015-01-29 13:49:05 +08:00
Dale Stammen 652baed1ee increase build heap memory option to /Zm384 2015-01-28 20:37:39 -08:00
Dale Stammen be8075b29c increase build heap memory option to /Zm384 2015-01-28 20:32:32 -08:00
WenhaiLin 05db3bfd72 Fixed system font can't display the proper text when the text contains '&' on win32. 2015-01-29 11:55:49 +08:00
minggo 3e1b25347d Merge pull request #10270 from CocosRobot/update_cocosfiles_1422500266 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-29 11:14:23 +08:00
CocosRobot ebf6f2728f [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-29 02:57:47 +00:00
minggo cb72f35563 Merge pull request #10269 from CocosRobot/update_lua_bindings_1422498336 
[AUTO]: updating luabinding automatically
 2015-01-29 10:56:08 +08:00
CocosRobot fcf0a2272f [AUTO]: updating luabinding automatically 2015-01-29 02:27:42 +00:00
minggo de3e9be2c5 Merge pull request #10265 from samuele3hu/v3_4_fi 
Add AsyncLoadSprite3D test case and update the related lua binding
 2015-01-29 10:16:49 +08:00
minggo 9a2b4e5e56 [ci skip]update CHANGELOG 2015-01-29 10:15:24 +08:00
minggo 8b635fea1c Merge pull request #10250 from samuele3hu/v3_4_rc1 
Fix the error that HttpClient-android didn’t set responseCode when connecting failed
 2015-01-29 10:14:00 +08:00
minggo 2f04e7a6ac Merge pull request #10239 from super626/v3 
fix bug on uniform cache
 2015-01-29 10:13:11 +08:00
minggo 01c2e75bb8 Merge pull request #10266 from darkdukey/turnOffDepthWrite 
Don't clear depth between queues
 2015-01-29 10:09:30 +08:00
samuele3hu 0ec8510f00 Fix linux compile error 2015-01-29 09:19:57 +08:00
kompjoefriek f323b2edec Merge branch 'v3' of https://github.com/kompjoefriek/cocos2d-x into v3 2015-01-29 02:05:49 +01:00
kompjoefriek 0c70660551 Fixed warnings 
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
 2015-01-29 01:36:22 +01:00
Nite Luo c0ff8d1177 Don't clear depth between queues 2015-01-28 15:28:14 -08:00
Nite Luo 94d5810efd Merge pull request #10254 from super626/fixbillboard 
Tested locally fix the billboad testcase
 2015-01-28 14:06:53 -08:00
samuele3hu 80c2e0c153 Add AsyncLoadSprite3D test case and update the related lua binding 2015-01-28 21:47:52 +08:00