Commit Graph

3515 Commits

Author SHA1 Message Date
Jare Guo a093f4b41c Merge pull request #1386 from pandamicro/master
Fix getReferenceKey issue and fix loadResDir no result issue
2016-12-22 11:06:17 +08:00
pandamicro 2040a82eb1 Revert changes to CCAssetLibrary 2016-12-22 11:03:35 +08:00
pandamicro a94c1499cc Fix getReferenceKey issue and fix loadResDir no result issue 2016-12-22 10:36:20 +08:00
Nan Wang 3d9ef3eff8 merged 2016-12-21 14:37:20 +08:00
Wang Nan ad5859eba6 Merge pull request #1374 from knoxHuang/master
fix dirty rectangle black border for #fireball/issues/3819
2016-12-21 14:33:07 +08:00
Wang Nan 721f1e1116 Merge pull request #1378 from natural-law/issue2351
Support mesh rendering of Spine.
2016-12-21 14:32:56 +08:00
Jare Guo 11f5e3d6a9 Merge pull request #1381 from pandamicro/master
Fix loader load subAsset with the same url issue
2016-12-21 12:51:25 +08:00
pandamicro 3723be228c Remove isRawAsset 2016-12-21 12:04:00 +08:00
pandamicro 181d6b32a3 Fix loader load subAsset with the same url issue 2016-12-21 11:12:16 +08:00
Jare Guo cd30a29efe Merge pull request #1380 from knoxHuang/v1.4
optimization shader and tooltip for #fireball/issues/4771
2016-12-20 18:40:19 +08:00
knoxHuang a7a199fc7a update shader code 2016-12-20 18:36:47 +08:00
Jare Guo 2c309d2668 Merge pull request #1379 from knoxHuang/v1.4fix_bug
fix widget bug for fireball/issues/4878
2016-12-20 15:19:33 +08:00
knoxHuang 44dd1b9c41 fix widget bug for fireball/issues/4878 2016-12-20 15:18:06 +08:00
zhangbin 2e6a711cc7 Solve the reviewed issue. 2016-12-20 10:48:39 +08:00
zhangbin df47b8251b Solve the error when using setMix of spine component. 2016-12-20 10:44:02 +08:00
Nan Wang 1719ccfeed Merge branch 'v1.3' of github.com:cocos-creator/engine into v1.3 2016-12-20 09:32:46 +08:00
Nan Wang fa8cae5c2d update version to 1.3.3 2016-12-20 09:32:19 +08:00
knoxHuang bd8127aff7 optimization shader and tooltip for #fireball/issues/4771 2016-12-19 18:19:18 +08:00
zhangbin 61c963fb1c Merge branch 'master' into issue2351
# Conflicts:
#	extensions/spine/SkeletonData.js
2016-12-19 15:16:13 +08:00
zhangbin 0b80dc12a6 Solve the error when increasing the index buffer of custom renderer command. 2016-12-19 15:04:29 +08:00
Jare Guo 26d657fffc Merge pull request #1376 from jareguo/master
should not use LoadingItems.create to download package
2016-12-19 12:21:07 +08:00
Jare Guo 48e594ffed should not use LoadingItems.create to download package 2016-12-19 11:52:04 +08:00
Jare Guo fb65f2f048 Merge pull request #1375 from knoxHuang/v1.3
fix pageview bug for fireball/issues/4926
2016-12-19 11:09:56 +08:00
knoxHuang e746ac276b fix pageview bug for fireball/issues/4926 2016-12-19 11:06:48 +08:00
zhangbin 07da328d27 Support mesh in spine renderer. 2016-12-19 10:36:55 +08:00
knoxHuang 2d9d114e7c fix dirty rectangle black border for #fireball/issues/3819 2016-12-16 18:03:06 +08:00
Wang Nan 5aaee5681a Merge pull request #1373 from cocos-creator/v1.3
merge V1.3
2016-12-16 14:02:24 +08:00
Wang Nan 36fe3f3b1d Merge pull request #1363 from knoxHuang/v1.3
fix Mask error for #fireball/issues/4897
2016-12-16 14:01:40 +08:00
knoxHuang 30d56d3d30 update Mask for #fireball/issues/4897 2016-12-16 13:28:02 +08:00
Jare Guo 31491ec28a Merge pull request #1372 from pandamicro/master
Avoid texture binding error under https protocol
2016-12-16 11:56:13 +08:00
pandamicro daece36469 Avoid texture binding error under https protocol 2016-12-16 11:36:47 +08:00
pandamicro 75c5cef073 Merge pull request #1371 from jareguo/master
update downloadImage
2016-12-16 11:34:17 +08:00
Nan Wang 52b1a7658c fix merge conflict of CCLoader getReferenceKey 2016-12-16 10:53:37 +08:00
Jare Guo e709e026c1 update downloadImage 2016-12-16 10:52:16 +08:00
Nan Wang f346884bbc refine logging arguments display 2016-12-16 10:43:19 +08:00
Nan Wang f4000f011b refine CCDebugger log functions 2016-12-16 09:50:38 +08:00
pandamicro df360173d4 Merge pull request #1369 from jareguo/master
fix infinity error if image blocked by CORS policy
2016-12-16 09:47:31 +08:00
Jare Guo e40388cc60 fix infinity error if image blocked by CORS policy 2016-12-15 22:36:18 +08:00
zhangbin 77a10bb1d5 Update the spine runtime to version 3.x. 2016-12-15 18:19:21 +08:00
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
pandamicro 4ac830a3df Merge pull request #1366 from jareguo/master
fix memory leak about capturing event
2016-12-15 17:02:48 +08:00
Jare Guo 48a1b97fac Merge pull request #1367 from pandamicro/master
Fix loader issues
2016-12-15 17:02:01 +08:00
pandamicro 01d199a76d Add warning for using id in resources item 2016-12-15 16:58:34 +08:00
Jare Guo c510da8965 fix memory leak about capturing event 2016-12-15 16:57:54 +08:00
pandamicro cf6440dbe2 Fix pack downloader uuid issue 2016-12-15 16:49:17 +08:00
pandamicro 70335a82f4 Fix getResWithUrl issue 2016-12-15 16:32:52 +08:00
Jare Guo 1ab6972dca Merge pull request #1365 from knoxHuang/v1.3_fixBug
fix load webp error for fireball/issues/4904
2016-12-15 15:23:09 +08:00
knoxHuang 2f854f6cf6 fix load webp error for fireball/issues/4904 2016-12-15 15:16:28 +08:00
Wang Nan d470b9d652 Merge pull request #1364 from pandamicro/master
Always use url as reference key in cc.loader
2016-12-15 13:46:52 +08:00
pandamicro 2b0f5f2925 Fix lazy loading asset couldn’t be auto released issue 2016-12-15 12:33:19 +08:00