Commit Graph

3489 Commits

Author SHA1 Message Date
knoxHuang bd8127aff7 optimization shader and tooltip for #fireball/issues/4771 2016-12-19 18:19:18 +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
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
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
pandamicro a09f36187b Refactor cc.loader to use url as reference key
Deprecate any external id usage, user should use uuid / url to load
Always use url as reference key, when only uuid is available, copy uuid to url
2016-12-15 12:33:19 +08:00
Jare Guo 81a90dff14 Merge pull request #1361 from pandamicro/master
fix Android browser detection issue
2016-12-14 14:06:03 +08:00
pandamicro 1a5b2ffac7 More secure browser type detection 2016-12-14 12:13:38 +08:00
pandamicro 8e8dd2007a fix Android browser detection issue 2016-12-14 11:54:51 +08:00
Jare Guo 1b5570ceac Merge pull request #1360 from VisualSJ/master
Fixed a bug about missing url
2016-12-14 11:43:05 +08:00
VisualSJ 32d2f3dad5 Fixed a bug about missing url 2016-12-14 10:33:37 +08:00
Jare Guo b9bc32823b Merge pull request #1358 from jareguo/master
support for loading the same asset from multiple packages
2016-12-13 16:44:17 +08:00
Wang Nan 565e1e9bf4 Merge pull request #1359 from knoxHuang/v1.3
fix DEVICEMOTION error for fireball/issues/4887
2016-12-13 13:59:34 +08:00
knoxHuang f0816b9ec9 fix DEVICEMOTION error for fireball/issues/4887 2016-12-13 13:50:20 +08:00
Jare Guo 31dd92280a support for loading the same asset from multiple packages 2016-12-13 11:02:53 +08:00
Jare Guo 56b97490ad Merge pull request #1355 from VisualSJ/master-loadPack
Fixed a bug about missing url
2016-12-13 10:58:43 +08:00
VisualSJ 9d83b4dc3a Fixed a bug about missing url 2016-12-13 10:49:36 +08:00
VisualSJ ff82ed04ee merge origin/master 2016-12-13 10:36:21 +08:00
Wang Nan 5338671771 Merge pull request #1353 from VisualSJ/master-4748
Loader support url param
2016-12-13 10:11:58 +08:00
VisualSJ 8e4aa4462e Fixed a bug about missing url 2016-12-13 10:11:47 +08:00
Jare Guo 4ede60d6f6 Merge pull request #1356 from jareguo/master
fix error on dev build when engine is cropped
2016-12-12 18:35:55 +08:00
Jare Guo 5ee2020124 fix error on dev build when engine is cropped 2016-12-12 18:33:30 +08:00
VisualSJ b35373c628 Fixed a bug about missing url 2016-12-12 18:05:34 +08:00
Jare Guo 320d5715e4 Merge pull request #1354 from jareguo/master
fix error on dev build when engine is cropped
2016-12-12 18:02:23 +08:00
Jare Guo 1bfdb94c09 fix error on dev build when engine is cropped 2016-12-12 18:00:11 +08:00
VisualSJ fb3cce42c1 Allow URL incoming parameters(review) 2016-12-12 13:49:16 +08:00
VisualSJ 8021e3dc05 Allow URL incoming parameters 2016-12-12 11:14:36 +08:00
Jare Guo 99d5ff6453 Merge pull request #1351 from cocos-creator/v1.3
Sync v1.3
2016-12-12 10:20:11 +08:00
Wang Nan f2f424d8a7 Merge pull request #1348 from pandamicro/v1.3
Some small bug fixes and improvements
2016-12-12 09:51:25 +08:00