Commit graph

47783 commits

Author SHA1 Message Date
Ryan Huffman
9dee1b85fe Merge pull request #8855 from birarda/blank-asset-delete
force valid file path for asset file mapping operations
2016-10-19 14:22:26 -07:00
David Kelly
5b7f0cb358 Fix for sandbox startup issue
Move determinedSandboxState=true until after we spawn it.
2016-10-19 13:51:20 -07:00
Atlante45
bc8554fd90 Fix sequence number race condition 2016-10-19 13:31:00 -07:00
Ryan Huffman
f42683cf8b Update users.js to be minimizable when logged out, and by default 2016-10-19 13:19:29 -07:00
Stephen Birarda
e3f194b4dd use the err directly on upload error 2016-10-19 12:41:01 -07:00
Howard Stearns
3f4ca27e76 Merge pull request #8839 from howard-stearns/unit-scaled-address-bar
Unit scaled address bar
2016-10-19 12:31:00 -07:00
howard-stearns
69a1415873 specify avatar skeleton 2016-10-19 12:29:18 -07:00
Brad Hefta-Gaub
aa50f460c3 Merge pull request #8851 from jherico/qml_limit
Rate limit QML web surfaces
2016-10-19 12:04:47 -07:00
Stephen Birarda
179cb67cdb change order of asset upload failure changes 2016-10-19 11:55:54 -07:00
Stephen Birarda
eb8f67b612 cleanup asset file regex, comment in renameMapping 2016-10-19 11:47:57 -07:00
Stephen Birarda
b80f3fbd7b fix error handling for failed asset upload 2016-10-19 11:37:35 -07:00
howard-stearns
36951c3c95 colors 2016-10-19 11:24:21 -07:00
Brad Davis
2705ee7030 Remove the use of implicit ids in geometry cache 2016-10-19 11:18:25 -07:00
howard-stearns
a5fc0d92a2 Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar 2016-10-19 11:11:05 -07:00
Stephen Birarda
7aac2e6916 restrict asset file mapping operations to file path 2016-10-19 10:57:23 -07:00
Seth Alves
e247f0aa34 Merge pull request #8850 from zzmp/fix/model-attachment-lifetime
ensure model attachment lifetimes
2016-10-19 09:56:02 -07:00
Seth Alves
7e4964db3e Merge pull request #8684 from Menithal/controller-grab-unequip
Fixed HandcontrollerGrab distance unequip
2016-10-19 09:53:04 -07:00
Brad Hefta-Gaub
6bd193cdd8 hacking 2016-10-18 21:33:37 -07:00
Seth Alves
d0e1a69cc3 Merge pull request #8853 from birarda/web-engine-interceptor
move HFWebEngineProfile to interface/networking
2016-10-18 20:28:58 -07:00
Stephen Birarda
18523558f7 move HFWebEngineProfile back to interface/networking 2016-10-18 20:04:11 -07:00
Brad Davis
61e5e2861e Rate limit QML web surfaces 2016-10-18 19:29:11 -07:00
Zach Pomerantz
a9bad592f9 ensure model attachment lifetimes 2016-10-18 18:01:18 -07:00
Zach Pomerantz
cf82cc3f50 fix invalid ShapeKey ref 2016-10-18 17:59:30 -07:00
Seth Alves
b936252609 quiet compiler 2016-10-18 17:56:57 -07:00
Seth Alves
2e73330e8e quiet warnings in Linux build 2016-10-18 17:47:47 -07:00
Howard Stearns
20ed77d425 Merge pull request #8840 from Atlante45/keyboard
Add virtual keyboard for steam username collision
2016-10-18 17:34:55 -07:00
Seth Alves
a801f27c7c Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-1 2016-10-18 17:34:22 -07:00
Seth Alves
72998b190c Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-0 2016-10-18 17:33:57 -07:00
Stephen Birarda
9f2627d31d Merge pull request #8828 from birarda/web-engine-interceptor
move HF access token to authorization header
2016-10-18 17:24:58 -07:00
Stephen Birarda
7a1fb8dd4f Merge pull request #8677 from birarda/vegas-baby
Vegas
2016-10-18 16:44:30 -07:00
Stephen Birarda
22e0e649b1 add a comment for ack count calculations 2016-10-18 16:16:09 -07:00
Seth Alves
10907d9fb9 Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1 2016-10-18 16:02:34 -07:00
Stephen Birarda
5bd6cc9fac fix comparison for reno slow start 2016-10-18 16:01:35 -07:00
Seth Alves
af5be8d1d9 reduce data-races in logging 2016-10-18 15:59:00 -07:00
Stephen Birarda
ddce913095 cleanup math for leftover ACKs 2016-10-18 15:54:25 -07:00
Stephen Birarda
214d2e4c91 break slow start on vegas timeout loss 2016-10-18 15:54:25 -07:00
Stephen Birarda
71de9701e0 add some additional comments to reno congestion avoidance 2016-10-18 15:54:25 -07:00
Stephen Birarda
974cccf519 cleanup initialization of min RTT member variables 2016-10-18 15:54:25 -07:00
Stephen Birarda
b817e72976 comment clarity and readability improvements 2016-10-18 15:54:25 -07:00
Stephen Birarda
d5a450ad30 add comment about Jacobson's formula for RTT estimation 2016-10-18 15:54:25 -07:00
Stephen Birarda
1041443796 use __FUNCTION__ and clearup zero us RTT comment 2016-10-18 15:54:25 -07:00
Stephen Birarda
13c38760b3 switch to wireSize, use time only, remove double public 2016-10-18 15:54:25 -07:00
Stephen Birarda
7567cff590 fix comment for ACK interval of 1 2016-10-18 15:54:25 -07:00
Stephen Birarda
41d48b12bd add a comment clearing up onACK return 2016-10-18 15:54:25 -07:00
Stephen Birarda
3c7bcf1127 remove the max bandwidth option from DS settings while broken 2016-10-18 15:54:25 -07:00
Stephen Birarda
7480d1e45d switch default hifi address back to welcome 2016-10-18 15:54:25 -07:00
Stephen Birarda
9407efbbc5 protect against an overflow in TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
7ef596a9f0 use ova-welcome for default hifi address 2016-10-18 15:54:25 -07:00
Stephen Birarda
ef660722cd force duplicated sends to use highest RTT, not lowest 2016-10-18 15:54:25 -07:00
Stephen Birarda
d15cb6171d fix bubble up of duplicated packet info 2016-10-18 15:54:25 -07:00