Commit Graph

1082 Commits

Author SHA1 Message Date
caryliu fef37c1a58 Synchronize forward-renderer. 2019-06-26 16:34:51 +08:00
caryliu 54d177aff8 Fix default blend factor. 2019-06-25 10:54:21 +08:00
owen d9a9ec10b7 Native optimize 2019-06-23 23:14:24 +08:00
owen 33db747c1a Native optimize 2019-06-21 22:30:28 +08:00
caryliu e56bfbb084 Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-youyou-effect
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
2019-06-20 15:04:24 +08:00
owen 88c1b2162d Merge commit '70666b528aca1bc1c2f38445be9f988b3ca58d31' into v2.3.0-fix-big-map-render-error 2019-06-18 19:21:40 +08:00
owen 86234f75b4 Memory pool 2019-06-18 18:53:42 +08:00
caryliu c9548d8fa1 Modify the effect implementation of the native-renderer. 2019-06-17 12:14:33 +08:00
owen d836929117 Assembler extend 2019-06-12 10:41:49 +08:00
owen 49c491dba7 tile map bug 2019-06-10 20:15:37 +08:00
owen cc0077e7fe spine 2019-06-10 15:53:59 +08:00
owen c8e858a184 Tile map 2019-06-09 23:16:26 +08:00
owen e3e7ff5ab8 Renderhandle to Assembler 2019-06-06 17:36:50 +08:00
owen 8f4a486013 Native renderer
Native renderer

Native renderer

native renderer

native renderer
2019-05-26 16:34:10 +08:00
owen d7a88d240e Sync native renderer to v2.3 2019-05-16 19:33:23 +08:00
Cocos Robot 360c6c1f82 Sync branch v2.0.10 to v2.1.1-release 2019-04-25 20:06:46 +08:00
owen 0edef1a7b5 Fix dragonbnoes slot displayIndex invalid in native platform bug (#1730) 2019-04-25 13:51:20 +08:00
Arnold a9e182967f Prevent XMLHttpRequest from being gc incorrectly, when timeout occurs. (#1724)
* gc on response

* fix state

* add comment

* prevent multiple send

* revert bindings-generator

* rename _isSend to _isSending
2019-04-22 13:08:00 +08:00
Cocos Robot f07b75a90e Sync branch v2.0-release to v2.1-release 2019-04-19 18:53:15 +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
kenshin 3b9ea184ae fix XMLHttpRequest crash, avoid HttpClient response call a released object! (#1721) 2019-04-19 10:06:40 +08:00
Jare Guo 0edfbf4b92 Merge commit 'a4dc939aef28a4142723667df702d4003a6a8468' into v2.1-release 2019-04-03 20:06:14 +08:00
wuzhiming 2f98eff917 change font search method to avoid font search error 2019-03-13 13:55:39 +08:00
CocosRobot 3581cd0adb [ci skip][AUTO]: updating jsbinding automatically (#1696) 2019-03-13 10:13:21 +08:00
owen 0acb69851b optimize spine memory (#1694)
* Optimize spine memory

* roll back genbindings.py
Remove unused function

* visual studio project config

* modify Android mk

* Modify default project config

* Fix restart vm crash

* Fix if listen spine dispose event, will triggle crash bug

* Move some function to private

* move release skeletondata behind depose skeleton

* optimize spine load file

* Add dragon bones and spine global time scale api

* clear tracks and listener

* change tab to 4 spaces

* optimized code logic
2019-03-12 11:51:51 +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
leda 412223f085 default don't invoke log to javascript in JSC (#1687) 2019-02-25 21:21:04 +08:00
leda ae996e1fce fix potential crash on websocket for lifecycle sync issues (#1681) 2019-02-18 15:50:18 +08:00
ColinCollins c4f6629174 my fault fixed the gammar error (#1680) 2019-02-15 15:51:43 +08:00
ColinCollins 9b5525bdb5 fixed the compressed texture error (#1679)
copy image data size doesn't match the compress data size
2019-02-15 14:36:36 +08:00
ColinCollins 092c0834a7 fixed the png render error (#1678) 2019-02-14 17:06:33 +08:00
ColinCollins 0141a98b32 modify the picture format convert method (#1677) 2019-02-13 12:41:42 +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
leda f82b9bfdf6 Merge pull request #1674 from cocos-creator/v2.1-release
sync branch 2.1 to 2.0
2019-01-31 18:19:53 +08:00
ColinCollins b58b27df3b add the adaptation of the png special format transform to RGBA format (#1672)
Squashed commits:
[2c579977] add the adaptation of the png special format transform to RGBA format
2019-01-29 15:54:09 +08:00
Wenhai Lin b8ae263cd2 Copy text to clipboard (#1667) 2019-01-28 10:14:34 +08:00
ColinCollins 7336ea01f1 add the adaptation of the png special format transform to RGBA format (#1668) 2019-01-28 10:07:31 +08:00
leda c792623707 improve module register logic, include simulator config (#1665)
* add Configuration settings for simulator, too

* improve module register logic
2019-01-16 11:29:47 +08:00
Jare Guo 4273ee52d8 Merge commit '90b862182c031ed638c579fd5f4c9f35e66bffcb' into v2.1-release 2019-01-15 21:34:39 +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
leda 6af2435e20 improve error log when require failed by JSB (#1648)
* add error log when ScriptEngine::evalString failed

* improve require file not existed notify
2018-12-28 16:13:33 +08:00
owen 86a9f80485 fix ios 9 typedarray or arraybuffer send nullptr will crash bug (#1647) 2018-12-28 10:48:53 +08:00
Arnold 6916a8a3dc [httprequest] fix unsafe parser (#1629)
* [httprequest] fix unsafe parser

* simplify

* use status code

* fix response status text if missing

* allow space

* fix format
2018-12-27 17:39:55 +08:00
leda 831de21f91 adapt jsb2.0 docs to creator 2.x (#1643) 2018-12-25 18:08:32 +08:00
Knox ce0af6d8db add get system full language (#1638) 2018-12-24 14:41:38 +08:00
dreamtravel 79cb270254 remove AnySDK and Cocos Analytics, move both into Creator Service Panel (#1619)
* 移除cocos-2dx-lite的依赖external中的AnySDK和Cocos Analytics,转移这两者的集成到Service in Creator项目 修改Runtime默认工程,清理模版工程对AnySDK和Cocos Analytics的依赖

* 修改iOS link 模版

* 修改cocos2s-x-lite的deps目标
2018-12-07 17:32:44 +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 1954d0c396 fix typo at jsb_opengl_manual.cpp (#1604) 2018-11-20 20:17:21 +08:00