You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Merge branch 'minggo/metal-support' into feature/updateBindGroup
* minggo/metal-support:
set partcile blend function in more elegant way
remove CC_USE_WIC
remove winrt macro
remove deprecated codes
remove unneeded codes
use audio engine to implement simple audio engine
remove ccthread
remove CCThread.h/.cpp
CMake support for mac & ios (cocos2d#169)
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/CCParticleBatchNode.cpp
static Sequence* create(M m1, M m2, M m3, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, NULL); }
141
-
static Sequence* create(M m1, M m2, M m3, M m4, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, NULL); }
142
-
static Sequence* create(M m1, M m2, M m3, M m4, M m5, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, NULL); }
143
-
static Sequence* create(M m1, M m2, M m3, M m4, M m5, M m6, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, m6, NULL); }
144
-
static Sequence* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, m6, m7, NULL); }
145
-
static Sequence* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, M m8, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, m6, m7, m8, NULL); }
146
-
static Sequence* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, M m8, M m9, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, m6, m7, m8, m9, NULL); }
147
-
static Sequence* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, M m8, M m9, M m10, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, NULL); }
148
-
149
-
// On WP8 for variable argument lists longer than 10 items, use the other create functions or variadicCreate with NULL as the last argument
static Spawn* create(M m1, M m2, M m3, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, NULL); }
370
-
static Spawn* create(M m1, M m2, M m3, M m4, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, NULL); }
371
-
static Spawn* create(M m1, M m2, M m3, M m4, M m5, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, NULL); }
372
-
static Spawn* create(M m1, M m2, M m3, M m4, M m5, M m6, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, m6, NULL); }
373
-
static Spawn* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, m6, m7, NULL); }
374
-
static Spawn* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, M m8, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, m6, m7, m8, NULL); }
375
-
static Spawn* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, M m8, M m9, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, m6, m7, m8, m9, NULL); }
376
-
static Spawn* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, M m8, M m9, M m10, std::nullptr_t listEnd) { returnvariadicCreate(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, NULL); }
377
-
378
-
// On WP8 for variable argument lists longer than 10 items, use the other create functions or createSpawn with NULL as the last argument.
static LayerMultiplex* create(M m1, M m2, M m3, std::nullptr_t listEnd) { returncreateVariadic(m1, m2, m3, NULL); }
602
-
static LayerMultiplex* create(M m1, M m2, M m3, M m4, std::nullptr_t listEnd) { returncreateVariadic(m1, m2, m3, m4, NULL); }
603
-
static LayerMultiplex* create(M m1, M m2, M m3, M m4, M m5, std::nullptr_t listEnd) { returncreateVariadic(m1, m2, m3, m4, m5, NULL); }
604
-
static LayerMultiplex* create(M m1, M m2, M m3, M m4, M m5, M m6, std::nullptr_t listEnd) { returncreateVariadic(m1, m2, m3, m4, m5, m6, NULL); }
605
-
static LayerMultiplex* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, std::nullptr_t listEnd) { returncreateVariadic(m1, m2, m3, m4, m5, m6, m7, NULL); }
606
-
static LayerMultiplex* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, M m8, std::nullptr_t listEnd) { returncreateVariadic(m1, m2, m3, m4, m5, m6, m7, m8, NULL); }
607
-
static LayerMultiplex* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, M m8, M m9, std::nullptr_t listEnd) { returncreateVariadic(m1, m2, m3, m4, m5, m6, m7, m8, m9, NULL); }
608
-
static LayerMultiplex* create(M m1, M m2, M m3, M m4, M m5, M m6, M m7, M m8, M m9, M m10, std::nullptr_t listEnd) { returncreateVariadic(m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, NULL); }
609
-
610
-
// On WP8 for variable argument lists longer than 10 items, use createWithArray or createVariadic with NULL as the last argument
0 commit comments