Commit Graph

3825 Commits

Author SHA1 Message Date
pandamicro d54555fee0 Remove useless checking 2017-03-16 16:40:18 +08:00
pandamicro 0eb172f377 Fix version detection issue on mobile qq 2017-03-16 16:39:40 +08:00
pandamicro d761c97172 Improve API doc 2017-03-16 16:39:22 +08:00
pandamicro 30aae83351 Fix repeatly setFrameRate(30) issue 2017-03-16 16:38:46 +08:00
pandamicro 133fe73563 Fix package name 2017-03-16 16:38:20 +08:00
pandamicro 4ed743263a Reviewed 2017-03-12 15:25:36 +08:00
pandamicro fce4f2ccca Remove useless debug setting 2017-03-12 15:25:36 +08:00
pandamicro 34cd3c30b7 Remove arguments usage in jsb 2017-03-12 15:25:36 +08:00
pandamicro d741ec638d Use Uglify harmony instead of Uglify 2017-03-12 15:25:36 +08:00
Jare Guo 9f8a2c7463 Merge pull request #1544 from zilongshanren/fixBMFontSpaceingX
only set spacingX when label is bmfont
2017-03-10 14:24:44 +08:00
zilongshanren 4e1bd339aa only set spacingX when label is bmfont 2017-03-10 14:10:37 +08:00
Wang Nan c8aa295940 Merge pull request #1543 from zilongshanren/fixBMFontSpaceingX
fix jsb bmfont spacing X
2017-03-10 14:09:41 +08:00
zilongshanren 3b45a3f73d fix jsb bmfont spacing X 2017-03-10 14:07:31 +08:00
Wang Nan a403d9f0d9 Merge pull request #1541 from pandamicro/v1.4
Fix Editbox adaptation issues on some browser
2017-03-10 11:00:27 +08:00
pandamicro 27ac8b1d4e Fix Editbox adaptation issues on some browser 2017-03-09 16:12:19 +08:00
Jare Guo f2c05a0d35 Merge pull request #1535 from 2youyou2/animation
optimize animation by cache wrapped info
2017-03-08 17:59:38 +08:00
2youyouo2 0541d90554 optimize animation with cache wrapped info 2017-03-08 17:41:47 +08:00
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
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
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
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 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