pandamicro
|
77febbfe3d
|
Merge branch 'master' into next
|
2018-03-13 15:07:21 +08:00 |
|
pandamicro
|
4e47017aa4
|
Merge branch 'v1.9'
|
2018-03-13 11:54:54 +08:00 |
|
pandamicro
|
ba05646469
|
Refactor cc.isChildClassOf to cc.js.isChildClassOf
|
2018-03-12 17:50:26 +08:00 |
|
Jare Guo
|
144bd9ec6b
|
fix internal deserialize issue on wechat game
|
2018-03-09 09:37:16 +08:00 |
|
pandamicro
|
8b3c089a42
|
Add back high bits zIndex in localZOrder design and add warning
|
2018-03-08 14:27:52 +08:00 |
|
pandamicro
|
b778dde9c9
|
Fix wechat game HTMLVideoElement issue and deserialize issue
|
2018-03-08 11:42:36 +08:00 |
|
Jare Guo
|
02effd8f92
|
fix webview visibility on iOS 9/10 Safari
|
2018-03-06 20:42:56 +08:00 |
|
PP
|
67afe336d2
|
partly change JS into js
|
2018-03-06 11:47:09 +08:00 |
|
PP
|
1f448e821f
|
change all JS into js
|
2018-03-06 11:44:11 +08:00 |
|
PP
|
d9a7e80246
|
literalMap to flatMap
|
2018-03-02 09:48:10 +08:00 |
|
pandamicro
|
6b839d7363
|
Deprecate view.setViewPortInPoints & remove Director animation interval
|
2018-02-28 11:07:16 +08:00 |
|
pandamicro
|
2198aa52c8
|
Add canvas renderer basic architecture
|
2018-02-28 10:29:43 +08:00 |
|
fusijie
|
f3b96ffd56
|
fixed plist parser.
|
2018-02-27 10:06:23 +08:00 |
|
huangyi
|
56d813634e
|
support MultiTouch to qqplay for fireball/issues/6879
|
2018-02-27 09:20:58 +08:00 |
|
pandamicro
|
ed2dfe51c8
|
Fix View setAntiAlias issue
|
2018-02-26 17:28:57 +08:00 |
|
Jare Guo
|
6c809263e6
|
Merge 1.8
|
2018-02-24 14:58:57 +08:00 |
|
pandamicro
|
ba6e8f11a3
|
Remove cc._renderType, cc._canvas, cc.container
|
2018-02-24 11:31:51 +08:00 |
|
pandamicro
|
cf5dddda27
|
Fix _sgNode usage in Macro
|
2018-02-20 00:06:25 +08:00 |
|
pandamicro
|
29a96555dc
|
Fix sub class not replacing parent function issue
|
2018-02-13 16:56:22 +08:00 |
|
pandamicro
|
a29a5d1c7e
|
Remove useless macros and cc.bezierAt
|
2018-02-13 13:25:42 +08:00 |
|
pandamicro
|
14dab8735f
|
Remove _CCClass and all cc._Class usage
|
2018-02-13 12:36:56 +08:00 |
|
pandamicro
|
5795c5af3e
|
Remove dependency of cc._Class from View
|
2018-02-13 12:35:28 +08:00 |
|
Jare Guo
|
992b74f0ac
|
merge bricks (#2328)
* support bk game
* update code
* update code
* update code
* update code
* refine code
* update code
* update code
* update code
|
2018-02-09 10:12:44 +08:00 |
|
pandamicro
|
eb94d3b301
|
Remove old shaders
|
2018-02-09 10:07:37 +08:00 |
|
pandamicro
|
e1d173da1c
|
Review Director APIs
|
2018-02-09 10:07:01 +08:00 |
|
Jare Guo
|
b32ff4d02e
|
register engine version for both web and jsb
|
2018-02-09 00:31:36 +08:00 |
|
pandamicro
|
92b7e56fea
|
update deserialize code and add autoReleaseAssets type
|
2018-02-07 15:26:02 +08:00 |
|
pandamicro
|
3184910233
|
Remove MIUI logic in CCView
|
2018-02-01 15:01:38 +08:00 |
|
Jare Guo
|
a6fb92ad90
|
updating license
|
2018-02-01 09:38:54 +08:00 |
|
Jare Guo
|
bd15543093
|
updating license: Chukong Aipu -> Xiamen Yaji
|
2018-01-31 17:51:49 +08:00 |
|
Jare Guo
|
cbab14f630
|
Merge pull request #2263 from dumganhar/master
Adds empty implementation of cc.sys.getBatteryLevel/getNetworkType for web.
|
2018-01-29 16:11:13 +08:00 |
|
James Chen
|
46f2c794d0
|
Put to cc.sys namepsace.
|
2018-01-29 14:13:31 +08:00 |
|
Jare Guo
|
ded7092432
|
Merge branch 'v1.8'
# Conflicts:
# cocos2d/core/platform/deserialize.js
# extensions/dragonbones/CCFactory.js
# gulp/util/utils.js
|
2018-01-25 13:47:35 +08:00 |
|
knoxHuang
|
7e61615941
|
update deserialize code and add autoReleaseAssets type
|
2018-01-23 10:28:02 +08:00 |
|
James Chen
|
67ae8dbf4b
|
update comments.
|
2018-01-17 14:35:34 +08:00 |
|
James Chen
|
1d88af11ed
|
Adds comments
|
2018-01-17 14:22:19 +08:00 |
|
James Chen
|
3afa2c76eb
|
Adds empty implementation of cc.Device.getBatteryLevel/getNetworkType for web.
|
2018-01-17 13:36:55 +08:00 |
|
Jare Guo
|
463b8331a2
|
Merge pull request #2258 from cocos-creator/v1.8-release
sync branch
|
2018-01-16 15:14:08 +08:00 |
|
pandamicro
|
7712da14f5
|
Merge remote-tracking branch 'fireball/master' into next
|
2018-01-15 17:51:33 +08:00 |
|
VisualSJ
|
2d4a67b64a
|
Add node locked flag
|
2018-01-12 17:13:13 +08:00 |
|
Jare Guo
|
4e45ea985c
|
improve api
|
2018-01-11 10:01:13 +08:00 |
|
knoxHuang
|
8d79cb338f
|
fix __ctor__ api for fireball/issues/6806
|
2018-01-11 10:00:53 +08:00 |
|
Jare Guo
|
b31566d75f
|
Merge 1.8
|
2018-01-09 18:40:43 +08:00 |
|
Jare Guo
|
df36e5dc9c
|
Merge branch 'v1.8-release' into v1.8
|
2018-01-09 18:25:55 +08:00 |
|
knoxHuang
|
d05ffd3b53
|
fix __ctor__ api for fireball/issues/6806
|
2018-01-09 09:50:33 +08:00 |
|
pandamicro
|
0e303f464a
|
Fix macro boolean type
|
2018-01-05 16:54:16 +08:00 |
|
Jare Guo
|
2e2fd59193
|
add CC_SUPPORT_JIT macro
|
2018-01-03 22:58:37 +08:00 |
|
Jare Guo
|
d6f4918e38
|
reviewed
|
2018-01-03 14:31:47 +08:00 |
|
Jare Guo
|
298ab19d19
|
fix bug of asset type on JSB
|
2018-01-03 11:07:45 +08:00 |
|
Jare Guo
|
957aa2a6e5
|
Merge pull request #2211 from jareguo/temp
support migration for texture array
|
2017-12-30 15:16:33 +08:00 |
|