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

30792 Commits

Author SHA1 Message Date
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
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
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
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
pandamicro 95916709ee Merge pull request #12641 from natural-law/v3.7-release 
Update framework-compile tools & simulator.
 2015-07-02 14:39:31 +08:00
Bin Zhang 7ffb5edc27 Update the bundle version when generating simulator. 2015-07-02 14:37:42 +08:00
Sijie.Wang 7818bfcc7a Fixed a bug that is don't analytical frame 2015-07-02 14:30:44 +08:00
pandamicro 079ccbb0e2 Merge pull request #12639 from VisualSJ/v3.7-release 
Fixed a bug that is LayoutComponent position error
 2015-07-02 13:58:15 +08:00
子龙山人 ae90b35026 Merge pull request #12636 from xiaofeng11/v3.7-release 
CheckBox bug fix
 2015-07-02 13:44:54 +08:00
Bin Zhang e24975f0fe Add python script for generate cocos simulator. 2015-07-02 13:43:52 +08:00
pandamicro 05ff8db328 Merge pull request #12640 from pandamicro/v3.7-release 
[ci skip] Fix video player and web view in js template
 2015-07-02 13:42:56 +08:00
VisualSJ a475caf35a Fixed a bug that is LayoutComponent position error 2015-07-02 11:52:31 +08:00
pandamicro 613fde6573 Fix video player and web view in js template 2015-07-02 11:48:13 +08:00
XiaoFeng 9a905ede56 Fix check box front cross texture expand to normal size when change status between normal and disable frequency 2015-07-02 10:29:53 +08:00
子龙山人 2673e102df Merge pull request #12631 from CocosRobot/update_lua_bindings_1435759611 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-02 09:40:23 +08:00
XiaoYang d08a3d42b5 Merge pull request #357 from songchengjiang/skybox 
texture set GL_CLAMP_TO_EDGE
 2015-07-02 08:56:05 +08:00
CocosRobot bf3c970534 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-01 14:12:18 +00:00
pandamicro bebce270a7 Merge pull request #12630 from pandamicro/v3.7-release 
Fix cc.isArray for JSB
 2015-07-01 21:59:04 +08:00
pandamicro 3b9fd5502e Fix cc.isArray for JSB 2015-07-01 21:57:39 +08:00
pandamicro 8fa43089f3 Merge pull request #12629 from pandamicro/v3.7-release 
Refine release docs for Cocos2d-x v3.7rc0
 2015-07-01 19:19:13 +08:00
pandamicro 33c5b9b102 Refine release docs for Cocos2d-x v3.7rc0 2015-07-01 19:17:38 +08:00
pandamicro a95edbfb65 Merge pull request #12618 from super626/clippingnode2 
Sprite3D Clipping
 2015-07-01 18:56:16 +08:00
pandamicro 6b730b5fbd Merge pull request #12619 from WenhaiLin/v3-37-labelfix 
Label:Fixed the top of character's texture may be tailored if enable outline effect.
 2015-07-01 18:55:04 +08:00
pandamicro d6181d16a1 Merge pull request #12627 from pandamicro/v3.7-release 
[ci skip] Release docs for Cocos2d-x v3.7rc0
 2015-07-01 18:47:58 +08:00
pandamicro 992ea8ac4b Release docs for Cocos2d-x v3.7rc0 2015-07-01 18:44:15 +08:00
songchengjiang da5e077b55 texture set GL_CLAMP_TO_EDGE 2015-07-01 18:06:17 +08:00
子龙山人 b70d4ad009 Merge pull request #12625 from CocosRobot/update_cocosfiles_1435742557 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-01 17:31:29 +08:00