Arnold
|
e46e286a18
|
fix hash function
|
2019-03-15 17:19:04 +08:00 |
Arnold
|
4b5121c70b
|
Update cocos/renderer/backend/Types.cpp
|
2019-03-15 17:10:31 +08:00 |
Arnold
|
c8324db21e
|
move compiletimedefinations to a sperate func
|
2019-03-15 16:43:46 +08:00 |
Arnold
|
e77edfddf5
|
Update cocos/renderer/CCCustomCommand.h
|
2019-03-15 15:44:43 +08:00 |
Arnold
|
c1ba0d866b
|
remove comments
|
2019-03-15 15:09:39 +08:00 |
Arnold
|
e3385e0e58
|
revert binding
|
2019-03-15 14:51:33 +08:00 |
patricejiang
|
7280457fbb
|
add callback uniform to metal
|
2019-03-15 14:44:28 +08:00 |
patricejiang
|
9f55e8ee7b
|
fix macosx compile error
|
2019-03-15 14:44:28 +08:00 |
Arnold
|
d75c2f3c5e
|
add uniform callback
|
2019-03-15 14:44:28 +08:00 |
Arnold
|
c35c4e2347
|
fix ccpass
|
2019-03-15 14:41:59 +08:00 |
Arnold
|
069800b98c
|
enable test case
|
2019-03-15 14:41:59 +08:00 |
minggo
|
771c77637c
|
Merge pull request #19516 from CocosRobot/update_lua_bindings_1552618113
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
|
2019-03-15 10:57:35 +08:00 |
CocosRobot#Set
|
16b2649ba2
|
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
|
2019-03-15 02:48:36 +00:00 |
minggo
|
629eebd031
|
Merge pull request #19498 from PatriceJiang/texture_setTexParams
Texture2D::TexParams fields use backend enum types
|
2019-03-15 10:43:52 +08:00 |
Arnold
|
7fcdf544e7
|
Update cocos/renderer/backend/Types.h
|
2019-03-14 11:00:21 +08:00 |
Arnold
|
de77133821
|
Update cocos/renderer/CCTexture2D.cpp
|
2019-03-14 10:59:37 +08:00 |
minggo
|
2be80438a6
|
Merge pull request #19510 from Mee-gu/feature/UpdateTerrain
[Feature] add dummy texture for metal when lightMap is nullptr
|
2019-03-14 10:52:01 +08:00 |
minggo
|
63fde51dc8
|
Merge pull request #19508 from Mee-gu/feature/UpdateParticle3D
[BugFix] fix particle3D
|
2019-03-13 18:01:25 +08:00 |
minggo
|
b91d6171c7
|
Merge pull request #19488 from Mee-gu/feature/UniformAlignment
[Feature] fix uniform filled in metal
|
2019-03-13 17:32:35 +08:00 |
coulsonwang
|
df3637538a
|
[Feature] add dummy texture for metal when lightMap is nullptr
|
2019-03-13 16:05:02 +08:00 |
minggo
|
f5380f8efe
|
Merge pull request #19506 from minggo/rectangleclipping
ClippingRectangleNode works
|
2019-03-13 15:50:31 +08:00 |
Arnold
|
eb771312f5
|
fix lua compile
|
2019-03-13 15:34:32 +08:00 |
minggo
|
7bae208166
|
Merge pull request #19505 from minggo/fix-todo
Fix todo
|
2019-03-13 15:24:49 +08:00 |
coulsonwang
|
8e6416bf87
|
[BugFix] fix particle3D
|
2019-03-13 15:12:36 +08:00 |
minggo
|
1d9bde0520
|
ClippingRectangleNode works
|
2019-03-13 14:27:47 +08:00 |
minggo
|
7ebea45168
|
fix some todo
|
2019-03-13 14:11:40 +08:00 |
minggo
|
2795427a38
|
fix todo in CCGrid.cpp
|
2019-03-13 11:25:46 +08:00 |
patricejiang
|
73ad5c62d3
|
fix android compile
|
2019-03-13 11:16:03 +08:00 |
Arnold
|
1d0107c087
|
alias backend::SamplerDescriptor
|
2019-03-13 10:54:26 +08:00 |
minggo
|
fd679e3c3b
|
Merge pull request #19501 from CocosRobot/update_lua_bindings_1552443257
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
|
2019-03-13 10:20:09 +08:00 |
CocosRobot#Set
|
0ee2dc8c78
|
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
|
2019-03-13 02:14:20 +00:00 |
coulsonwang
|
5d5eaf4be1
|
[feature] fix android compile error
|
2019-03-13 10:10:15 +08:00 |
minggo
|
d61ad70826
|
[Feature] update attribute setting (#19499)
|
2019-03-13 10:09:38 +08:00 |
patricejiang
|
53975ee428
|
fix android error
|
2019-03-13 09:56:29 +08:00 |
coulsonwang
|
8d566bb8a7
|
[Feature] update 3rd-part libs build version (#19492)
|
2019-03-13 09:18:45 +08:00 |
coulsonwang
|
a8e54b9b53
|
[Feature] update attribute setting
|
2019-03-12 21:05:03 +08:00 |
Arnold
|
fb87eec3f5
|
remove texture2d::setSamplerDescriptor
|
2019-03-12 18:59:12 +08:00 |
minggo
|
509fd2f70d
|
enable windows ci (#19497)
* enable windows ci
* build with cmake
* fix default project name
|
2019-03-12 18:21:02 +08:00 |
Arnold
|
70b9031714
|
fix wrapping
|
2019-03-12 17:03:01 +08:00 |
Arnold
|
0d7b0fda2d
|
update submodule
|
2019-03-12 16:58:14 +08:00 |
patricejiang
|
58c40c1cc6
|
fix android compile error
|
2019-03-12 16:53:28 +08:00 |
Arnold
|
62c6eae7c3
|
change Texture2D::TexParams fields type
|
2019-03-12 16:53:28 +08:00 |
Arnold
|
475b6e63a5
|
[bugfix] ClippingNode & CameraBackgroundBrush render order (#19496)
* add groupcommand as a barrier to reorder clipping node renderring
* add comments
|
2019-03-12 15:41:32 +08:00 |
coulsonwang
|
d4375db34f
|
[Feature] use glslopt_basic_type
|
2019-03-12 15:35:42 +08:00 |
minggo
|
ac6d3f10f0
|
enable new project build (#19494)
|
2019-03-12 15:28:39 +08:00 |
coulsonwang
|
605975bfa0
|
[Feature] use references and rename the structure to a more meaningful name
|
2019-03-12 14:18:16 +08:00 |
CocosRobot
|
a2b50f8c57
|
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19495)
|
2019-03-12 14:13:48 +08:00 |
minggo
|
ed1e8c2c2f
|
make new project work (#19493)
|
2019-03-12 13:59:29 +08:00 |
coulsonwang
|
c17d361e50
|
[Feature] float3 etc in Metal has both sizeof and alignment same as float4, need convert to correct laytout
|
2019-03-12 11:10:57 +08:00 |
CocosRobot
|
feb1f7575e
|
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19490)
|
2019-03-12 10:52:45 +08:00 |