knoxHuang
|
85de852a50
|
fix pageview bug for fireball/issues/4972
|
2016-12-23 17:01:56 +08:00 |
|
Nan Wang
|
1719ccfeed
|
Merge branch 'v1.3' of github.com:cocos-creator/engine into v1.3
|
2016-12-20 09:32:46 +08:00 |
|
Nan Wang
|
fa8cae5c2d
|
update version to 1.3.3
|
2016-12-20 09:32:19 +08:00 |
|
Jare Guo
|
fb65f2f048
|
Merge pull request #1375 from knoxHuang/v1.3
fix pageview bug for fireball/issues/4926
|
2016-12-19 11:09:56 +08:00 |
|
knoxHuang
|
e746ac276b
|
fix pageview bug for fireball/issues/4926
|
2016-12-19 11:06:48 +08:00 |
|
Wang Nan
|
36fe3f3b1d
|
Merge pull request #1363 from knoxHuang/v1.3
fix Mask error for #fireball/issues/4897
|
2016-12-16 14:01:40 +08:00 |
|
knoxHuang
|
30d56d3d30
|
update Mask for #fireball/issues/4897
|
2016-12-16 13:28:02 +08:00 |
|
Jare Guo
|
1ab6972dca
|
Merge pull request #1365 from knoxHuang/v1.3_fixBug
fix load webp error for fireball/issues/4904
|
2016-12-15 15:23:09 +08:00 |
|
knoxHuang
|
2f854f6cf6
|
fix load webp error for fireball/issues/4904
|
2016-12-15 15:16:28 +08:00 |
|
Wang Nan
|
565e1e9bf4
|
Merge pull request #1359 from knoxHuang/v1.3
fix DEVICEMOTION error for fireball/issues/4887
|
2016-12-13 13:59:34 +08:00 |
|
knoxHuang
|
f0816b9ec9
|
fix DEVICEMOTION error for fireball/issues/4887
|
2016-12-13 13:50:20 +08:00 |
|
Wang Nan
|
f2f424d8a7
|
Merge pull request #1348 from pandamicro/v1.3
Some small bug fixes and improvements
|
2016-12-12 09:51:25 +08:00 |
|
pandamicro
|
df36c36126
|
Fix sys doc
|
2016-12-09 17:21:21 +08:00 |
|
pandamicro
|
e481778a26
|
Tiny improvement to downloadImage
|
2016-12-09 17:21:11 +08:00 |
|
pandamicro
|
dfbc7f0070
|
Loader only allow access to completed item
|
2016-12-09 17:20:15 +08:00 |
|
pandamicro
|
397ea7c1f0
|
Fix screen blink on xiaomi pad x5 browsers
|
2016-12-09 17:17:15 +08:00 |
|
pandamicro
|
0dc055c509
|
Fix 3D projection
|
2016-12-09 17:16:32 +08:00 |
|
Wang Nan
|
bd2770d02f
|
Merge pull request #1340 from knoxHuang/v1.3_fixBug
fix CCSystemEvent cc._EventListenerKeyboard.LISTENER_ID error for JSB
|
2016-12-09 11:02:50 +08:00 |
|
knoxHuang
|
01e0e9d031
|
add LISTENER_ID for jsb-event
|
2016-12-09 10:10:20 +08:00 |
|
Jare Guo
|
e248709cf2
|
Merge pull request #1344 from jareguo/v1.3
preload fnt when loading scene
|
2016-12-08 17:45:16 +08:00 |
|
Jare Guo
|
eae6845f21
|
Merge pull request #1346 from jareguo/temp
提供场景分步加载 API
|
2016-12-08 16:12:37 +08:00 |
|
Jare Guo
|
1fb594a2e4
|
add paramater of Director._loadSceneByUuid
|
2016-12-08 15:59:50 +08:00 |
|
Jare Guo
|
4d1462ea6b
|
Merge pull request #1345 from knoxHuang/v1.3
fix jsb mask this._clippingStencil is null
|
2016-12-08 14:22:23 +08:00 |
|
Jare Guo
|
cfc193f894
|
preload fnt when loading scene
|
2016-12-08 14:02:43 +08:00 |
|
knoxHuang
|
3254fd0fff
|
fix jsb mask this._clippingStencil is null
|
2016-12-08 14:02:09 +08:00 |
|
Wang Nan
|
229c778dd9
|
Merge pull request #1341 from zilongshanren/fix-richtext-custom-font-rendering-issue
fix richtext custom chinese font rendering issue
|
2016-12-07 17:23:40 +08:00 |
|
zilongshanren
|
3354816e87
|
fix richtext custom chinese font rendering issue
|
2016-12-07 15:22:36 +08:00 |
|
Wang Nan
|
f79b20f664
|
Merge pull request #1339 from knoxHuang/v1.3
fix page view error for fireball/issues/4758
|
2016-12-07 14:11:21 +08:00 |
|
knoxHuang
|
8d58c5a32f
|
fix CCSystemEvent cc._EventListenerKeyboard.LISTENER_ID error for JSB
|
2016-12-07 11:45:44 +08:00 |
|
knoxHuang
|
ca72d3c46a
|
fix page view error for fireball/issues/4758
|
2016-12-07 10:59:49 +08:00 |
|
Wang Nan
|
12aeb87fae
|
Merge pull request #1338 from knoxHuang/v1.3
add hasEventListener for CCEventDispatcher
|
2016-12-06 16:52:52 +08:00 |
|
knoxHuang
|
55cfa7f7fb
|
update hasEventListener for CCEventDispatcher
|
2016-12-06 16:30:13 +08:00 |
|
knoxHuang
|
cb94f9a683
|
add hasEventListener for CCEventDispatcher
|
2016-12-06 14:26:48 +08:00 |
|
Jare Guo
|
2adaa73498
|
Merge pull request #1335 from knoxHuang/v1.3
Repair loader._items.map to cc.loader._cache for enableAntiAlias
|
2016-12-05 09:50:41 +08:00 |
|
knoxHuang
|
5cfc469e0b
|
Repair loader._items.map to cc.loader._cache for enableAntiAlias
|
2016-12-05 09:43:41 +08:00 |
|
Jare Guo
|
70dc9feccf
|
Merge pull request #1334 from knoxHuang/v1.3
fix CCSystemEvent error
|
2016-12-04 20:57:44 +08:00 |
|
knoxHuang
|
5b08a52dcf
|
fix CCSystemEvent error
|
2016-12-02 16:30:47 +08:00 |
|
Jare Guo
|
0663649451
|
Merge pull request #1330 from knoxHuang/v1.3
Fixed a dead loop when the file texture uuid is undefined for firebal…
|
2016-11-30 14:23:23 +08:00 |
|
knoxHuang
|
cd98111312
|
Fixed a dead loop when the file texture uuid is undefined for fireball/issues/4822
|
2016-11-30 14:18:26 +08:00 |
|
Jare Guo
|
4ec85caeef
|
Merge pull request #1329 from knoxHuang/v1.3
Fixing CCSGParticleSystem to read rotationIsDir is not a string error
|
2016-11-30 12:29:17 +08:00 |
|
knoxHuang
|
2e3355ab4f
|
Fixing CCSGParticleSystem to read rotationIsDir is not a string error
|
2016-11-30 12:02:42 +08:00 |
|
Jare Guo
|
29930a7c9e
|
Merge pull request #1327 from jareguo/v1.3
fix mixins release
|
2016-11-29 14:08:34 +08:00 |
|
Jare Guo
|
57d8f90bad
|
fix mixins release
|
2016-11-29 14:08:23 +08:00 |
|
Jare Guo
|
b1e5d3b8e9
|
Merge pull request #1322 from knoxHuang/v1.3
should check validation of _stencil
|
2016-11-28 16:03:07 +08:00 |
|
knoxHuang
|
1648279035
|
should check validation of _stencil
|
2016-11-28 15:59:20 +08:00 |
|
Wang Nan
|
1da82703a7
|
Merge pull request #1320 from jareguo/v1.3
add language codes
|
2016-11-28 14:50:43 +08:00 |
|
Jare Guo
|
b689568f35
|
add language codes
|
2016-11-28 14:27:45 +08:00 |
|
Wang Nan
|
645306abfa
|
Merge pull request #1311 from knoxHuang/Mask
add IMAGE_STENCIL for CCMask for fireball/issues/3961
|
2016-11-25 11:01:54 +08:00 |
|
Jare Guo
|
d41e7d0500
|
Merge pull request #1314 from knoxHuang/v1.3
fix cc.Node:getActionByTag returns undefined for engine/issues/1300
|
2016-11-25 10:58:49 +08:00 |
|
knoxHuang
|
5a9dba25d1
|
fix cc.Node:getActionByTag returns undefined for engine/issues/1300
|
2016-11-25 10:56:07 +08:00 |
|