Commit Graph

328 Commits

Author SHA1 Message Date
James Chen 4ee7981630 Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into runtime
# Conflicts:
#	cocos/platform/mac/CCCanvasRenderingContext2D-mac.mm
#	cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp
2018-03-23 15:42:12 +08:00
minggo 0be49352d0 H5 adapt merge (#1164)
* h5 adpator

* adapt to h5 engine
2018-03-23 15:26:09 +08:00
minggo 610658e5a6 h5 adpator (#1156) 2018-03-21 09:30:05 +08:00
James Chen bf1b4f7124 [runtime] Audio works. (#1151) 2018-03-17 11:22:56 +08:00
James Chen 4eccfbcba8 Mac font display ok. 2018-03-08 17:38:45 +08:00
James Chen 7beded3156 Canvas binding fix. 2018-03-07 18:45:20 +08:00
James Chen e00e0e0f86 Updates bindings-generator. 2018-03-07 10:05:36 +08:00
James Chen 0dc072baab More WebGL binding fixes. 2018-03-07 10:04:20 +08:00
James Chen 71f0678287 Updates gfx.ini 2018-03-07 09:59:40 +08:00
James Chen 6721db7bc6 Updates gfx/renderer auto binding code and ini configuration. 2018-03-07 09:59:26 +08:00
James Chen 3af301306a Rename Effect.setDefineValue to Effect.define. 2018-03-01 13:46:57 +08:00
minggo 802e48080e New renderer (#1097)
* build work on mac

* build ok on iOS

* fix compiling error on android

* fix android link error
2018-02-08 10:40:29 +08:00
Jare Guo d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
James Chen 69798998db Adds cc.sys.getBatteryLevel & cc.sys.getNetworkType APIs (#1071)
* Adds cc.Device.getBatteryLevel interface.

* Adds CCReachability.h/.cpp

* Adds CCReachability.h/.cpp

* Reachability supports macOS either.

* Adds cc.Device.getNetworkStatus interface.

* Removed debug log.

* cc.Device.NetworkStatus -> cc.Device.NetworkType

* API to sys namespace

* Update CCDevice-win32.cpp
2018-01-29 17:37:15 +08:00
James Chen e8d11d07f7 Updates bindings-generator, adds missing se ns (#1047) 2017-12-29 11:19:43 +08:00
James Chen 901f4fa50c Auto hide home indicator for iPhoneX. (#1013) 2017-11-28 13:36:14 +08:00
James Chen cdad6b5868 Some Android Simulators don't support SSE instruction, so disable it for x86 arch. (#1011) 2017-11-23 15:13:34 +08:00
James Chen 4a61e1423f Re-binds OpenGL interfaces. (#976)
* Adds opengl bindings code.

* Register OPENGL module.

* Updates Android.mk

* Updates win32 project configuration.

* Supports boolean -> integer conversion.

* glXXXXv count fix.

* GLNode needs to inherit from Node.

* Updates bindings.

* size fix in JSB_glGetUniformfv.

* JSB_glGetSupportedExtensions fix.
2017-11-14 18:05:14 +08:00
James Chen e5e616b794 Updates console. 2017-11-07 17:05:49 +08:00
James Chen 7739e2c47d Updates template AndroidManifest.xml. 2017-11-07 16:05:44 +08:00
James Chen d7c619ff77 Updates console 2017-11-06 17:15:50 +08:00
James Chen 2a229fd195 Updates simulator configruation for android. 2017-11-06 15:15:51 +08:00
James Chen 5def171e3e Updates cocos2d-console. 2017-11-06 15:14:53 +08:00
James Chen 67d5d7ef33 Updates console 2017-11-02 12:02:09 +08:00
James Chen aa1819e19c Updates cocos2d-console. 2017-10-30 11:28:47 +08:00
James Chen fdd46f2718 Auto binds RenderTexture::saveToFile and fix js memory leak while saveToFile.
The callback _saveFileCallback has to be set to nullptr to release se::Value the std::function captures.
2017-10-26 12:44:06 +08:00
knoxHuang a63e7402bc restore getName for fireball/issues/6505 2017-10-25 18:22:15 +08:00
James Chen 3bc6e34825 Fixes crash while using PolygonCollider to make mask.
fixed https://github.com/cocos-creator/fireball/issues/6502
2017-10-23 15:08:46 +08:00
James Chen 8ae6d54df3 Spine conversion should use pointer instead of reference since it probably returns nullptr. 2017-10-20 10:01:04 +08:00
James Chen f46cb75958 Merge pull request #907 from 2youyou2/native-modules
support native modules
2017-10-19 09:51:40 +08:00
James Chen 365f7b8329 Updates bindings-generator 2017-10-18 10:55:56 +08:00
2youyou2 5a8b02df27 Merge branch 'native-modules' of github.com:2youyouo2/cocos2d-x-lite into native-modules 2017-10-18 10:27:37 +08:00
2youyou2 790ae1fcf4 fixed windows project 2017-10-18 10:26:26 +08:00
yinkaile 5ee73c6864 fixed simulator project 2017-10-17 12:08:37 +08:00
yinkaile 8ac7257a46 fixed merge errors 2017-10-12 18:15:21 +08:00
yinkaile d38e168441 support native modules 2017-10-12 17:35:08 +08:00
James Chen ee9713e007 CCLOG -> CCLOGINFO in finalize callback for less log output. 2017-10-11 17:02:46 +08:00
James Chen 632448d64b Removes COCOS2D_DEBUG definition in release mode. Adds APP_CFLAGS.
RuntimeJsImpl doesn't depend on COCOS_DEBUG macro.
Warning fix in bzero.
2017-10-11 14:11:41 +08:00
James Chen e1ac3249a2 jsb_enable_debugger() uses local IP "0, 0, 0, 0", then Android debugging doesn't need to change IP. 2017-10-11 12:30:08 +08:00
James Chen 3ad08f9591 Updates submodules. 2017-10-10 16:47:55 +08:00
James Chen 0548edd7f4 Adds Simulator.entilements for mac simulator project. 2017-10-10 16:44:14 +08:00
James Chen f3ea953638 compilation error fix for simulator. 2017-10-10 15:14:19 +08:00
James Chen b4d7eda372 Updates simulator. 2017-10-10 14:55:20 +08:00
James Chen 412574c670 Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp
2017-10-10 14:48:04 +08:00
James Chen 1fe5cee080 Updates win32 simlator project to link libuv. 2017-10-10 14:37:55 +08:00
2youyouo2 2405d0c917 remove unused extensions 2017-10-10 10:30:55 +08:00
James Chen 3c74a04612 Fix compilation error while enabling libuv. Updates win32 template to remove include path of spidermonkey. 2017-10-09 17:29:13 +08:00
James Chen c984605630 updates bindings-generator. 2017-10-09 16:38:35 +08:00
James Chen 8b1ba02f9f Implements seval_to_TTFConfig, don't ignore createWithTTF and setTTFConfig in auto bindings. 2017-09-23 17:53:24 +08:00
James Chen db53549dfc Adds anysdk bindings configuration. 2017-09-22 17:39:00 +08:00