Jare Guo
|
0cbbbc9321
|
Merge pull request #1537 from zilongshanren/fix-bmfont-spacingX-loading
fix BMFont spacingX
|
2017-03-08 09:38:44 +08:00 |
|
zilongshanren
|
4a31d4bcac
|
fix BMFont spacingX
|
2017-03-07 18:54:31 +08:00 |
|
Nan Wang
|
915c9a23a2
|
use lower case for decorator
|
2017-03-07 17:54:27 +08:00 |
|
Wang Nan
|
c43f57c005
|
Merge pull request #1533 from pandamicro/v1.4
Fix adaptation issue in iframe nested game
|
2017-03-07 14:07:49 +08:00 |
|
pandamicro
|
310cf2a9ca
|
Improve doc for FIX_ARTIFACTS_BY_STRECHING_TEXEL
|
2017-03-07 11:20:07 +08:00 |
|
pandamicro
|
6dc195acc2
|
Fix adaptation issue in iframe nested game
|
2017-03-07 11:07:10 +08:00 |
|
pandamicro
|
7108626d67
|
remove unimplemented cc.game.onEnd
|
2017-03-07 11:07:10 +08:00 |
|
Jare Guo
|
9fce1b96f9
|
Merge pull request #1495 from pandamicro/artifacts
Activate FIX_ARTIFACTS_BY_STRECHING_TEXEL by default
|
2017-03-06 20:56:34 +08:00 |
|
Jare Guo
|
e53ceb8f37
|
Merge pull request #1531 from natural-law/issue4980
Init the event listeners when the sgNode of spine is re-created.
|
2017-03-06 20:34:09 +08:00 |
|
Wang Nan
|
b39ff528bb
|
Merge pull request #1532 from pandamicro/v1.4
Fix cc.macro.REPEAT_FOREVER usage issue
|
2017-03-06 16:22:37 +08:00 |
|
pandamicro
|
901fee770a
|
Fix cc.macro.REPEAT_FOREVER usage issue
|
2017-03-06 16:10:32 +08:00 |
|
pandamicro
|
2c009b0cd8
|
Merge pull request #1530 from pandamicro/v1.4
Fix has keyboard event detection issue in native
|
2017-03-06 16:09:49 +08:00 |
|
zhangbin
|
ea2d9af39b
|
Init the event listeners when the sgNode of spine is re-created.
|
2017-03-06 12:01:54 +08:00 |
|
pandamicro
|
190ae77297
|
Fix has keyboard event detection issue in native
|
2017-03-05 13:48:10 +08:00 |
|
Nan Wang
|
f06678020b
|
update decorator to add reset function
|
2017-03-03 18:56:52 +08:00 |
|
Nan Wang
|
8ecf4bbf04
|
add es6 helper for typescript
|
2017-03-03 18:11:13 +08:00 |
|
Jare Guo
|
a5b5df2484
|
Merge pull request #1529 from natural-law/issue5344
Fix that playTimes parameter of playAnimation is no effect sometimes.
|
2017-03-03 13:31:31 +08:00 |
|
zhangbin
|
71ea7572a0
|
Fix that playTimes parameter of playAnimation is no effect sometimes.
|
2017-03-03 12:06:44 +08:00 |
|
Nan Wang
|
3ac4c75c1e
|
add typescript class, add decorator for typescript
|
2017-03-02 18:39:13 +08:00 |
|
Jare Guo
|
454671046b
|
Merge pull request #1528 from 2youyou2/playOnLoad
add _playedOnLoad for CCAnimation
|
2017-03-02 17:01:53 +08:00 |
|
2youyouo2
|
4c62bd89fe
|
playOnLoad should work in start
|
2017-03-02 16:54:45 +08:00 |
|
2youyouo2
|
a624733058
|
add _playedOnLoad for CCAnimation
|
2017-03-02 15:46:36 +08:00 |
|
Jare Guo
|
cbe953bb30
|
Merge commit '6c45b902f8ee1451b8cb343019c943a1c07a8caa' into temp2
|
2017-03-02 14:31:54 +08:00 |
|
Jare Guo
|
1f0b5503f0
|
Merge commit 'aaa2ac73b9dc0b05bf3d1b05342d10676e0ad432' into temp2
# Conflicts:
# cocos2d/core/platform/CCClass.js
# cocos2d/core/platform/CCView.js
# cocos2d/core/platform/_CCClass.js
# jsb/jsb-director.js
|
2017-03-02 14:30:09 +08:00 |
|
Wang Nan
|
aaa2ac73b9
|
Merge pull request #1525 from jareguo/v1.4
fix property shorthand about Raw Asset
|
2017-03-02 10:47:37 +08:00 |
|
Jare Guo
|
6c45b902f8
|
Merge pull request #1526 from jareguo/temp2
minor fix
|
2017-03-01 14:07:27 +08:00 |
|
Jare Guo
|
c43c5262aa
|
minor fix (+1 squashed commit)
Squashed commits:
[c91748a] minor fix
|
2017-03-01 14:02:54 +08:00 |
|
Jare Guo
|
38eecf3e03
|
fix property shorthand about Raw Asset
|
2017-03-01 13:49:27 +08:00 |
|
pandamicro
|
189ee8fafd
|
Merge pull request #1521 from pandamicro/v1.4
Fix JSB memory growth issue
|
2017-02-26 23:04:33 +08:00 |
|
pandamicro
|
4b72f35e97
|
Fix JSB memory leak caused by Event dispatching
|
2017-02-24 18:38:05 +08:00 |
|
pandamicro
|
a9ab402766
|
Merge part of cocos/scripting/js-bindings/scripts to engine/jsb
|
2017-02-24 17:41:57 +08:00 |
|
pandamicro
|
1f8049a59a
|
Fix macro usage issue in graphics webgl cmd
|
2017-02-24 17:38:08 +08:00 |
|
Jare Guo
|
9d4c73b601
|
Merge pull request #1520 from pandamicro/v1.4
Fix clear color issue
|
2017-02-24 17:28:53 +08:00 |
|
pandamicro
|
14aee7d8c8
|
Fix clear color issue
|
2017-02-24 17:25:47 +08:00 |
|
Nan Wang
|
36f1c9f174
|
update version to 1.4.1-beta.1
|
2017-02-24 15:37:06 +08:00 |
|
Wang Nan
|
5d28bd9123
|
Merge pull request #1519 from cocos-creator/v1.4-mahjong
merge V1.4 mahjong
|
2017-02-24 15:34:01 +08:00 |
|
Wang Nan
|
3633761463
|
Merge pull request #1510 from jareguo/v1.4
fix warning of getRes
|
2017-02-24 15:30:23 +08:00 |
|
pandamicro
|
126f98e65d
|
Merge pull request #1518 from pandamicro/v1.4
Fix cc.sequence crash issue on web
|
2017-02-24 12:01:12 +08:00 |
|
pandamicro
|
f82839bee3
|
Fix cc.sequence crash issue on web
|
2017-02-24 00:14:14 +08:00 |
|
Jare Guo
|
92c2cc6a1b
|
Merge pull request #1517 from pandamicro/v1.4
Fix setFrameRate(30) may cause frame rate augment issue
|
2017-02-23 10:47:36 +08:00 |
|
pandamicro
|
05256dae00
|
Fix setFrameRate(30) may cause frame rate augment issue
|
2017-02-23 10:44:36 +08:00 |
|
pandamicro
|
eeed517192
|
Merge pull request #1516 from pandamicro/v1.4
Sync panda v1.4
|
2017-02-23 10:43:05 +08:00 |
|
pandamicro
|
4edf763347
|
Merge pull request #1514 from pandamicro/v1.4
Use state stack instead of gl.getParameter to register stencil states
|
2017-02-23 10:41:47 +08:00 |
|
pandamicro
|
5f7a790ac7
|
Remove Stack, use _currentState
|
2017-02-23 10:39:07 +08:00 |
|
Jare Guo
|
ad5bb5a22d
|
Merge pull request #1515 from natural-law/hot-fix
Improve the implementation of the Spine event callback.
|
2017-02-22 18:08:01 +08:00 |
|
zhangbin
|
ebb5f5f60a
|
Improve the implementation of the Spine event callback.
|
2017-02-22 18:04:58 +08:00 |
|
Jare Guo
|
0cf4b8c808
|
Merge pull request #1512 from VisualSJ/v1.4-5265
#5265 _div need updateVisibility
|
2017-02-22 17:44:23 +08:00 |
|
pandamicro
|
f0647d884d
|
Use state stack instead of gl.getParameter to register stencil states
|
2017-02-22 17:23:05 +08:00 |
|
Jare Guo
|
2ae81e55d0
|
Merge pull request #1513 from pandamicro/v1.4
Fix raw asset not set when using url to load
|
2017-02-22 12:41:24 +08:00 |
|
pandamicro
|
85712817fd
|
Fix raw asset not set when using url to load
|
2017-02-22 12:09:04 +08:00 |
|