Jare Guo
|
9f75fddb59
|
Merge pull request #1872 from pandamicro/master
Improve web restart process, avoid issues related to event callback etc
|
2017-08-02 20:52:46 +08:00 |
|
pandamicro
|
93fb81225d
|
Improve web restart process, avoid issues related to event callback etc
|
2017-08-02 18:22:42 +08:00 |
|
Wang Nan
|
5f9cd9d531
|
Merge pull request #1870 from pandamicro/master
Less strict check for schedule, use warn instead of assert when paused state doesn't match
|
2017-08-02 16:41:56 +08:00 |
|
Wang Nan
|
571b15711a
|
Merge pull request #1871 from 2youyou2/v1.6
fixed camera memory leak
|
2017-08-02 16:41:00 +08:00 |
|
2youyouo2
|
c79e323884
|
add comment
|
2017-08-02 16:40:39 +08:00 |
|
2youyouo2
|
7903bff5a7
|
fixed camera memory leak
|
2017-08-02 16:36:32 +08:00 |
|
pandamicro
|
90746d76a1
|
Less strict check for schedule, use warn instead of assert when paused state doesn't match
|
2017-08-02 11:30:20 +08:00 |
|
Jare Guo
|
d694b50ccc
|
Merge pull request #1866 from 2youyou2/master
improve WrappedInfo.prototype.set performance
|
2017-08-01 16:52:44 +08:00 |
|
2youyouo2
|
21fdff8cd5
|
improve WrappedInfo.prototype.set performance
|
2017-08-01 16:44:51 +08:00 |
|
Wang Nan
|
bd8141a52f
|
Merge pull request #1865 from 2youyou2/culling
fixed web tiled map culling
|
2017-08-01 15:52:08 +08:00 |
|
2youyouo2
|
bd43e8b89d
|
fixed web tiled map culling
|
2017-08-01 11:52:00 +08:00 |
|
Jare Guo
|
052a4333e3
|
Merge pull request #1863 from knoxHuang/master
fix md5Pipe err for fireball/issues/6156
|
2017-07-31 20:35:20 +08:00 |
|
knoxHuang
|
f40b2c4a1a
|
refine code
|
2017-07-31 18:25:45 +08:00 |
|
knoxHuang
|
550943d175
|
fix md5Pipe err for fireball/issues/6156
|
2017-07-31 18:11:28 +08:00 |
|
pandamicro
|
6c6b631263
|
Merge pull request #1862 from pandamicro/master
Fix cc._RF.reset is not defined issue
|
2017-07-31 16:11:31 +08:00 |
|
pandamicro
|
39e1d00b9a
|
Fix cc._RF.reset is not defined issue
|
2017-07-31 16:04:34 +08:00 |
|
Jare Guo
|
72592e1b1a
|
Merge pull request #1861 from pandamicro/master
Revert useless alpha check in jsb-action
|
2017-07-31 16:02:16 +08:00 |
|
pandamicro
|
945c03b5aa
|
Revert useless alpha check in jsb-action
|
2017-07-31 15:55:20 +08:00 |
|
Wang Nan
|
a183bec548
|
Merge pull request #1860 from pandamicro/master
Fix setting alpha with color warning during tint action
|
2017-07-31 15:49:59 +08:00 |
|
pandamicro
|
740c6c2f94
|
Fix setting alpha with color warning during tint action
|
2017-07-31 14:45:32 +08:00 |
|
Jare Guo
|
67ff5b6622
|
Merge pull request #1859 from 2youyou2/physics
not auto calculate polygon points when reset polygon collider
|
2017-07-31 11:45:26 +08:00 |
|
2youyouo2
|
ff448b2abc
|
not auto calculate polygon points when reset polygon collider
|
2017-07-31 11:43:37 +08:00 |
|
Jare Guo
|
c9bd3bff10
|
Merge pull request #1858 from knoxHuang/master
fix Bmfont click useSystemFont, showing two label bug
|
2017-07-30 15:06:23 +08:00 |
|
knoxHuang
|
c6f81f4866
|
fix Bmfont click useSystemFont, showing two label bug
|
2017-07-28 23:53:59 +08:00 |
|
pandamicro
|
4bd24eae96
|
Merge pull request #1857 from pandamicro/master
Fix cc.game.restart on Web
|
2017-07-28 18:22:21 +08:00 |
|
pandamicro
|
9a964900dd
|
Fix cc.game.restart on Web
|
2017-07-28 17:52:04 +08:00 |
|
pandamicro
|
216d154450
|
Merge pull request #1856 from pandamicro/master
Add __cleanup for jsb data cleanup during restart
|
2017-07-28 15:45:18 +08:00 |
|
pandamicro
|
b30a2b7069
|
Reset other js caches in jsb __cleanup
|
2017-07-28 15:42:34 +08:00 |
|
pandamicro
|
9efec05781
|
Add __cleanup for jsb data cleanup during restart
|
2017-07-28 15:34:02 +08:00 |
|
Jare Guo
|
4fdb070396
|
Merge pull request #1855 from knoxHuang/master
fix load tilemap erro for md5
|
2017-07-28 14:26:11 +08:00 |
|
knoxHuang
|
642ca45f69
|
fix load tilemap erro for md5
|
2017-07-28 14:21:50 +08:00 |
|
Jare Guo
|
01b30b5156
|
Merge pull request #1852 from VisualSJ/master-6093
#6093 Adjusting audio event triggering mechanism
|
2017-07-28 10:49:25 +08:00 |
|
Wang Nan
|
34d5ce6e2c
|
Merge pull request #1853 from pandamicro/master
[Editor] Fix aliased item couldn't be retrieved issue
|
2017-07-27 18:36:06 +08:00 |
|
pandamicro
|
da4281dfbb
|
[Editor] Fix aliased item couldn't be retrieved issue
|
2017-07-27 18:22:19 +08:00 |
|
VisualSJ
|
09b138168b
|
#6093 Adjusting audio event triggering mechanism
|
2017-07-27 18:06:27 +08:00 |
|
Jare Guo
|
c4c9689d2a
|
Merge pull request #1851 from knoxHuang/master
add _initSgNode to CCMask
|
2017-07-27 16:49:36 +08:00 |
|
knoxHuang
|
56e12b4d2e
|
add _initSgNode to CCMask
|
2017-07-27 16:44:12 +08:00 |
|
Wang Nan
|
5f61673084
|
Merge pull request #1849 from 2youyou2/master
add enabledAccumulator option to physics manager
|
2017-07-27 16:41:19 +08:00 |
|
Wang Nan
|
e7ed01f17d
|
Merge pull request #1850 from knoxHuang/master
add CCAudioEngine play arguments error tips
|
2017-07-27 16:39:06 +08:00 |
|
knoxHuang
|
f091d25e76
|
add CCAudioEngine play arguments error tips
|
2017-07-27 16:36:54 +08:00 |
|
2youyouo2
|
a3fc730d2f
|
add enabledAccumulator option to physics manager
|
2017-07-27 16:24:13 +08:00 |
|
Wang Nan
|
c04c6a1ce2
|
Merge pull request #1848 from VisualSJ/master-6122
#6122 Fixed audio volume
|
2017-07-27 14:09:47 +08:00 |
|
VisualSJ
|
8c1480d4ff
|
#6122 Fixed audio volume
|
2017-07-27 14:04:56 +08:00 |
|
Wang Nan
|
63eea5d9e6
|
Merge pull request #1847 from jareguo/master
场景切换时输出一些调试数据
|
2017-07-27 11:57:32 +08:00 |
|
Jare Guo
|
ddbde3714e
|
Merge pull request #1845 from 2youyou2/master
fixed physics joint crash
|
2017-07-27 11:56:27 +08:00 |
|
Wang Nan
|
d60a57f497
|
Merge pull request #1846 from knoxHuang/master
limit the segements size of the Mask
|
2017-07-27 11:50:56 +08:00 |
|
Jare Guo
|
0460947563
|
log scene loading time for profiling
|
2017-07-27 11:48:10 +08:00 |
|
knoxHuang
|
aabdb089d5
|
limit the segements size of the Mask
|
2017-07-27 11:45:43 +08:00 |
|
2youyouo2
|
691a953488
|
fixed physics joint crash
|
2017-07-27 11:37:15 +08:00 |
|
Jare Guo
|
8442569917
|
polyfill console.time
|
2017-07-27 11:32:55 +08:00 |
|