Skip to content

Commit 13c9e93

Browse files
committed
Merge remote-tracking branch 'ntrrgc/develop' into patches
2 parents f8ff9ee + be1b084 commit 13c9e93

File tree

236 files changed

+23027
-13216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+23027
-13216
lines changed

Diff for: AUTHORS.txt

+26-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
Cocos2d-html5 authors
22

3-
(ordered by the join in time)
3+
(Ordered by join time)
44

55
Core Developers:
66

77
Shun Lin (Sean Lin)
88

9-
Hao Wu (WuHao)
10-
11-
Dingping Lv (David Lv)
12-
139
Ricardo Quesada
1410

1511
Huabin LING (@pandamicro)
1612

1713
Sijie Wang (@VisualSJ)
1814

19-
Jialong Zhai (@JoshuaAstray)
15+
Long Jiang (@jianglong0156)
16+
17+
Menghe Zhang (@ZhangMenghe)
2018

2119
Contributors:
2220
Name GithubID Main contribution
@@ -165,6 +163,7 @@ erykwalder @erykwalder Function.prototype.bind bug fix
165163

166164
ZippoLag @ZippoLag cc.Application.getCurrentLanguage bug fix
167165
typo fix
166+
Fixed `cc.TMXObjectGroup#objectNamed` not returning the result bug
168167

169168
Asano @LaercioAsano cc.Node bug fix
170169

@@ -178,6 +177,8 @@ Mykyta Usikov @musikov cc.ClippingNode bugs fix
178177
cc.Scale9Sprite bugs fix
179178
cc.RenderTexture bug fix
180179
cc.ParticleSystem bug fix
180+
Made CCProgressTimerCanvasRenderCmd to properly show colorized sprites
181+
cc.ScrollView and cc.TableView: added check for parent visibility in onTouchBegan method
181182

182183
Han XiaoLong @kpkhxlgy0 cc.ParticleSytem bug fix
183184

@@ -243,6 +244,8 @@ Dany Ellement @DEllement cc.FontDefinition & ccui.RichText improvemen
243244
IShm @IShm cc.Screen bug fix
244245
cc.ParticleSystem bug fix
245246
ccui.PageView bug fix
247+
Fixed crash when character not found into BMP font
248+
Fixed restoring of sprite's color issue
246249

247250
Thomas Jablonski @thomas-jablonski cc.audioEngine bug fix
248251
Cocostudio typo fix
@@ -255,11 +258,28 @@ feijing566 @feijing566 cc.Audio bug fix
255258

256259
RackovychV @RackovychV Fixed a bug of `cc.Scheduler`'s `pauseAllTargetsWithMinPriority`
257260

261+
giuseppelt @giuseppelt Fixed TransitionSlideX callback sequence issue
262+
263+
YShumov @pixmaster Fixed issue in music end event
264+
265+
SPACELAN @spacelan Fixed `inverse` function bug of `cc.math.Matrix4`
266+
267+
patriciog @patriciog Allowed timeline animations with only one frame
268+
269+
Ningxin Hu @huningxin SIMD.js optimization for kazmath functions
270+
271+
Zachary Lester @ZLester Fix typo in AUTHORS.txt
272+
273+
Juan Carlos @Ruluk Fixed a bug where not resetting cc.Audio._ignoreEnded when replaying a sound caused it to stay in a "playing" state
258274

275+
Maxim Litvinov @metalim Throw new Error object instead of error message string
259276

260277
Retired Core Developers:
261278
Shengxiang Chen (Nero Chan)
262279
Xingsen Ma
280+
Jialong Zhai (@JoshuaAstray)
281+
Hao Wu (WuHao)
282+
Dingping Lv (David Lv)
263283

264284
Cocos2d-x and cocos2d-html5 can not grow so fast without the active community.
265285

0 commit comments

Comments
 (0)