Jare Guo
|
e1601ac00f
|
Merge 1.6
# Conflicts:
# cocos2d/core/CCDirector.js
# cocos2d/core/components/CCSprite.js
|
2017-09-22 10:48:01 +08:00 |
|
Wang Nan
|
f147fcdbc1
|
Merge pull request #1994 from knoxHuang/v1.6
fix webview event error for fireball/issues/6328
|
2017-09-22 10:31:11 +08:00 |
|
Wang Nan
|
d4b5071f74
|
Merge pull request #1993 from 2youyou2/optimize-animation
Optimize animation
|
2017-09-22 10:26:59 +08:00 |
|
knoxHuang
|
320d5d5915
|
fix webview event error for fireball/issues/6328
|
2017-09-21 16:51:43 +08:00 |
|
2youyouo2
|
a73dc7a0ff
|
stop AnimationAnimator if all animations are removed
|
2017-09-21 15:28:13 +08:00 |
|
2youyouo2
|
d5cd11a8b1
|
Merge branch 'master' into optimize-animation
|
2017-09-21 15:06:59 +08:00 |
|
Jare Guo
|
c384c1e8ef
|
Merge pull request #1992 from 2youyou2/master
fixed global variable
|
2017-09-21 01:41:24 -05:00 |
|
2youyouo2
|
2f66ecce71
|
fixed global variable
|
2017-09-21 14:37:01 +08:00 |
|
Jare Guo
|
083a213ce2
|
Merge pull request #1991 from 2youyou2/v1.6
fixed duplicate definition
|
2017-09-21 01:11:49 -05:00 |
|
2youyouo2
|
15ef9ba0d3
|
fixed duplicate definition
|
2017-09-21 14:05:59 +08:00 |
|
Jare Guo
|
fcfb81f1af
|
Merge pull request #1989 from 2youyou2/native-modular
Native modular
|
2017-09-19 04:22:00 -05:00 |
|
2youyouo2
|
73e1358a20
|
remove ccui defines
|
2017-09-19 17:19:20 +08:00 |
|
2youyouo2
|
d054738d2c
|
Merge branch 'master' into native-modular
|
2017-09-18 13:59:42 +08:00 |
|
Jare Guo
|
2c49b9c459
|
Merge pull request #1986 from 2youyou2/v1.6
fixed hitTest
|
2017-09-17 21:48:57 -05:00 |
|
2youyouo2
|
cb9f2b4777
|
fixed hitTest
|
2017-09-18 10:31:46 +08:00 |
|
2youyouo2
|
c3f5745559
|
remove jsb ui
|
2017-09-18 10:27:54 +08:00 |
|
pandamicro
|
870f900f6c
|
Merge pull request #1983 from pandamicro/master
Refactor Texture2D API to adopt new renderer design
|
2017-09-15 18:30:34 +08:00 |
|
Jare Guo
|
7d123e5ebd
|
Merge pull request #1985 from jareguo/master
fix DrawNode on JSB
|
2017-09-15 05:24:34 -05:00 |
|
Jare Guo
|
a35d856ad9
|
fix DrawNode on JSB
|
2017-09-15 18:22:07 +08:00 |
|
Jare Guo
|
5cb9acfb05
|
Merge pull request #1984 from knoxHuang/v1.6
add HandlerTouchEvent to CCRichText for fireball/issues/6369
|
2017-09-15 01:32:46 -05:00 |
|
knoxHuang
|
a057191a98
|
add handleTouchEvent to CCRichText for fireball/issues/6369
|
2017-09-15 14:27:09 +08:00 |
|
Jare Guo
|
8accd08c38
|
Merge pull request #1982 from jareguo/v1.6
can not set content size of RichText by using public function…
|
2017-09-14 22:18:38 -05:00 |
|
pandamicro
|
76a4219cde
|
Update JSB Texture2D APIs
|
2017-09-15 10:24:16 +08:00 |
|
pandamicro
|
b2304f267d
|
Keep old debug info
|
2017-09-15 09:46:13 +08:00 |
|
pandamicro
|
e80747963f
|
Fix unit test
|
2017-09-14 16:58:36 +08:00 |
|
pandamicro
|
51d67d80bb
|
Update Texture2D API usages
|
2017-09-14 16:19:37 +08:00 |
|
pandamicro
|
3004c91374
|
Refactor Texture2D to adopt new renderer design
|
2017-09-14 16:18:18 +08:00 |
|
pandamicro
|
36bbf37d38
|
Remove useless loadedTexturesBefore in TextureCache
|
2017-09-14 16:15:24 +08:00 |
|
Jare Guo
|
65146cc302
|
can not set content size of RichText by using public function…
|
2017-09-14 16:13:25 +08:00 |
|
pandamicro
|
947aa51961
|
Move webgl extension init into RendererWebGL
|
2017-09-14 16:12:48 +08:00 |
|
Wang Nan
|
030a35c0e0
|
Merge pull request #1979 from jareguo/v1.6
fix TypeScript def of audioengine
|
2017-09-14 15:29:08 +08:00 |
|
2youyouo2
|
17ceb14aae
|
update
|
2017-09-14 14:03:03 +08:00 |
|
Jare Guo
|
5b8e3d1e62
|
Merge pull request #1981 from knoxHuang/v1.6
update Layout api
|
2017-09-14 00:48:59 -05:00 |
|
knoxHuang
|
4ae6edd5b2
|
update Layout api
|
2017-09-14 13:38:37 +08:00 |
|
Jare Guo
|
a5af49a0e6
|
Merge pull request #1978 from feijing566/master
Add began and ended event to CCScrollview
|
2017-09-14 12:00:46 +08:00 |
|
feijing566
|
4f6227481c
|
merged event auto-scroll-ended and scroll-ended
|
2017-09-14 11:52:28 +08:00 |
|
Jare Guo
|
36eac0fbbd
|
fix TypeScript def of audioengine
|
2017-09-13 20:59:30 -05:00 |
|
feijing566
|
ceed6d9888
|
add new event describe
|
2017-09-13 15:58:26 +08:00 |
|
feijing566
|
45d15b4dfc
|
fix misstake
|
2017-09-13 15:46:06 +08:00 |
|
feijing566
|
8df33ef110
|
Add began and ended event to CCScrollview
sync from https://github.com/cocos2d/cocos2d-x/pull/18054
|
2017-09-13 15:22:41 +08:00 |
|
2youyouo2
|
ac2b3f19b5
|
Merge branch 'master' into optimize-animation
|
2017-09-13 14:43:16 +08:00 |
|
Jare Guo
|
fadae8ec4c
|
Merge pull request #1977 from pandamicro/v1.6
Fix failed to cancel callback when setting fps
|
2017-09-12 16:57:13 +08:00 |
|
pandamicro
|
0bb9be8e20
|
Improve logic
|
2017-09-12 16:55:13 +08:00 |
|
pandamicro
|
6ae6cab680
|
Fix failed to cancel callback when setting fps
|
2017-09-12 16:45:53 +08:00 |
|
Wang Nan
|
0997ee8f0c
|
Merge pull request #1975 from jareguo/master
Remove unused cc._Dictionary and cc.FontDefinition
|
2017-09-12 10:09:27 +08:00 |
|
Wang Nan
|
f48b9e5da9
|
Merge pull request #1974 from 2youyou2/v1.6
fixed tiledmap culling
|
2017-09-12 10:08:42 +08:00 |
|
Jare Guo
|
b067421962
|
remove cc.FontDefinition
|
2017-09-11 18:26:57 +08:00 |
|
Jare Guo
|
a92464ac0d
|
remove cc._Dictionary which is used by CCBReader
|
2017-09-11 18:26:50 +08:00 |
|
Jare Guo
|
fec24fe21c
|
Merge pull request #1973 from jareguo/master
fix empty node size when attached with a camera
|
2017-09-11 16:42:21 +08:00 |
|
Jare Guo
|
a7ec53882e
|
Merge pull request #1970 from knoxHuang/v1.6
fix mask clipping area does not match
|
2017-09-11 16:37:22 +08:00 |
|