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

30915 Commits

Author SHA1 Message Date
zhangcheng 0862d313b2 Fix cocos reader bug. 
Fixes child nodes can't be rendered when particle and TiledMap as parent and their resource have been removed from disk.
 2015-07-08 16:13:38 +08:00
yangxiao f7cdd7162b adapter according to latest objloader 2015-07-08 15:33:43 +08:00
子龙山人 3f550ef331 Merge pull request #12663 from xiaofeng11/v3.7-release 
Fix drawLine & drawPoints won't use blendFunc bug
 2015-07-08 14:38:10 +08:00
子龙山人 5e8609e5d7 Merge pull request #12728 from fusijie/fix_polygonsprite 
fix polygon sprite bug.
 2015-07-08 14:13:32 +08:00
yangxiao dac84ade0d index to short 2015-07-08 14:03:53 +08:00
yangxiao 40b33604d8 adjust objloader to cocos 2015-07-08 13:44:15 +08:00
yangxiao fdd78ef73f update objloader to latest 2015-07-08 13:42:14 +08:00
Jacky 06c06a1f03 fix polygon sprite bug. 2015-07-08 10:07:35 +08:00
XiaoFeng 8429cc1d90 Update CCDrawNode bug test 2015-07-08 09:35:29 +08:00
XiaoFeng 707b4d8b90 Fix windows universal project file 2015-07-07 19:44:18 +08:00
XiaoFeng 1b1af798bc Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release 2015-07-07 17:35:41 +08:00
pandamicro f42a76b438 Merge pull request #12720 from VisualSJ/v3.7-release-update 
[ci skip] Update the web index
 2015-07-07 15:46:33 +08:00
VisualSj 3ccfb2f364 Update the web index 2015-07-07 15:44:42 +08:00
pandamicro e717155930 Merge pull request #12715 from VisualSJ/v3.7-release2 
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
 2015-07-07 14:13:31 +08:00
pandamicro 701df24301 Merge pull request #12698 from VisualSJ/v3.7-release 
[ci skip] Fixed a bug that action texture address error
 2015-07-07 13:57:30 +08:00
子龙山人 a41d3847d5 Merge pull request #12709 from WenhaiLin/v3-37-crash-winfix 
Fixed crash cause by the case of file name on WIN32.
 2015-07-07 13:42:01 +08:00
VisualSj dd0edac171 Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER ) 2015-07-07 13:36:47 +08:00
肖峰 37674c3689 Add bug test to Mac & iOS cpp-test project 2015-07-07 11:17:08 +08:00
XiaoFeng a9dfd8012c Add new bug test to Android, Win 10, Win Universal, Linux project file 2015-07-07 11:02:00 +08:00
WenhaiLin 4bd1fa7d37 Fixed crash cause by the case of file name on WIN32. 2015-07-07 10:08:47 +08:00
XiaoFeng 9a6ffd8904 Add bug test for PageView layout & CCNodeDraw::onDrawGLLine 2015-07-07 09:54:42 +08:00
pandamicro e73906a119 Merge pull request #12707 from pandamicro/v3.7-release 
[ci skip][Simulator JSB] Fix issue caused by video and web view binding
 2015-07-07 09:48:42 +08:00
pandamicro a9f98aefea [Simulator JSB] Fix issue caused by video and web view binding 2015-07-07 09:38:38 +08:00
VisualSj 3b69a1726f Fixed a bug that action texture address error 2015-07-06 17:17:20 +08:00
XiaoFeng 214684b3be Fix 2015-07-06 16:45:04 +08:00
XiaoFeng 9fab1e7702 Change to use auto & for each to enum sub items 2015-07-06 16:39:00 +08:00
Liam 51993d5733 update for reader 2015-07-06 16:14:41 +08:00
XiaoFeng d6fc8ecc94 Fix when use percentage size & position to a UIWidget which parent is a layout component, when change simulator screen size, layout won't effect correctly. 2015-07-06 16:02:19 +08:00
Liam fff4e2f34c update for reader 2015-07-06 14:05:06 +08:00
XiaoFeng df2a2d253d Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release 2015-07-06 10:31:09 +08:00
pandamicro d52006692c Merge pull request #12682 from natural-law/v3.7-release 
[ci skip] Solve the error in simulator.
 2015-07-04 10:39:33 +08:00
Bin Zhang 0bcdf898bf Solve the error in simulator. 2015-07-04 10:17:40 +08:00
pandamicro aeeb6eb683 Merge pull request #12661 from pandamicro/v3.7-release 
Fixed #12652 Add retain/release for XMLHTTPReqest in JSB
 2015-07-04 08:40:55 +08:00
pandamicro 6f3fc302e6 Fix web view and video player in simulator 2015-07-04 08:39:49 +08:00
Liam 64b8660873 update for skybox reader 2015-07-03 17:52:42 +08:00
pandamicro 1da2d74bf9 Merge pull request #12662 from natural-law/v3.7-release 
[ci skip] Add argument --ios to compile Mac & iOS platforms separately.
 2015-07-03 14:47:12 +08:00
pandamicro 1f48beee1e Reorganize code 2015-07-03 12:55:55 +08:00
Bin Zhang f27b370b94 Add argument --ios to compile Mac & iOS platforms separately. 2015-07-03 11:31:40 +08:00
XiaoFeng 993e420ce4 Fix drawLine & drawPoints won't use blendFunc bug 2015-07-03 11:30:38 +08:00
pandamicro 155b9b918c Add retain/release for XMLHTTPReqest in JSB 2015-07-03 11:01:43 +08:00
pandamicro 761ba4f7cb Merge pull request #12659 from natural-law/v3.7-release 
[ci skip] Solve the error when generating simulator on win32.
 2015-07-03 10:17:48 +08:00
Bin Zhang 558e9c3d61 Solve the error when generating simulator on win32. 2015-07-03 10:14:20 +08:00
子龙山人 7e0904a50b Merge pull request #12658 from andyque/update-config-json 
add config.json to 69
 2015-07-03 09:58:12 +08:00
andyque e92896cf4c add config.json to 69 2015-07-02 22:09:33 +08:00
pandamicro e7c6ae7b13 Merge pull request #12637 from super626/skybox 
Set Texturecube tex parameter to clamp to edge
 2015-07-02 18:34:38 +08:00
子龙山人 91a8872cbd Merge pull request #12647 from xiaofeng11/v3.7-release 
UISlider update
 2015-07-02 18:01:38 +08:00
pandamicro dbd72d0123 Merge pull request #12646 from VisualSJ/v3.7-release 
[ci skip] Fixed a bug that is don't analytical frame
 2015-07-02 17:22:13 +08:00
pandamicro 831b3ce564 Merge pull request #12649 from natural-law/v3.7-release 
[ci skip] Not compile the scripts when generating simulator.
 2015-07-02 17:17:18 +08:00
Bin Zhang c713708e4d Not compile the scripts when generating simulator. 2015-07-02 17:13:35 +08:00
XiaoFeng 668dc50e07 Fix when slider set to disable mode then clean slider ball disable texture, normal texture won't show 2015-07-02 16:45:17 +08:00