owen
036b2fd81a
Optimize assembler enable disable logic
2019-07-01 11:22:15 +08:00
caryliu
74bc2caffc
Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-forward-renderer
...
# Conflicts:
# cocos/renderer/scene/ModelBatcher.cpp
# cocos/renderer/scene/ModelBatcher.hpp
# tools/tojs/renderer.ini
2019-06-29 14:39:57 +08:00
owen
2c1b1482c6
Native optimize
2019-06-26 18:59:49 +08:00
2youyouo2
2bd5935110
add effect.copy bindings
2019-06-26 17:21:20 +08:00
caryliu
fef37c1a58
Synchronize forward-renderer.
2019-06-26 16:34:51 +08:00
owen
a463eb1eed
Fix 2.3 performance bug
2019-06-20 17:55:42 +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
8b6b84ec94
Memory pool
2019-06-18 18:53:52 +08:00
owen
86234f75b4
Memory pool
2019-06-18 18:53:42 +08:00
owen
d836929117
Assembler extend
2019-06-12 10:41:49 +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
Cocos Robot
fab7bdf6cf
Sync branch v2.3.0 to develop
2019-06-09 14:33:18 +08:00
owen
e3e7ff5ab8
Renderhandle to Assembler
2019-06-06 17:36:50 +08:00
owen
27976a78c9
V2.2.0 spine 3.7 ( #1754 )
...
* Remove old library
* upgrade spine
* Remove old files
* upgrade spine
* Upgrade spine
* Upgrade spine
* Roll back to 3.7
* Replace tab to 4 space
* Support spine vertex effect
Add mesh debug graphics
* modify license
* Modify cocos2dx-files.json
* Add bounding box
* Add bounding box
* Refine code
2019-05-29 17:38:46 +08:00
owen
9d3d582df8
Update binding generator
2019-05-16 20:27:49 +08:00
owen
d7a88d240e
Sync native renderer to v2.3
2019-05-16 19:33:23 +08:00
masteage
969fb15300
ios build fail bug fix
...
+ https://github.com/cocos-creator/cocos2d-x-lite/issues/1735
2019-04-29 17:25:40 +09: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
Knox
e99ea056a9
update simulator screen size config ( #1705 )
2019-03-21 13:53:58 +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
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
Knox
ad58cdda5b
update simulator devices config ( #1675 )
2019-02-01 10:31:04 +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
吴智明
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
吴智明
aca87582d3
change macro setting to xcconfig on ios and mac platform ( #1653 )
...
* change macro setting to xcconfig on ios an mac platform
* remove unuse files
2019-01-08 11:48:21 +08:00
leda
626e4a2344
fix simulator relaunch memory free bugs ( #1646 )
...
* improve terminate logic on Simulator
* fix win32 simulator relaunch, error
2018-12-27 16:04:27 +08:00
owen
af028c94d3
fix simulator compile error ( #1616 )
2018-12-10 11:01:12 +08:00
owen
c9ebdd81c3
Change bindings-generator sub modules ( #1623 )
...
* Change bingdings-generator sub modules
2018-12-07 18:27:21 +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
Jare Guo
4da7c8b39c
Merge commit '19b1757cfaf25cdc441fe4c8639bb1bef039a325' into v2.1-release
2018-11-09 16:27:38 +08:00
吴智明
19b1757cfa
changer version of cocos2d-console ( #1583 )
2018-11-05 14:46:33 +08:00
leda
2b4f711fea
update-console, include apk install logic improve ( #1571 )
2018-10-30 14:59:35 +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
Jare Guo
9002aa2941
Merge commit 'd7bd6fd369b09f6146e4e7ac93894864b87fb582' into v2.0-release
2018-10-15 17:34:45 +08:00
leda
448b88cd49
update cocos2dx_files.json rules, reduce copy ( #1541 )
...
* update cocos2dx_files.json rules
* reduce files copy
2018-10-12 10:24:56 +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
d7bd6fd369
update-2.0-console-to-1.10 ( #1525 )
2018-09-28 22:54:53 -07:00
leda
beb45454ad
support parse waitForConnect and debugPort from simulator/config.json ( #1521 )
...
* revert v8 debugger ip to 0.0.0.0 for simulator
* parse isWaitForConnect and debug port from config.json
* remove macro useless, since we parse the options from config.json
2018-09-26 18:57:56 -07:00
leda
a5391aaabd
add macro to support custom v8 debug option for creator ( #1518 )
...
* add macro to support custom v8 debug option for creator
* update console with version compare fixed
* revert debugger ip to 0.0.0.0 for template
2018-09-25 21:49:55 -07:00
leda
674614720e
add v8 optional on macOS ( #1515 )
...
* add v8 libs into mac project
* update xcode simulator project config
* add v8 header into template
* add SCRIPT_ENGINE_V8 optional on macOS
2018-09-26 09:21:18 +08:00
Jare Guo
bf7a01bdd5
Merge pull request #1508 from cocos-creator/v2.0-release
...
sync branch
2018-09-12 14:50:13 +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
leda
4ca166e109
dispatch show/hide event to js, included "cocos simulator" ( #1500 )
...
* add dispatchEnterBackgroundEvent for simulator
* more stable when set canvas size on win32
* add isNan check for float & double
* simplify event dispatch on AppDelegate
2018-09-06 16:39:45 +08:00
Jare Guo
63d7ba61e8
bump to 2.1 and merge commit v2.0-release into develop
2018-09-06 15:33:43 +08:00
wdzhangchukong
21377fdb74
Remove names about Cocos ( #1494 )
2018-09-04 13:41:02 +08:00
Jare Guo
caee68b1ff
Merge pull request #1490 from cocos-creator/v2.0-release
...
sync branch
2018-08-30 15:09:48 +08:00