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
|
f48b9e5da9
|
Merge pull request #1974 from 2youyou2/v1.6
fixed tiledmap culling
|
2017-09-12 10:08:42 +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 |
|
knoxHuang
|
f076f9f575
|
fix mask clipping area does not match
|
2017-09-11 16:33:54 +08:00 |
|
2youyouo2
|
f0a6ad3cee
|
remove rotation check from tiledmap culling
|
2017-09-11 14:46:53 +08:00 |
|
2youyouo2
|
19d0b45dc9
|
fixed tiledmap culling
|
2017-09-11 14:45:41 +08:00 |
|
Jare Guo
|
e2a0690161
|
Merge pull request #1967 from knoxHuang/v1.6
Fix the EditBox type for numeric access. Invalid focus (FireFox) for …
|
2017-09-07 22:32:36 +08:00 |
|
knoxHuang
|
c20ac057b7
|
update TIMER_NAME to DELAY_TIME
|
2017-09-07 22:24:30 +08:00 |
|
knoxHuang
|
1d421ddc2d
|
Fix the EditBox type for numeric access. Invalid focus (FireFox) for fireball/issues/6357
|
2017-09-07 21:07:17 +08:00 |
|
Wang Nan
|
e492aa0ee6
|
Merge pull request #1964 from jareguo/v1.6
persistRootNodes should be reset while restart
|
2017-09-07 17:15:16 +08:00 |
|
Jare Guo
|
35aafc115b
|
Merge pull request #1965 from pandamicro/v1.6
Fix nested sequence with repeat being considered as reversed issue
|
2017-09-07 14:48:05 +08:00 |
|
pandamicro
|
890fd59eda
|
Fix nested sequence with repeat being considered as reversed issue
|
2017-09-07 14:41:20 +08:00 |
|
Jare Guo
|
bb63d5231d
|
persistRootNodes should be reset while restart
|
2017-09-06 21:27:25 +08:00 |
|
Jare Guo
|
f195fbba7e
|
Merge pull request #1958 from 2youyou2/v1.6
fixed node hit test with camera
|
2017-09-06 11:58:15 +08:00 |
|
2youyouo2
|
a48688e8c7
|
fixed node hit test with camera
|
2017-09-06 11:42:38 +08:00 |
|
Wang Nan
|
eb394d297d
|
Merge pull request #1955 from jareguo/v1.6
should not emit ‘size-changed’ directly
|
2017-09-06 11:15:31 +08:00 |
|
Jare Guo
|
68c33484c7
|
fix api doc
|
2017-09-05 22:52:07 +08:00 |
|
pandamicro
|
06011baeb8
|
remove empty error handler
|
2017-09-05 20:43:58 +08:00 |
|
Jare Guo
|
4220d4b142
|
should not emit ‘size-changed’ directly
|
2017-09-02 21:45:56 +08:00 |
|
Wang Nan
|
751dfa9582
|
Merge pull request #1951 from jareguo/v1.6
fix cc.Director api for TypeScript
|
2017-09-01 15:35:43 +08:00 |
|
Jare Guo
|
96afe621de
|
fix cc.Director api for TypeScript
|
2017-09-01 15:20:58 +08:00 |
|
Jare Guo
|
0eaa6e3ddd
|
Merge pull request #1946 from jareguo/v1.6
should not enumerate getter values while creating ccclass in TypeScript
|
2017-08-31 01:07:42 +08:00 |
|
Jare Guo
|
813c44e319
|
should not enumerate getter values while creating ccclass in TypeScript
|
2017-08-31 00:52:38 +08:00 |
|
Jare Guo
|
ceda2e72fc
|
Merge pull request #1944 from 2youyou2/v1.6
fixed camera api doc
|
2017-08-30 13:38:27 +08:00 |
|
2youyouo2
|
7f27102435
|
fixed camera api doc
|
2017-08-30 11:59:21 +08:00 |
|
Jare Guo
|
f544414129
|
Merge pull request #1943 from VisualSJ/v1.6-audio-touch
Fixed a bug about remove touchPlayList
|
2017-08-30 10:56:20 +08:00 |
|
VisualSJ
|
f303bb4c57
|
Fixed a bug about remove touchPlayList
|
2017-08-30 10:39:46 +08:00 |
|
Jare Guo
|
bc6af3f527
|
Merge pull request #1941 from 2youyou2/v1.6
should ignore animation playOnLoad if already play an animation
|
2017-08-29 18:19:08 +08:00 |
|
2youyouo2
|
a6b42859fc
|
refine code
|
2017-08-29 18:08:07 +08:00 |
|
2youyouo2
|
6bc0ff1cae
|
should ignore animation playOnLoad if already play an animation
|
2017-08-29 17:58:07 +08:00 |
|
Jare Guo
|
6b7cd8d1a2
|
Merge pull request #1938 from jareguo/v1.6
adjust uglifyjs for jsc
|
2017-08-29 11:26:30 +08:00 |
|
Jare Guo
|
d1bd919104
|
fix conflict
|
2017-08-29 11:11:53 +08:00 |
|
Jare Guo
|
7929bb9c09
|
adjust uglifyjs for jsc
|
2017-08-28 15:58:12 +08:00 |
|
Wang Nan
|
9da82bc4e8
|
Merge pull request #1935 from jareguo/v1.6
fix memory leaks of DragonBones on native
|
2017-08-28 10:07:52 +08:00 |
|
Wang Nan
|
ff593f9854
|
Merge pull request #1929 from VisualSJ/v1.6-audio
Can't cancel all events (audio engine)
|
2017-08-28 10:07:06 +08:00 |
|
Jare Guo
|
760a379aa3
|
fix memory leaks of dragonbones on native
|
2017-08-25 21:44:55 +08:00 |
|
Jare Guo
|
268a9d59e3
|
Merge pull request #1934 from knoxHuang/v1.6
add Layout and Widget warn for fireball/issues/6308
|
2017-08-25 13:55:33 +08:00 |
|
knoxHuang
|
af627d3bd1
|
add Layout and Widget warn for fireball/issues/6308
|
2017-08-25 13:52:21 +08:00 |
|
Jare Guo
|
c18bedc215
|
Merge pull request #1933 from knoxHuang/v1.6
add _updateLayout API for CCLayout
|
2017-08-25 11:17:36 +08:00 |
|
knoxHuang
|
c4c2a7b569
|
refine api
|
2017-08-25 11:11:23 +08:00 |
|
knoxHuang
|
840c9f4b11
|
add _updateLayout API for CCLayout
|
2017-08-25 10:54:09 +08:00 |
|
Wang Nan
|
53ce5edc1f
|
Merge pull request #1928 from VisualSJ/v1.6-loader
Loading-items 注销的问题
|
2017-08-24 17:31:46 +08:00 |
|
Jare Guo
|
545d31ab9d
|
Merge pull request #1930 from pandamicro/v1.6
fix sort bug in Scale9Sprite data pool
|
2017-08-24 17:23:12 +08:00 |
|
pandamicro
|
f34aa90803
|
Use static function
|
2017-08-24 17:19:25 +08:00 |
|
pandamicro
|
475ea35b0c
|
fix sort bug in Scale9Sprite data pool
|
2017-08-24 17:15:23 +08:00 |
|
VisualSJ
|
fc79b39141
|
Can't cancel all events (audio engine)
|
2017-08-24 14:26:10 +08:00 |
|
VisualSJ
|
3d787f028e
|
Must be destroy loading-items
|
2017-08-24 13:38:23 +08:00 |
|
Jare Guo
|
b0f311ec0b
|
Merge pull request #1926 from jareguo/v1.6
optimize prefab instantiation for the first time (+1 squashed commit)
|
2017-08-24 11:53:15 +08:00 |
|