Commit Graph

3321 Commits

Author SHA1 Message Date
owen eec0bace41 修复透明度bug 2019-06-27 16:20:33 +08:00
yinkaile 63222190b4 Merge pull request #12 from sunnylanwanjun/v2.3.0-fix-render-bug2
v2.3 Spine and DragonBones batch
2019-06-27 10:18:06 +08:00
owen 2c1b1482c6 Native optimize 2019-06-26 18:59:49 +08:00
yinkaile 9f3e5c3485 Merge pull request #11 from 2youyou2/v2.3.0-refine-loadtime
add effect.copy bindings
2019-06-26 17:38:28 +08:00
2youyouo2 2bd5935110 add effect.copy bindings 2019-06-26 17:21:20 +08:00
yinkaile b062f70324 Merge pull request #9 from caryliu1999/v2.3.0-fix-blend
Fix default blend factor.
2019-06-25 11:00:39 +08:00
caryliu 54d177aff8 Fix default blend factor. 2019-06-25 10:54:21 +08:00
yinkaile 32d275c577 Merge pull request #8 from sunnylanwanjun/v2.3.0-fix-render-bug2
Native optimize
2019-06-24 16:59:16 +08:00
owen a7f5d9c150 Native optimize 2019-06-24 16:47:13 +08:00
yinkaile 27f0583d21 Merge pull request #7 from sunnylanwanjun/v2.3.0-fix-render-bug
V2.3.0 fix render bug
2019-06-24 14:06:44 +08:00
owen 9c29059a62 no message 2019-06-24 13:55:35 +08:00
owen 0cfb84d88d Native optimize 2019-06-24 10:48:18 +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
owen a463eb1eed Fix 2.3 performance bug 2019-06-20 17:55:42 +08:00
owen ff813753c8 Fix 2.3 performance bug 2019-06-20 17:41:09 +08:00
yinkaile c6f1ff927b Merge pull request #5 from caryliu1999/v2.3.0-youyou-effect
Modify the effect implementation of the native-renderer.
2019-06-20 15:05:52 +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
yinkaile 39f8b311ad Merge pull request #6 from sunnylanwanjun/v2.3.0-fix-big-map-render-error
V2.3.0 Memery Pool And Matrix optimize
2019-06-20 14:44:54 +08:00
owen 9fbb349dc4 Memory pool 2019-06-19 14:45:35 +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
caryliu c9548d8fa1 Modify the effect implementation of the native-renderer. 2019-06-17 12:14:33 +08:00
yinkaile 70666b528a Merge pull request #4 from sunnylanwanjun/v2.3.0-assembler-inheri
Assembler extend
2019-06-12 10:46:09 +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
yinkaile 760060deee Merge pull request #3 from sunnylanwanjun/v2.3.0-kaile-tiledmap
V2.3.0 Renderhandle to Assembler
2019-06-10 15:59:35 +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 7c55ce213e modify android.mk 2019-06-06 18:06:26 +08:00
owen e3e7ff5ab8 Renderhandle to Assembler 2019-06-06 17:36:50 +08:00
yinkaile f52ded6ad2 Merge pull request #2 from sunnylanwanjun/v2.3.0-kaile-native-renderer2
Native renderer
2019-05-27 11:05:57 +08:00
owen 8f4a486013 Native renderer
Native renderer

Native renderer

native renderer

native renderer
2019-05-26 16:34:10 +08:00
yinkaile 6425369d02 Merge pull request #1 from sunnylanwanjun/v2.3.0-kaile-native-renderer
Merge native renderer to v2.3
2019-05-17 10:09:53 +08:00
owen 9d3d582df8 Update binding generator 2019-05-16 20:27:49 +08:00
owen dc12a933e7 modify project 2019-05-16 20:20:57 +08:00
owen d7a88d240e Sync native renderer to v2.3 2019-05-16 19:33:23 +08:00
Jare Guo 92808b3881 Merge branch 'v2.0.10' into v2.1.1-release 2019-04-26 16:48:31 +08:00
江湖人称骚哥 0d8f8f8f7b Fix bug on ios, getNetworkType return None while network status is ReachableViaWWAN (#1734) 2019-04-26 16:42:37 +08:00
Cocos Robot 360c6c1f82 Sync branch v2.0.10 to v2.1.1-release 2019-04-25 20:06:46 +08:00
Arnold d88d4ffead Use smart pointers to hold references of global Application::_scheduler (#1732)
* use std::weak_ptr

* revert build/libcocos2d.vcxproj

* fix mac & ios & android

* declare variable in if block

* revert build/libcocos2d.vcxproj
2019-04-25 18:43:01 +08:00
owen 0edef1a7b5 Fix dragonbnoes slot displayIndex invalid in native platform bug (#1730) 2019-04-25 13:51:20 +08:00
cary 57554f4ed9 Fix the fillRect method implementation of the win32 platform. (#1728)
* Fix the fillRect method implementation of the win32 platform.

* fix indent
2019-04-22 18:19:18 +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
Jare Guo 3abfc68277 Merge branch 'v2.0.10' into v2.0-release 2019-04-20 15:51:35 +08:00
Jare Guo 1a72892bb5 gulp: unified push tag in fireball 2019-04-20 15:50:55 +08:00
Cocos Robot f07b75a90e Sync branch v2.0-release to v2.1-release 2019-04-19 18:53:15 +08:00
Cocos Robot 836fa5f770 Sync branch v2.0.10 to v2.0-release 2019-04-19 18:49:55 +08:00
CocosRobot acfa5e4285 [ci skip][AUTO]: updating jsbinding automatically (#1719) 2019-04-19 13:36:18 +08:00