Commit Graph

228 Commits

Author SHA1 Message Date
owen 2c31d09fa5 Fix 213 spine auto file generate error (#1828) 2019-09-04 11:11:27 +08:00
CocosRobot a0aea3e81b [ci skip][AUTO]: updating jsbinding automatically (#1822) 2019-08-30 19:43:04 +08:00
Arnold f3f5f4b7b6 Prevent connection objects from being GC, when they are not done yet. (#1716)
* prevent connections from being GC, when they are not  yet.

* run genbindings

* triggle ci
2019-04-19 10:17:41 +08:00
Jare Guo 0edfbf4b92 Merge commit 'a4dc939aef28a4142723667df702d4003a6a8468' into v2.1-release 2019-04-03 20:06:14 +08:00
pandamicro 6d94ec107b [ci skip][AUTO]: updating jsbinding automatically (#1696) (#1698) 2019-03-13 10:14:13 +08:00
Javier O 4e79585fd0 Improved audio engine interface to get the audio duration directly from the filename
because with the current implementation the audio needs to be preload and at least be played one time to get
the audio id which is needed to get the audio duration with the current getDuration API.
I've describes the problem in detail here:
https://discuss.cocos2d-x.org/t/audioengine-interface-improvement/34034
2019-02-28 09:18:14 -03:00
CocosRobot e07ab57dab [ci skip][AUTO]: updating jsbinding automatically (#1689) 2019-02-26 10:46:59 +08:00
owen a9887b4638 Fix vertex exceed 65535 error and dragonbones leak (#1669)
* fix exceed native-renderer

* fix dragonbones memery leak

* fix native db leak

* fix native db leak

* indent issue

* add MeshBuffer into vs project

* modify cocos2d_files template

* optimize spine
2019-02-12 17:14:03 +08:00
吴智明 2f6b44a2fc Change network module (#1655)
* change USE_NET_WORK to USE_SOCKET  and add xmlhttprequest default for ios platform

* change USE_NET_WORK to USE_SOCKET  and add xmlhttprequest default for android platform
2019-01-14 16:26:32 +08:00
owen 788244869f Spine upgrade (#1652)
* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* gulp: auto retry when git ref locked

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine
2019-01-11 11:48:38 +08:00
owen c9c6634e7e v2.0 skeleton optimize (#1603)
* v2.0 skeleton optimize

* v2.0 skeleton offical source file

* Rename jsbDragonBones to dragonbones
Rename jsbSpine to spine
Rename editor to middleware
Rename EditorManager to MiddlewareManager

* Rename Macro.h to MiddlewareMacro to avoid duplication of name

* Middleware update by js

* recover other ini generate

* Update cocos2dx-file.json

* createArrayBuffer support null point

* Rename MiddlewareMacro

* skeleton windows 工程

* add checkspace before write buffer

* add math include

* modify dragonBones to dragonbones

* modify dragonBones to dragonbones

* modify dragonBones to dragonbones

* remove useless code

* Change copyright time
2018-12-03 19:58:00 +08:00
leda 7c93a11905 runtime require: add context2d fill/rect method for android (#1561)
* add context2d fill & rect method for android

* workaround: draw a hairline to cover the border

* fix clear&fillrect parameter error

* add empty impl on Apple

* add empty Imple in win32

* enable "SUBPIXEL_TEXT_FLAG" flag to make the text more clear on Android

* move putImageData impl to native

* add empty _fillImageData impl on win32 & apple
2018-10-26 13:44:03 +08:00
leda dada2eb244 move "cocos2d::experimental::" to "cocos2d::" on Audio (#1549)
* remove “experimental” in audio dir

* update audio bindings

* fix "{" match error

* no need "experimental" for thread pool

* remove both out-of-date js api files
2018-10-18 13:34:12 +08:00
leda 71d8cf11ad refine native module separate (#1547)
* refine module separate -> gfx renderer

* refine module separate

* modify Application.mk, add macro

* “#if USE_GFX_RENDERER” means “#if USE_GFX_RENDERER > 0”

* improve macro define in binding code
2018-10-18 09:10:05 +08:00
leda 89af43e38f switch video player bind code from "manual" to "auto" (#1537)
* refine video bind, tested on iOS

* adapt Android.mk
2018-10-10 17:22:19 +08:00
leda c8e145dadb Re-added WebView on iOS & Android for Creator 2.1 (#1535)
* init add webview files form creator 1.10

* refine header & namespace to compile works

* add webview auto bindings, need check manually

* update webview auto bind

* add setFrame interface to support set View Rect

* uniform file name with other ui modules

* adapt to iOS
2018-10-10 16:03:23 +08:00
leda c74745eee4 add "getSafeAreaEdge" interface to get SafeArea edge insets (#1502)
* try to resume iPhone X support

* gen binding code

* only get SafeAreaEdge on native

* add getSafeAreaEdge for others

* update binding-generator
2018-09-10 10:14:23 +08:00
CocosRobot f37a259dd8 [ci skip][AUTO]: updating jsbinding automatically (#1495) 2018-09-04 13:53:50 +08:00
wdzhangchukong 21377fdb74 Remove names about Cocos (#1494) 2018-09-04 13:41:02 +08:00
CocosRobot 81301ca4b4 [ci skip][AUTO]: updating jsbinding automatically (#1480) 2018-08-24 20:43:09 +08:00
CocosRobot 80fdcd0e74 [ci skip][AUTO]: updating jsbinding automatically (#1477) 2018-08-24 17:45:25 +08:00
leda b3b37cf457 Add AssetsManager to iOS & Mac & Android & win32 (#1405)
* Add incomplete AssetsManager to iOS & Mac

* remove Android.mk refer on Xcode project config

* re-add assetmanager for android

* re-add assetmanager for win32 project config

* remove unused macro define for win32

* remove unused marco define COCOS2D_JAVASCRIPT

* added header include for assetsManager

* Add CCAsyncTaskPool

* Fix AssetsManager event trigger issue

* update win32 project config, added CCAsyncTaskPool

* add CCAsyncTaskPool to extensions Android.mk
2018-07-23 17:50:04 +08:00
Vincent Yang 8f6e9adbe1 [feature] CCDownloader add header and abort support. (#1291)
*  [feature] android implement recieve http header param, handle it in android http request (#2)

* [feature] Recieve http header param, handle it in android http request

* [feature] implement abort and header api

* /2.0 -> /2

* remove task when abort

*  [feature] Implement ios and mac downloader abort api (#3)

* [feature] Implement ios and mac downloader abort api

* use DLLOG to show log

* judge NSURLSessionTask state with NSURLErrorCancelled

* [adjust] Modify downloader from auto bind to manually (#4)

* [adjust] Modify Downloader createDownloadFileTask api from auto bind to manually

* Modify ini file

* [bug] fix Cocos2dxDownloader.java syntax error

* [bug] CCDownloader-android creatCoTask don't deleteLocalRef header str
2018-06-07 22:19:03 +08:00
CocosRobot d0f28d3959 [ci skip][AUTO]: updating jsbinding automatically (#1296) 2018-06-06 14:58:00 +08:00
James Chen da45e32ada Removes unused files and code. (#1277) 2018-05-31 17:58:35 +08:00
James Chen 5245664704 Adds Device::getDeviceModel method. (#1276) 2018-05-31 14:13:28 +08:00
James Chen 712173a8de Supports DeviceMotionEvent and removes more unused code. (#1275)
* Binds Device class

* Removes ccFPSImage.c/h

* Updates Android.mk

* Supports DeviceMotionEvent and removes more unused code.

* Uses fprintf to implement SE_LOGD & SE_LOGE .
2018-05-31 14:08:20 +08:00
minggo ccc8691029 fix crash when parsing Effect property (#1254) 2018-05-22 09:32:06 +08:00
minggo 8a76997242 adapt mac resolution (#1248) 2018-05-18 11:57:12 +08:00
minggo 9ca6dac357 fix musk issue (#1231) 2018-05-08 11:21:41 +08:00
James Chen 15656be8d6 Removes unused js glue code. (#1221) 2018-04-27 13:45:30 +08:00
minggo 87a4301d8f unify js_loadImage (#1210)
* fix Texture2D::addSubImage()

* unify the logic of js_loadImage

* simplify codes
2018-04-24 16:27:03 +08:00
minggo d98484654f Optimize (#1202)
* fix some bugs

* fix binding codes of Texture2D::updateSubImage()
2018-04-20 14:31:52 +08:00
minggo 0505ee928a Optimize (#1199)
* optimize performace

* optimize performance
2018-04-18 17:47:46 +08:00
minggo 59d24e1fdc fix memory leaks (#1192) 2018-04-12 16:07:21 +08:00
minggo 3113af6176 optimize performance (#1191) 2018-04-12 11:44:11 +08:00
minggo ba8944c72a Optimize (#1190)
* h5 adapt

* don't bind Technique, Effect, Pass and Model
2018-04-11 11:32:33 +08:00
minggo 2ba3e815d2 h5 adapt (#1176) 2018-03-30 17:57:38 +08:00
minggo f4e3f9e8f6 adapt h5 (#1170) 2018-03-28 09:47:05 +08:00
James Chen 9c0e2291a9 Updates auto binding code. 2018-03-23 15:58:58 +08:00
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
James Chen 7667b00f87 More WebGL binding fixes. (#1160)
* Less opengl binding files.

* recreateBuffer in CanvasRendereringContext2D constructor.

* gl.bindFrameBuffer(gl.FRAME_BUFFER, null) needs to set to default frame buffer .

* Fixes JSB_glGetActiveUniform use GL_ACTIVE_ATTRIBUTE_MAX_LENGTH to get the max length, we need to use GL_ACTIVE_UNIFORM_MAX_LENGTH instead.

* glBufferSubData supports typedarray with 0 length. Adds more API for CanvasRenderingContext2D.
2018-03-22 16:03:34 +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 fe91680060 Adds ctx.fillRect interface, JSB_get_arraybufferview_dataptr supports null or undefine converstion. 2018-03-12 15:25:47 +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 6721db7bc6 Updates gfx/renderer auto binding code and ini configuration. 2018-03-07 09:59:26 +08:00
James Chen d6a8e1ca34 Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into new-renderer
# Conflicts:
#	cocos/scripting/js-bindings/event/EventDispatcher.cpp
#	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
2018-03-02 11:07:11 +08:00