pandamicro
|
4d75340e30
|
Import 3d gfx and generate auto bindings
|
2019-10-29 14:10:11 +08:00 |
|
吴智明
|
74f9db7ec0
|
update sub module cocos2d-console to latest version (#1883)
|
2019-10-15 16:12:14 +08:00 |
|
PP
|
0ab1197c27
|
refine pause playing audio when enter background (#1875)
* Revert "Pause music when app enter background (#1849)"
This reverts commit 7a24ee3377.
* refine pause playing audio when enter background
|
2019-10-12 17:02:50 +08:00 |
|
cary
|
70a2134fb4
|
Fix the display error of the 3D node in the native platform. (#1868)
* Fix the display error of the 3D node in the native platform.
* Modify the matrix calculation of 3D nodes.
|
2019-10-12 11:29:48 +08:00 |
|
cary
|
887eec1f4d
|
Modify the 3D sprite to use AssemblerSprite. (#1861)
|
2019-09-30 09:56:45 +08:00 |
|
owen
|
0cd71aefb9
|
V2.2.0 native Spine and DragonBones cache mode (#1844)
* Spine cache
* fix dragonbones yDown bug
* Spine cache mode and fix dragonBones yDown bug
* spine cache mode
* dragonbones cache mode
* dragonbones cache mode
* dragonbones cache mode
* spine dragonbones binding
* dragonbones cache mode
* spine dragonbones binding
* optimize dragonbones event
* update dragonbones binding
* dragonbones remove cache
* dragonbones cache mode
* update dragonbones binding
* dragonbones cache mode
* Fix some cache bug
* fix some cache mode bug
* optimize cache mode
* Fix update list order bug
* Fix indent issue
* revert bindings-generator
* Fix intent issue
|
2019-09-23 10:19:13 +08:00 |
|
Arnold
|
7a24ee3377
|
Pause music when app enter background (#1849)
invoke AudioEngine::pauseAll when app enter background
|
2019-09-18 13:52:28 +08:00 |
|
cary
|
34159f3c30
|
Fix bugs of the model orientation on the native platform. (#1836)
* Fix bugs of the model orientation on the native platform.
* Add camera api export.
* add android change
* modify liensence
|
2019-09-16 15:02:37 +08:00 |
|
Arnold
|
5dddbcf4d0
|
fix travis push failed (#1834)
* add scripts
* --no-recurse-submodules
|
2019-09-05 15:58:30 +08:00 |
|
Jare Guo
|
dcf8ca4199
|
Merge remote-tracking branch 'fireball/v2.1.3' into v2.2.0-release
# Conflicts:
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
|
2019-09-04 13:44:23 +08:00 |
|
owen
|
2c31d09fa5
|
Fix 213 spine auto file generate error (#1828)
|
2019-09-04 11:11:27 +08:00 |
|
Arnold
|
1914ef6d17
|
update binding generator (#1819)
|
2019-08-30 18:42:51 +08:00 |
|
Arnold
|
e29a43baff
|
fix travis (#1818)
|
2019-08-30 18:07:24 +08:00 |
|
Arnold
|
079a0587d6
|
fix travis (#1810)
* add liclang libraries & update script
* update submodule bindings-generator
|
2019-08-29 10:52:37 +08:00 |
|
Cocos Robot
|
99bec00fd5
|
Sync branch v2.2.0 to develop
|
2019-08-02 18:17:55 +08:00 |
|
2youyouo2
|
1bfcda6c19
|
update jsbinding
|
2019-07-26 16:40:46 +08:00 |
|
cary
|
88dd29cbb4
|
fix shadow error of 3d-model. (#1777)
* fix shadow error of 3d-model.
* add node judgement
|
2019-07-24 15:26:12 +08:00 |
|
caryliu
|
d623ac7e65
|
fix program error on mac
|
2019-07-17 18:57:49 +08:00 |
|
owen
|
d36d15a101
|
Fix spine texture index missing bug
|
2019-07-16 15:31:56 +08:00 |
|
minggo
|
0df822e1f8
|
update submodule to latest (#1771)
|
2019-07-12 15:22:30 +08:00 |
|
Cocos Robot
|
ce8a94eb8d
|
Sync branch v2.3.0 to develop
|
2019-07-12 13:47:53 +08:00 |
|
minggo
|
53de07c319
|
update submodule to latest (#1771)
|
2019-07-12 10:13:47 +08:00 |
|
owen
|
6f0333ffd7
|
Add se object ptr conversion (#1769)
|
2019-07-10 14:17:31 +08:00 |
|
owen
|
d0e192c1b8
|
Add se object ptr conversion
|
2019-07-10 12:11:27 +08:00 |
|
yinkaile
|
b0fa215a00
|
Merge pull request #23 from 2youyou2/v2.3.0-submodule
update bindings-generator
|
2019-07-10 11:28:54 +08:00 |
|
2youyouo2
|
8e4a5f32fd
|
update bindings-generator
|
2019-07-10 11:25:46 +08:00 |
|
caryliu
|
6c96b973b5
|
Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-mesh-fix
# Conflicts:
# cocos/renderer/renderer/Model.cpp
# cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js
# cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp
# tools/tojs/renderer.ini
|
2019-07-09 10:47:04 +08:00 |
|
owen
|
e64a491b31
|
remove multiply thread calc sprite
|
2019-07-08 20:48:03 +08:00 |
|
caryliu
|
34cb81ca5b
|
Fix the error of dynamic material scane.
|
2019-07-08 20:04:40 +08:00 |
|
owen
|
963f6f6aaa
|
Merge commit '955cfbf69eba92a444455e280b8b50a17b1ab250' into v2.3.0-all-platform
# Conflicts:
# cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
# tools/tojs/renderer.ini
|
2019-07-08 13:56:44 +08:00 |
|
owen
|
ce9b88983e
|
Fix Multiply Threads bug
|
2019-07-08 13:53:37 +08:00 |
|
caryliu
|
3a114d4d12
|
delete mesh assembler
|
2019-07-05 16:01:37 +08:00 |
|
caryliu
|
c93c0d87a7
|
delete mesh binding
|
2019-07-05 14:26:49 +08:00 |
|
owen
|
c96f164786
|
Simple Sprite Multiply Thread
|
2019-07-04 19:57:23 +08:00 |
|
caryliu
|
11dfa785b8
|
Support mesh renderer
|
2019-07-03 09:50:17 +08:00 |
|
owen
|
a21314dd86
|
roll back
|
2019-07-01 14:08:36 +08:00 |
|
owen
|
60fb8ab0bb
|
Optimize assembler enable disable logic
|
2019-07-01 13:58:55 +08:00 |
|
owen
|
b9334e5f57
|
Merge commit '9e9541917cab4ecfdd29b54120995931ab04c3ed' into v2.3.0-fix-render-bug4
# Conflicts:
# cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
# tools/tojs/renderer.ini
|
2019-07-01 11:30:09 +08:00 |
|
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 |
|