Commit graph

202 commits

Author SHA1 Message Date
Atlante45
329a76d4d6 Fix unix warning 2019-04-23 14:54:12 -07:00
Atlante45
3605b3d560 Patch interface redirect code 2019-04-23 14:54:12 -07:00
SamGondelman
884a64bfa6 fix resource crash 2019-03-01 15:50:50 -08:00
SamGondelman
44e70db4cd WE DID IT FOLKS 2019-02-19 15:02:36 -08:00
sabrina-shanman
bb123cfe3b Fix GLTF materials 2019-02-15 14:51:29 -08:00
SamGondelman
9e002c59d4 fix pal 2019-02-13 15:24:55 -08:00
SamGondelman
9193704173 trying to get hashes working 2019-02-06 11:47:38 -08:00
SamGondelman
3ee448a89a fix scattering and working on resource cache bug 2019-02-05 17:32:15 -08:00
Jeff Clinton
6c90d7ed11
Merge pull request #14343 from ElderOrb/FB19514
FB19514 - Interface crashes on attempt to apply new animation url via…
2018-11-13 14:59:50 -08:00
Roxanne Skelly
762033580d And remove another url log item. 2018-11-12 13:48:08 -08:00
Roxanne Skelly
7a14cb1bbc Remove additional url logging message. 2018-11-12 13:36:14 -08:00
Zach Fox
811b01816b CR round 3 2018-11-08 10:41:31 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Zach Fox
48d3450c5a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-07 14:59:23 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations.
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
2018-11-06 16:24:32 -08:00
SamGondelman
1444b3a186 resource mutex issues
(cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e)
(cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)
2018-11-06 11:57:57 -08:00
Alexander Ivash
cdfa38d4dd FB19514 - Interface crashes on attempt to apply new animation url via AvatarApp 2018-11-04 19:16:43 +05:30
Zach Fox
d1556ae4e8 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-23 15:51:34 -07:00
Kerry Ivan Kurian
3cf000a71b
Merge pull request #14232 from kkurian/log-resource-requests-2
Display resource-access events in marketplace item tester
2018-10-23 15:18:30 -07:00
SamGondelman
78f0afd39f fix crash on shutdown 2018-10-23 12:13:41 -07:00
Kerry Ivan Kurian
a2a6acd45c Improve code formatting 2018-10-22 14:04:59 -07:00
Zach Fox
493262052c Remove extraneous code changes; remove QUrlAncestry code; remove extra logging 2018-10-22 13:59:52 -07:00
Zach Fox
2a9e0041b2 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-18 10:16:07 -07:00
Kerry Ivan Kurian
89a5da80e0 Do not display incomplete metadata 2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
Zach Fox
7de784ce27 First steps (definitely not working) 2018-10-10 12:32:55 -07:00
SamGondelman
4024f2a180 fix various resourcecache bugs 2018-10-04 11:29:22 -07:00
David Rowe
baf88ab508 Revise scriptable resource caches' interfaces 2018-07-26 16:12:16 +12:00
David Rowe
16e06de9cd Move scriptable caches into scripting interfaces
Removed non-working getResource() API functions.
2018-07-25 22:10:14 +12:00
SamGondelman
5ac7ced306 cleanup renderable model entity item, fix crash on reload, fix different transparent bug 2018-06-13 17:14:52 -07:00
SamGondelman
1470170296 lock weak resource 2018-05-31 11:54:37 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking
Add support for client texture selection
2018-05-04 16:14:43 -07:00
Ryan Huffman
697fde4a1a Cleanup meta texture related changes 2018-05-02 13:31:32 -07:00
Oren Hurvitz
26ffb3213c Changed "[[gnu::fallthrough]]" to "// FALLTHRU" 2018-05-02 07:06:47 +01:00
Ryan Huffman
24ac342c6b Add support for client texture selection 2018-05-01 14:11:31 -07:00
Oren Hurvitz
a226790295 Eliminated warnings in gcc
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
2018-04-30 15:05:27 +03:00
SamGondelman
78d72a1703 remove unnecessary invokeMethod from ResourceCache::getResource 2018-01-25 16:07:26 -08:00
Ryan Huffman
5950006111 Remove extraneous logging 2017-09-19 11:18:25 -07:00
Ryan Huffman
e9258ec97a Fix loading standalone baked textures from Asset Server
NetworkTexture was not properly handling redirected ATP files. For
instance, if going from .jpg -> .ktx, the NetworkTexture class needs to
be aware of this so it can stop the current request and make multiple
requests for the individual mip levels.
2017-08-28 15:54:40 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
Dante Ruiz
68fa426da9 set file url as higher priority 2017-07-14 18:17:13 +01:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Ryan Huffman
0263021c0c Fix loaded being reset to false for KTX resources 2017-05-03 11:26:52 -07:00
ZappoMan
bc2f893294 format and spelling changes 2017-04-26 21:47:54 -07:00
ZappoMan
c0df82ff69 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 18:49:24 -07:00
Ryan Huffman
1555fc3088 Update Resource to only clear load priorities if successful 2017-04-26 11:37:48 -07:00
Ryan Huffman
01724c9c90 Update default load priority to be 0 2017-04-26 11:37:47 -07:00