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

251 Commits

Author SHA1 Message Date
pandamicro 69cdaca306 Auto add extend to jsb need to extend classes 2015-07-10 09:49:39 +08:00
VisualSj 9f52b1e6fb Fixed a bug that is SingleNode setColor is null 2015-07-09 11:49:11 +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
VisualSj dd0edac171 Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER ) 2015-07-07 13:36:47 +08:00
VisualSj 3b69a1726f Fixed a bug that action texture address error 2015-07-06 17:17:20 +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
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
pandamicro 3b9fd5502e Fix cc.isArray for JSB 2015-07-01 21:57:39 +08:00
Dale Stammen 38b687f8d8 enable support for keyboard on winrt platforms to fix back button 2015-06-29 09:13:19 -07:00
pandamicro 15c763d84a Update engine version 2015-06-29 18:21:06 +08:00
jianglong0156 11ac928f59 winrt use touch event replace mouse event 2015-06-25 17:44:03 +08:00
jianglong0156 c60e9dfc9e winrt not suppot mouse 2015-06-25 17:25:27 +08:00
pandamicro 04af5dfbe3 #12494 Upgrade platform constants for WP8 & WINRT 2015-06-23 23:23:25 +08:00
pandamicro ac138a3287 Merge pull request #12474 from xiaofeng11/v3_xiaofeng 
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
 2015-06-23 16:27:32 +08:00
XiaoFeng befe97a78b Update js parser for compatible with CocosStudio 2.3.2 json format export 2015-06-23 16:24:53 +08:00
pandamicro 7b1694bfeb Merge pull request #12443 from VisualSJ/v3-aa 
[ci skip]Studio parser: Code for defense
 2015-06-19 14:24:39 +08:00
VisualSJ 8fa755d0e4 Studio parser: Code for defense 2015-06-19 13:15:10 +08:00
VisualSJ ea0ab5c738 Studio parser: Code for defense 2015-06-19 11:13:07 +08:00
pandamicro 276ce3a0a7 Update versions 2015-06-19 09:56:19 +08:00
江龙 91bc19fb29 Merge branch 'v3_origin' into navmesh 
Conflicts:
	tests/js-tests/src/Physics3DTest/Physics3DTest.js
 2015-06-18 23:50:19 +08:00
pandamicro b757837239 Move NavMesh to jsb namespace 2015-06-18 22:57:41 +08:00
pandamicro e09ba8080f Fix create Sprite with PolygonInfo issue 2015-06-18 21:48:57 +08:00
pandamicro 10a8adad53 Change physics3d api to jsb namespace 2015-06-18 20:39:40 +08:00
jianglong0156 4fe1542d17 add navmesh tests 2015-06-18 19:22:27 +08:00
samuele3hu 683812d817 Update Physics3D test for js. 2015-06-17 18:50:55 +08:00
VisualSJ 2d12d6a295 Plist file parsing (action-2.x.js) 2015-06-11 11:14:10 +08:00
VisualSJ 3306c7b072 Fixed control LayoutComponent positioning bug 2015-06-08 15:41:33 +08:00
VisualSJ 060ab85f22 Fixed UIText color settings bug 2015-06-08 13:58:08 +08:00
VisualSJ a91fdd6b8e Synchronization studio parser - (fixed: resPath and custom easing animation) 2015-06-04 16:59:42 +08:00
VisualSJ 587bd475e9 Synchronization studio parser - (fixed: resPath and custom easing animation) 2015-06-04 16:23:06 +08:00
jianglong0156 ac71777e97 add webview and videoplayer protect contidition. 2015-06-02 13:50:55 +08:00
jianglong0156 c46fea1f7a Merge branch 'v3' into videoplayer 2015-06-02 11:26:48 +08:00
子龙山人 a968bc2d15 Merge pull request #12062 from jianglong0156/jsWebviewTest 
Js webview test
 2015-05-29 11:35:30 +08:00
jianglong0156 8b52563a8a add videoplayer config ini and fix the url bug 2015-05-29 11:10:39 +08:00
jianglong0156 9a62d06091 add video player test and auto bindings 2015-05-28 18:10:07 +08:00
jianglong0156 379f536330 improve test case, remove the invalid testcase 2015-05-28 14:02:07 +08:00
jianglong0156 1dbaa5bb11 fix error log output 2015-05-28 11:56:07 +08:00
jianglong0156 c0b42fdfec modify addEventListener to setEventListener 2015-05-28 10:12:58 +08:00
jianglong0156 7402295205 improve event key 2015-05-27 18:02:01 +08:00
Mykyta Usikov 355381e0d8 cc.Color() and cc.color() don't replace 0 alpha with 255 no more 2015-05-27 11:25:04 +03:00
jianglong0156 83f34c23d8 fixed the code error 2015-05-27 15:22:03 +08:00
jianglong0156 579f122cb1 add webview jsb eventType 2015-05-27 15:11:12 +08:00
jianglong0156 521ce15cb6 add webview autobindings. modify webtest. adapt the web interface 2015-05-27 11:46:26 +08:00
joshuastray 83237b8dbd add physics3d js manual binding and tests 2015-05-21 18:05:49 +08:00
pandamicro 4146a6edf4 Fix incorrect property of cc.Texture2D 2015-05-14 10:41:10 +08:00
pandamicro c7f3c2fa8b Fix Scale9Sprite's inheritance issue triggered by its constructor 2015-05-12 18:04:01 +08:00
pandamicro ef0854545b Fix cc.EventMouse constants issue 2015-05-12 18:02:36 +08:00
Jialong Zhai be923b5901 fix jsb debugger bug 2015-05-07 18:24:30 +08:00
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00