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

27366 Commits

Author SHA1 Message Date
kompjoefriek bbd6eb1dcc Merge branch 'v3' of https://github.com/kompjoefriek/cocos2d-x into v3 2015-02-10 21:10:52 +01:00
minggo 1e11f3b3da Merge pull request #10310 from perminovVS/v3 
Fix visual studio project out of date
 2015-02-10 14:18:13 +08:00
minggo cc56eae6f7 Merge pull request #10420 from Sheado/FIX_10373 
FIX for Build error when CC_USE_CULLING=0 #10373
 2015-02-10 11:18:42 +08:00
minggo a65070bf00 Merge pull request #10380 from fusijie/cameratest 
fixed Camera3dTest restart bug.
 2015-02-10 10:43:38 +08:00
Chad befbc0a14e FIX for Build error when CC_USE_CULLING=0 #10373 
Fix for build error when using CC_USE_CULLING
 2015-02-09 18:15:22 -08:00
minggo 95bb2b7b7b Merge pull request #10392 from super626/v3_render 
fix render state
 2015-02-06 16:02:16 +08:00
yangxiao 2ac0b35283 fix render state 2015-02-06 10:09:23 +08:00
Nite Luo ee2781e6a6 Merge pull request #10223 from vovkasm/cmake-msvc-fixes-core 
Cmake build system fixes for MSVC (partial)
 2015-02-04 23:18:08 -08:00
Jacky ecefc53c0d fixed Camera3dTest restart bug. 2015-02-05 14:16:31 +08:00
flamefox ac37ed3a4c revert this file 2015-02-04 10:37:32 +08:00
flamefox 4b405db77d fix tab to space 2015-02-04 10:36:16 +08:00
flamefox 3737a45052 Merge branch '3dattachnode' of https://github.com/flamefox/cocos2d-x into 3dattachnode 2015-02-04 10:34:03 +08:00
flamefox c2e17d6b1d getAttachNode should failed when there is no bone with name 2015-02-04 10:32:44 +08:00
flamefox 25d7dc9dfb getAttachNode should failed when there is no bone with name 2015-02-04 10:24:29 +08:00
flamefox cc14ee3121 Merge branch 'v3' of https://github.com/flamefox/cocos2d-x into v3 2015-02-03 13:51:26 +08:00
flamefox 558d467109 Merge pull request #3 from cocos2d/v3 
V3
 2015-02-03 13:49:54 +08:00
flamefox c195e1f88a Merge branch 'v3' of https://github.com/flamefox/cocos2d-x into v3 2015-02-03 13:49:40 +08:00
Nite Luo 6f53719772 Merge pull request #10317 from darkdukey/G17hao-patch-12 
Improve group command
 2015-02-02 14:12:50 -08:00
Huabing.Xu 173578cf41 Merge pull request #10315 from samuele3hu/v3_4_rc1 
Fix the error that the binary data would be truncated
 2015-02-01 07:18:31 +08:00
Nite Luo e9b4e4e19c Merge branch 'patch-13' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12 2015-01-31 09:46:59 -08:00
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
flamefox c279d48cd0 Merge pull request #2 from cocos2d/v3 
merge
 2015-01-30 11:09:07 +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