Commit graph

3203 commits

Author SHA1 Message Date
Seth Alves
6623028d71 ball-and-socket constraint 2017-04-29 08:35:55 -07:00
Seth Alves
9e7ef83bd1 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4 2017-04-29 07:01:44 -07:00
Stephen Birarda
fed747a545 Merge pull request #10325 from huffman/atp-range-caching
Fix for stuck ATP downloads
2017-04-28 16:54:21 -07:00
Ryan Huffman
89fb0a917b Fix poorly indented if in AssetRequest 2017-04-28 16:27:44 -07:00
Ryan Huffman
765a061086 Fix stuck ATP downloads
Occasionally ATP requests would get stuck because of a race inside
AssetClient::handleAssetReply. This was more likely to happen to small
resources.
2017-04-28 16:26:03 -07:00
Stephen Birarda
c518aa55be Merge pull request #10312 from birarda/upload-new-models-to-entity
add an entity file replacement via domain-server content page
2017-04-28 16:06:05 -07:00
Stephen Birarda
b44a56db80 don't save ATP requests to cache if they are range requests 2017-04-28 10:32:06 -07:00
Stephen Birarda
a21a34a4a4 add entities file replacement to DS and ES 2017-04-27 16:56:27 -07:00
Seth Alves
68b59e4601 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux 2017-04-27 07:56:49 -07:00
Seth Alves
b196dd082b expose bullet slider constraint to javascript 2017-04-27 07:56:35 -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
ZappoMan
834a447d62 remove debugging code 2017-04-26 18:36:44 -07:00
Ryan Huffman
ac0a738945 Merge pull request #10261 from Atlante45/feat/progressive-load-ktx
Add progressive load for KTX textures
2017-04-26 18:36:01 -07:00
ZappoMan
a26dca73b1 more logging 2017-04-26 18:02:09 -07:00
Ryan Huffman
f5b7feccde Update AssetClient/Request to use const byteRange 2017-04-26 18:01:56 -07:00
ZappoMan
3de92121e0 more logging 2017-04-26 15:28:10 -07:00
Andrew Meadows
08972da843 remove unused Node::_isAlive cruft 2017-04-26 12:47:56 -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
Ryan Huffman
4f16eb9bcc Cleanup KTX logging and add fragment to resource url to indicate mip level 2017-04-26 11:32:35 -07:00
Atlante45
043c587395 Fix byte range for file resource requests 2017-04-26 10:49:23 -07:00
Atlante45
8269e01474 Fix atp-get compile error 2017-04-26 10:49:23 -07:00
Stephen Birarda
3928e11611 fix valid byte range check and send asset from 0 2017-04-26 10:48:57 -07:00
Stephen Birarda
814970c4e2 cleanup invalid byte range handling 2017-04-26 10:48:57 -07:00
Stephen Birarda
fab1bdaeb7 push asset server packet versions for range requests 2017-04-26 10:48:57 -07:00
Stephen Birarda
7ae8c741c5 pass the byte range to asset client from AssetResourceRequest 2017-04-26 10:48:57 -07:00
Stephen Birarda
229a481232 add byte range handling to FileResourceRequest 2017-04-26 10:48:57 -07:00
Stephen Birarda
397a29039e add support for byte range requests to ATP 2017-04-26 10:48:57 -07:00
Ryan Huffman
8d03d50d35 Cleanup progressive ktx debugging 2017-04-26 10:48:57 -07:00
Ryan Huffman
4e58341631 Remove http proxy 2017-04-26 10:48:24 -07:00
Ryan Huffman
18fb695614 Disable pipelining in HTTPResourceRequest 2017-04-26 10:48:24 -07:00
Ryan Huffman
ce12a216c0 I think it might be working. 2017-04-26 10:48:24 -07:00
Ryan Huffman
70b816827e Improve handling of KTX downloads in NetworkTexture 2017-04-26 10:48:24 -07:00
Ryan Huffman
11751611e1 Update NetworkTexture to track current KTX download state 2017-04-26 10:48:23 -07:00
Ryan Huffman
39c3fee838 Add caching of imageOffset to ktx ImageDescriptor 2017-04-26 10:47:32 -07:00
Ryan Huffman
cf3dc12542 Add object labels to GL objects and add ktx min mip kv 2017-04-26 10:47:32 -07:00
Ryan Huffman
b20fcbfcdb Add a way to write data to a storage object 2017-04-26 10:45:50 -07:00
Ryan Huffman
ccd9c4697b Add extended ktx header/high-mip request handling to NetworkTexture 2017-04-26 10:45:50 -07:00
Ryan Huffman
1fec531c68 Add basic mip writing to gpu::Texture 2017-04-26 10:45:50 -07:00
Ryan Huffman
00cbfa0f70 Add start of progressive ktx-loading 2017-04-26 10:45:50 -07:00
Ryan Huffman
105d17e85e Add byte range support to HTTPResourceRequest 2017-04-26 10:45:14 -07:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
2017-04-26 13:24:18 +12:00
ZappoMan
90cdeb9582 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 16:09:59 -07:00
Andrew Meadows
157dc1475b Merge pull request #10281 from birarda/bug/session-refresh-login
force DS to use new node ID if connect is re-sent
2017-04-25 15:02:57 -07:00
Stephen Birarda
c00dfcc7d7 send the domain disconnect packet before UUID is cleared 2017-04-25 14:32:21 -07:00
David Rowe
c05954ee4b Add logAction() method to UserActivityLogger JavaScript API 2017-04-25 13:40:57 +12:00
ZappoMan
d179135a87 remove dead code 2017-04-24 18:21:22 -07:00
ZappoMan
95a3e0a092 fix whitespace 2017-04-24 18:06:33 -07:00
ZappoMan
c9aad6b762 new approach to the tpose fix, as well as other improvements 2017-04-24 17:36:05 -07:00