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

9510 Commits

Author SHA1 Message Date
子龙山人 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
Jacky 06c06a1f03 fix polygon sprite bug. 2015-07-08 10:07:35 +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 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
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
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 1f48beee1e Reorganize code 2015-07-03 12:55:55 +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 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
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
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
VisualSJ a475caf35a Fixed a bug that is LayoutComponent position error 2015-07-02 11:52:31 +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
CocosRobot bf3c970534 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-01 14:12:18 +00:00
pandamicro 3b9fd5502e Fix cc.isArray for JSB 2015-07-01 21:57:39 +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
songchengjiang da5e077b55 texture set GL_CLAMP_TO_EDGE 2015-07-01 18:06:17 +08:00
WenhaiLin 322bd30d7b Label:Fixed the top of character's texture may be tailored if enable outline effect. 2015-07-01 14:57:01 +08:00
yangxiao 52daa2234c add setForce2DQueue 2015-07-01 14:24:22 +08:00
yangxiao 269feeb1f9 remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
Bin Zhang d0db3aee98 Remove the plugin-x related files from the Xcode project of js-bindings . 2015-06-30 17:28:47 +08:00
Bin Zhang bb77101f0b Solve the error when building simulator for android. 2015-06-30 16:45:13 +08:00
pandamicro 92c869f408 Merge pull request #12594 from MSOpenTech/v3-winrt-js-keyboard 
V3 winrt js keyboard support
 2015-06-30 07:24:17 +08:00
Dale Stammen 38b687f8d8 enable support for keyboard on winrt platforms to fix back button 2015-06-29 09:13:19 -07:00
Dale Stammen 7684c208e0 unsupported cocos2d-x image formats removed or updated 2015-06-29 08:41:44 -07:00
Dale Stammen eb668f63ce unsupported cocos2d-x image formats removed or updated 2015-06-29 08:39:31 -07:00
pandamicro 15c763d84a Update engine version 2015-06-29 18:21:06 +08:00
pandamicro c055028485 Merge pull request #12566 from jianglong0156/winrtMouse 
Winrt mouse
 2015-06-26 18:43:33 +08:00
pandamicro 88aeaa36f4 Merge pull request #12534 from super626/skybox 
Skybox improvement
 2015-06-26 17:05:17 +08:00
子龙山人 260d5035bb Merge pull request #12555 from WenhaiLin/v3-simpleaudio-AndroidL-Fix 
Fixed SimpleAudioEngine may cause application to crash on Android L(5.0.x)
 2015-06-26 11:05:40 +08:00
Wenhai Lin 1875829ab4 [CppTests:ExtensionsTest-->CocoStudioComponentsTest]Fixed crash on Android 5.0.x 2015-06-26 10:16:52 +08:00
pandamicro e9ee303445 Merge pull request #12547 from MSOpenTech/v3.7-winrt-audio 
V3.7 winrt audio fix
 2015-06-26 09:47:11 +08:00
pandamicro 4b34963329 Merge pull request #12537 from andyque/fix-v3.7-scrollView-dpi 
use inch for childFocusCancelOffset in UIScrollView
 2015-06-26 08:11:00 +08:00
Dale Stammen 61f4e280b4 Merge branch 'v3.7-release' into v3.7-winrt-audio 2015-06-25 12:46:20 -07:00
pandamicro 1ab369a70b Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode 
Fix v3.7 cocosStudio percent position bug
 2015-06-25 21:37:12 +08:00
pandamicro 3136bef9e3 Fix convertDistanceFromPointToInch logic (add x, y) 2015-06-25 21:34:00 +08:00
pandamicro e29284374b Fix convertDistanceFromPointToInch logic 2015-06-25 20:57:23 +08:00