CocosRobot
|
8674a00e54
|
[AUTO][ci skip]: updating cocos2dx_files.json (#1943)
* [ci skip][AUTO]: updating jsbinding automatically
* [AUTO][ci skip]: updating cocos2dx_files.json
|
2019-11-22 17:51:59 +08:00 |
|
pandamicro
|
d9ba1437fe
|
Fix compilation issues
|
2019-11-01 18:29:27 +08:00 |
|
pandamicro
|
4d75340e30
|
Import 3d gfx and generate auto bindings
|
2019-10-29 14:10:11 +08:00 |
|
pandamicro
|
7aa8691ca3
|
Cleanup and add 3d renderer sources
|
2019-10-17 14:50:54 +08:00 |
|
minggo
|
522a62a395
|
fix crash if invoked from non c++ context (#1878)
* fix crash if invoked from non c++ context
For example, this function is invoked in handle block of UIAlert will cause crash.
* fix typo
|
2019-10-14 18:22:29 +08:00 |
|
cary
|
26dcb6340e
|
Fix an error when SkinnedMeshRenderer is updated with Uniform. (#1876)
* Fix an error when SkinnedMeshRenderer is updated with Uniform.
* fix ci and modify custom properties
* change to all typed array
|
2019-10-12 19:53:32 +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 |
|
minggo
|
55450f2fd8
|
fix crash when restart application (#1865)
|
2019-10-09 11:43:35 +08:00 |
|
CocosRobot
|
181ee5b972
|
[ci skip][AUTO]: updating jsbinding automatically (#1862)
|
2019-09-30 10:07:59 +08:00 |
|
cary
|
887eec1f4d
|
Modify the 3D sprite to use AssemblerSprite. (#1861)
|
2019-09-30 09:56:45 +08:00 |
|
CocosRobot
|
5e44806392
|
[ci skip][AUTO]: updating jsbinding automatically (#1860)
|
2019-09-29 23:51:50 +08:00 |
|
yinkaile
|
dfa4e85cea
|
Revert "use jsc on iOS" (#1856)
This reverts commit 7fbe83c3ee.
|
2019-09-26 11:40:23 +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 |
|
yinkaile
|
30b8ab3268
|
fixed check opengl extension (#1850)
|
2019-09-19 13:37:50 +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 |
|
yinkaile
|
a7fb56d989
|
fixed logic of checking native GL extension (#1826)
|
2019-09-04 11:14:39 +08:00 |
|
CocosRobot
|
5ea8953d66
|
[ci skip][AUTO]: updating jsbinding automatically (#1815)
|
2019-08-30 11:24:27 +08:00 |
|
minggo
|
eb67111bbb
|
fix potential overflow (#1795)
|
2019-08-13 17:59:45 +08:00 |
|
owen
|
fa08bab7ae
|
Fix native tiled layer user node not render bug (#1792)
|
2019-08-08 16:25:47 +08:00 |
|
minggo
|
1e37ff1ec4
|
synchronize v2.1.3 to 2.2
|
2019-08-02 18:07:50 +08:00 |
|
cary
|
7576a53822
|
Fixed memory leak caused by HtmlCanvasElement not being released. (#1786)
* Fixed memory leak caused by HtmlCanvasElement not being released.
* modify unroot
* add comment
|
2019-08-02 10:21:48 +08:00 |
|
cary
|
9218ca722b
|
Fix the error of camera pos in program. (#1787)
* Fix a few details.
* fix camera pos error
|
2019-08-01 01:09:22 +08:00 |
|
2youyouo2
|
1bfcda6c19
|
update jsbinding
|
2019-07-26 16:40:46 +08:00 |
|
minggo
|
ebc27bb630
|
Merge branch 'v2.1.3' of github.com:minggo/cocos2d-x-lite into v2.1.3
|
2019-07-26 12:00:05 +08:00 |
|
minggo
|
7fbe83c3ee
|
use jsc on iOS
|
2019-07-26 11:49:43 +08:00 |
|
2youyouo2
|
178ab5efc1
|
Merge remote-tracking branch 'origin/v2.2.0' into v2.3.0
|
2019-07-26 10:54:20 +08:00 |
|
2youyouo2
|
8903b6031f
|
change uniform key to hash
|
2019-07-25 17:55:19 +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 |
|
owen
|
8fc2a40d1a
|
Fix dragonbones y axis error
|
2019-07-18 16:19:19 +08:00 |
|
caryliu
|
d623ac7e65
|
fix program error on mac
|
2019-07-17 18:57:49 +08:00 |
|
caryliu
|
ff17a83ee0
|
Support skin-mesh-render and fix some bugs.
|
2019-07-17 16:01:38 +08:00 |
|
owen
|
d36d15a101
|
Fix spine texture index missing bug
|
2019-07-16 15:31:56 +08:00 |
|
yinkaile
|
aa0a654845
|
Merge pull request #31 from 2youyou2/v2.3.0-merge22
V2.3.0 merge22
|
2019-07-16 14:48:48 +08:00 |
|
2youyouo2
|
237928722d
|
Merge branch 'v2.2.0' of github.com:cocos-creator/cocos2d-x-lite into v2.3.0-merge22
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# build/libcocos2d.vcxproj.filters
# cocos/editor-support/MiddlewareManager.cpp
# cocos/editor-support/dragonbones-creator-support/CCArmatureDisplay.cpp
# cocos/editor-support/spine-creator-support/SkeletonAnimation.cpp
# cocos/editor-support/spine-creator-support/SkeletonRenderer.cpp
# cocos/editor-support/spine-creator-support/SkeletonRenderer.h
# cocos/editor-support/spine/Array.c
# cocos/editor-support/spine/BoundingBoxAttachment.c
# cocos/editor-support/spine/ClippingAttachment.c
# cocos/editor-support/spine/Event.c
# cocos/editor-support/spine/HasRendererObject.h
# cocos/editor-support/spine/MixBlend.h
# cocos/editor-support/spine/PathAttachment.c
# cocos/editor-support/spine/PathConstraintSpacingTimeline.h
# cocos/editor-support/spine/RotateMode.h
# cocos/editor-support/spine/ScaleTimeline.h
# cocos/editor-support/spine/ShearTimeline.h
# cocos/editor-support/spine/TextureLoader.h
# cocos/editor-support/spine/Vertices.h
# cocos/editor-support/spine/extension.h
# cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_spine_auto_api.js
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp
# cocos/scripting/js-bindings/manual/jsb_global.cpp
# cocos/scripting/js-bindings/manual/jsb_spine_manual.cpp
# licenses/LICENSE_spine.txt
# templates/cocos2dx_files.json
|
2019-07-16 11:30:31 +08:00 |
|
yinkaile
|
8d94e3542a
|
Merge pull request #27 from caryliu1999/v2.3.0-youyou-renderer
Fix bugs in Program and Renderer.
|
2019-07-15 17:06:19 +08:00 |
|
caryliu
|
b3bd4763d6
|
Fix some uniform value error in renderer.
|
2019-07-15 16:51:14 +08:00 |
|
minggo
|
5591919cd4
|
fix errors on windows
|
2019-07-12 16:37:44 +08:00 |
|
2youyouo2
|
6b77ae2b64
|
fixed graphics opacity not right
|
2019-07-12 16:25:09 +08:00 |
|
minggo
|
ad417e80e0
|
make macro more clear
|
2019-07-12 15:48:09 +08:00 |
|
minggo
|
f884dcf19e
|
use jsc for non arm64 devices and some other fix
|
2019-07-12 14:14:21 +08:00 |
|
minggo
|
cd01f4e71d
|
fix compiling error
|
2019-07-12 10:36:12 +08:00 |
|
minggo
|
751e6f5f23
|
make v8 work on iOS
|
2019-07-12 10:36:05 +08:00 |
|
minggo
|
fc4e8af9a5
|
ios use v8
|
2019-07-12 10:35:56 +08:00 |
|
caryliu
|
350e3a6925
|
Fix bugs in Program and renderer.
|
2019-07-11 21:15:07 +08:00 |
|
yinkaile
|
fedef39cd3
|
Merge pull request #25 from caryliu1999/v2.3.0-youyou-3dModel
Fix renderer error in shadow stage.
|
2019-07-11 10:18:31 +08:00 |
|
caryliu
|
54c038f89a
|
Fix renderer error in shadow stage.
|
2019-07-10 21:11:05 +08:00 |
|
sunnylanwanjun
|
4cb0a61ef0
|
2.3.0 windows platform
|
2019-07-10 19:26:25 +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 |
|