Commit Graph

4804 Commits

Author SHA1 Message Date
Cocos Robot 53546dbda0 Sync branch v2.2.0 to v2.3.0 2019-07-17 14:31:03 +08:00
Cocos Robot d3e5ac0156 Sync branch v2.1.3 to v2.2.0 2019-07-17 14:31:01 +08:00
minggo 2801316866 fix accuracy of RGB value (#1773)
* fix accuracy of RGB value

* don't have to check less than 0
2019-07-16 17:45:41 +08:00
minggo 44c48627fc fix windows label effect (#1774) 2019-07-16 17:45:09 +08:00
owen d36d15a101 Fix spine texture index missing bug 2019-07-16 15:31:56 +08:00
2youyouo2 34fab4d012 add back files 2019-07-16 14:57:15 +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 f291dc8c36 update comment 2019-07-12 16:30:36 +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 0df822e1f8 update submodule to latest (#1771) 2019-07-12 15:22:30 +08:00
minggo f884dcf19e use jsc for non arm64 devices and some other fix 2019-07-12 14:14:21 +08:00
Cocos Robot ce8a94eb8d Sync branch v2.3.0 to develop 2019-07-12 13:47:53 +08:00
Cocos Robot 3c5c718627 Sync branch v2.2.0 to v2.3.0 2019-07-12 10:39:35 +08:00
Cocos Robot 8c96153735 Sync branch v2.1.3 to v2.2.0 2019-07-12 10:39:27 +08:00
minggo fbc69aebeb can build and run on android, but will crash 2019-07-12 10:36: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
minggo 53de07c319 update submodule to latest (#1771) 2019-07-12 10:13:47 +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
yinkaile 987156d525 Merge pull request #24 from sunnylanwanjun/v2.3.0-merge-submodule
Add se object ptr conversion
2019-07-11 10:17:36 +08:00
caryliu 573717c8f8 add auto reference 2019-07-11 10:15:26 +08:00
yinkaile 4af6695d5e Merge pull request #26 from sunnylanwanjun/v2.3.0-fix-bug
V2.3.0 support windows platform
2019-07-11 10:14:32 +08:00
caryliu 1d71432cc5 delete unuse code. 2019-07-10 21:15:13 +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
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
minggo 06941da308 make all transparent pixel color the same as font but alpha (#1768)
* set all transparent pixel to (255,255, 255, 0)

* fix comment
2019-07-09 17:00:41 +08:00
owen eb83d6758e modity template file 2019-07-09 11:39:53 +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
caryliu 43ae9f9f5a fix the release of pointer in Model. 2019-07-08 16:20:59 +08:00
owen 00083d8114 fix file wrong name issue 2019-07-08 16:14:54 +08:00
owen 6dd67ae07b remove wrong name file 2019-07-08 16:13:20 +08:00
minggo bbbe7f0b84 revert refactor of fillText and strokeTest (#1767) 2019-07-08 13:57:07 +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 5c0e431c74 refine config macro logic 2019-07-08 13:54:15 +08:00
owen ce9b88983e Fix Multiply Threads bug 2019-07-08 13:53:37 +08:00
caryliu a1a7a8ed3a delete code 2019-07-06 08:57:57 +08:00
caryliu 3a114d4d12 delete mesh assembler 2019-07-05 16:01:37 +08:00