Commit graph

19910 commits

Author SHA1 Message Date
Brad Hefta-Gaub
206f1ead1a Merge pull request #8990 from howard-stearns/centered-toolbar
centered toolbar
2016-11-03 14:18:32 -07:00
Brad Hefta-Gaub
c1841f9add more conservative texture memory budget 2016-11-03 14:10:07 -07:00
Ryan Huffman
413199459b Fix the name searched for in isViveControllerAvailable 2016-11-03 14:02:18 -07:00
Ryan Huffman
625c98820d Fix isSubdeviceContainingNameAvailable 2016-11-03 14:01:52 -07:00
Brad Hefta-Gaub
961e17bc48 Merge pull request #8989 from sethalves/fix-polyvox-bitrot
fix a couple of minor polyvox problems
2016-11-03 13:43:52 -07:00
Brad Hefta-Gaub
f10e43d148 Merge pull request #8992 from AndrewMeadows/fix-autoresize
fix autoresize of Entities.addEntity() and fix Quat.lookAtSimple()
2016-11-03 13:41:47 -07:00
samcake
6a39ad3b5a Prevent sparse texture on AMD gpus for now 2016-11-03 13:01:41 -07:00
howard-stearns
3a072b5bf9 tell desktop about preference changes 2016-11-03 12:17:28 -07:00
Brad Hefta-Gaub
e1837c90e2 Merge pull request #8991 from sethalves/fix-8981
fix QVector<bool> packing when number of joints isn't a multiple of 8
2016-11-03 10:59:06 -07:00
Seth Alves
339d6a55cf getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation 2016-11-03 10:06:07 -07:00
Seth Alves
1d0c3d7168 fix checker for unreasonable size of vector of bools 2016-11-03 09:47:24 -07:00
Andrew Meadows
b7c6922545 proper corner case check for Quat::lookAtSimple() 2016-11-03 09:17:22 -07:00
Andrew Meadows
cd5826e2ce load model of new entity with unknown dimensions 2016-11-03 09:03:04 -07:00
Seth Alves
cfea3cba9b guard against heap-overflow in the event of bogus entity network data 2016-11-03 06:54:11 -07:00
Seth Alves
64cb5d1b1a fix QVector<bool> packing when number of joints isn't a multiple of 8 2016-11-02 20:02:07 -07:00
Seth Alves
d0c0cdd82f polyvox corners stitch together reliably. surface-extractor dropdown in edit.js works again 2016-11-02 16:31:34 -07:00
samcake
96bdeebc37 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-11-02 12:30:45 -07:00
samcake
3c777bb079 Clenaing up the detection phase to get all the iformation from DXGI 2016-11-02 12:29:51 -07:00
humbletim
d749f243c6 revert f9747d8a (rawURL) + apply alternative approach for aligning batch-loaded script URLs 2016-11-02 14:58:50 -04:00
Seth Alves
844cc03dcb fix names of model-entity joint setters 2016-11-02 10:24:01 -07:00
Brad Hefta-Gaub
56b3ac8c89 Merge pull request #8972 from sethalves/fix-for-2159
lock around audio-client quit flag to avoid shutdown race
2016-11-02 00:14:33 -07:00
samcake
49f1590e01 Start detecting all the gpus 2016-11-01 16:51:57 -07:00
Anthony Thibault
a9c88f2383 Merge pull request #8957 from AndrewMeadows/dont-mirror-eyes
fix broken eyes in mirrored animations
2016-11-01 15:28:48 -07:00
Ryan Huffman
16d91833e8 Add optional url query to InfoView 2016-11-01 13:43:32 -07:00
Ryan Huffman
e4341d7a02 Add vive and xbox controller checking to PluginUtils 2016-11-01 13:42:37 -07:00
Ryan Huffman
ba0dbeac80 Add InputManager::getSubdeviceNames 2016-11-01 13:36:20 -07:00
Seth Alves
137730dc50 coding standard 2016-11-01 11:59:28 -07:00
Seth Alves
ae17135a07 lock around quit flag to avoid shutdown race 2016-11-01 11:14:16 -07:00
samcake
861944ba71 Try uing DXGI on windows instead of com 2016-11-01 11:12:47 -07:00
Anthony J. Thibault
09511111cf Load plugins in alphabetical order. 2016-11-01 10:23:54 -07:00
humbletim
f9747d8a44 match requested hash key url when populating batch-loaded script contents 2016-11-01 11:46:09 -04:00
samcake
d5f44befc6 Merge branch 'master' of https://github.com/highfidelity/hifi into red-backup-many-stereo-paths 2016-10-31 17:41:07 -07:00
samcake
37b3c96131 fixing the lighting problem in stereo 2016-10-31 17:40:34 -07:00
samcake
a23bbd1e4e Trying to extend the memory counter 2016-10-31 16:40:15 -07:00
Chris Collins
a49669a975 Merge pull request #8955 from sethalves/fix-obj-textures
fix obj textures
2016-10-31 11:52:25 -07:00
Chris Collins
0520aa9ad5 Merge pull request #8948 from samcake/blue
Avoid messaging for render targets generating mip maps
2016-10-31 11:09:06 -07:00
Chris Collins
dc8d0bf31c Merge pull request #8935 from zzmp/log/silence-udt-socket
group udt::Socket errors as debug logs
2016-10-31 10:31:10 -07:00
samcake
9adbb42a6c Fixing the skybox, still issues with the lights 2016-10-28 18:12:39 -07:00
Andrew Meadows
c8d4146351 don't mirror eye animations 2016-10-28 17:08:43 -07:00
Seth Alves
3ad748cfe2 Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 16:41:39 -07:00
Clément Brisset
95c175ae74 Merge pull request #8950 from huffman/tutorial/gotoentrystep
Add tutorial tracking for going through the welcome portal
2016-10-28 16:26:40 -07:00
samcake
9e91926426 fixing most of the rendering in 3D 2016-10-28 16:22:46 -07:00
Chris Collins
1ba5a5d5d7 Merge pull request #8947 from huffman/fix/script-include-race
Fix race condition in BatchLoader
2016-10-28 16:17:46 -07:00
Seth Alves
43536e0046 in C, order of argument evaluation isn't defined 2016-10-28 15:48:54 -07:00
Chris Collins
d9d9119dcb Merge pull request #8951 from zzmp/fix/crash-on-web-wasapi
fix crash on shutdown from web audio captures
2016-10-28 15:23:39 -07:00
Zach Pomerantz
be23668ca8 delete websurfaces on shutdown 2016-10-28 14:29:52 -07:00
Ryan Huffman
dd1a23ea01 Add Script.generateUUID 2016-10-28 13:42:03 -07:00
Ryan Huffman
9a99cd0ec6 Add tutorialID and tutorialVersion to tutorial progress event 2016-10-28 12:53:16 -07:00
Ryan Huffman
52c74f776c Fix race condition in BatchLoader 2016-10-28 11:40:50 -07:00
samcake
c21fe00cfc Avoid messaging for render targets 2016-10-28 11:40:10 -07:00
Seth Alves
e15043754c Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 11:36:09 -07:00
samcake
21356f860b Merge branch 'master' of https://github.com/highfidelity/hifi into red-backup-many-stereo-paths 2016-10-28 10:47:23 -07:00
samcake
d66d5af688 Enabling the uniform mappings 2016-10-28 10:47:06 -07:00
Stephen Birarda
7ddfddc567 make the socket readyRead check fire after 2s of no packets 2016-10-28 10:30:20 -07:00
Stephen Birarda
20f042a15a add slightly more information to last packet debug in Socket 2016-10-27 22:10:32 -07:00
Stephen Birarda
db7f5724f7 output last seq number and last socket before readyRead sticks 2016-10-27 21:50:29 -07:00
Brad Hefta-Gaub
97f622f003 Merge pull request #8940 from hyperlogic/bug-fix/web-engine-crash-when-swiching-domains
Fix for crash in QtWebEngineCore when rapidly switching domains
2016-10-27 20:01:31 -07:00
Anthony J. Thibault
1fc310434e Fix for crash in QtWebEngineCore when rapidly switching domains
Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
2016-10-27 18:55:24 -07:00
samcake
403bba9035 Merge branch 'master' of https://github.com/highfidelity/hifi into red-backup-many-stereo-paths 2016-10-27 17:50:02 -07:00
samcake
9d2043cc3c Porting and potentially fixing the stereo drawcall, still not perfrect ork in progress 2016-10-27 17:49:10 -07:00
Howard Stearns
d2b83b47ba Merge pull request #8936 from zzmp/clean/audio-mixer
clean audio mixer
2016-10-27 15:57:16 -07:00
Zach Pomerantz
428bb8e518 rm unused OffscreenQmlSurface const 2016-10-27 14:40:51 -07:00
Brad Davis
012e215f62 Merge pull request #8922 from ZappoMan/report45hzTarget
when vive is on i5 report a correct target frame rate so we can see that in metaverse stats
2016-10-27 14:03:07 -07:00
Zach Pomerantz
72282257bd group udt::Socket errors as debug logs 2016-10-27 13:45:58 -07:00
Brad Hefta-Gaub
bfe6ebb44f some tweaks 2016-10-27 12:04:46 -07:00
Brad Hefta-Gaub
510786bc0f Merge pull request #8923 from Atlante45/steamvr
Add getter for SteamVR's buildID to SteamClient
2016-10-27 11:38:35 -07:00
Chris Collins
e7ea30b1cc Merge pull request #8924 from huffman/fix/batch-loader-race
Fix race condition in BatchLoader
2016-10-27 11:04:24 -07:00
Seth Alves
f47aeae2a7 stop passing bare pointers to EntityTreeRenderer all around 2016-10-27 10:10:22 -07:00
Ryan Huffman
946f3782f3 Fix indentation in BatchLoader 2016-10-27 09:59:17 -07:00
samcake
5bdfceebc5 BRingin back the stereo code path 2016-10-26 18:35:47 -07:00
Stephen Birarda
4abc4adde9 add a timer to check for readyRead backup 2016-10-26 16:18:12 -07:00
Ryan Huffman
10e6157ab9 Fix race condition in BatchLoader 2016-10-26 15:16:29 -07:00
Atlante45
f26ddc6f8b Add getter for SteamVR's buildID to SteamClient 2016-10-26 14:51:48 -07:00
Chris Collins
de419c2818 Merge pull request #8912 from Atlante45/nodelist-race
Fix potential race in NodeList
2016-10-26 13:00:05 -07:00
Brad Hefta-Gaub
2fa4f53c4c Merge pull request #8915 from highfidelity/stable
Stable to master
2016-10-25 18:52:29 -07:00
Brad Davis
ce627eeea1 Updated metrics 2016-10-25 17:49:51 -07:00
Brad Davis
a9bf2a5cd3 Limit max texture size, don't force cubemaps to sparse page size 2016-10-25 17:47:42 -07:00
Brad Davis
78d55011a4 Limit sparse textures to 1 GB for now 2016-10-25 17:47:41 -07:00
Brad Davis
f26dc4dcb9 Don't rectify skybox textures 2016-10-25 17:47:40 -07:00
Brad Davis
4bb8d4e78e Force all loaded textures to sparse compatible sizes 2016-10-25 17:47:39 -07:00
Stephen Birarda
b16f5a4752 include BuildInfo for USE_STABLE_GLOBAL_SERVICES 2016-10-25 17:42:12 -07:00
Brad Hefta-Gaub
56b0995047 Merge pull request #8909 from hyperlogic/bug-fix/crash-on-exit-fix
Crash on exit fix for render items
2016-10-25 17:34:46 -07:00
Chris Collins
3b31b28622 Merge pull request #8904 from sethalves/fix-a-couple-crash-on-exits
fix a couple of crash-on-exits
2016-10-25 17:03:21 -07:00
Atlante45
384f3d9321 Fix potential race in NodeList 2016-10-25 16:58:21 -07:00
Brad Hefta-Gaub
001cfc7e15 Merge pull request #8901 from samcake/blue
Adding more detailed counters for texture memory consumption
2016-10-25 16:19:56 -07:00
Brad Hefta-Gaub
bf7d19a805 tweak format of gl_info 2016-10-25 15:48:22 -07:00
Brad Hefta-Gaub
b506e33baf add gl info and gpu free memory to user stats 2016-10-25 15:48:12 -07:00
Brad Hefta-Gaub
4aa96c9acc add location and build info to user activity stats 2016-10-25 15:48:03 -07:00
Anthony Thibault
23aa626755 Destroy render scene & engine before Application is destroyed
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.

There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal.  Also, we guard against null
scene pointer dereferences.  Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
2016-10-25 15:28:37 -07:00
Brad Hefta-Gaub
822e088240 tweak format of gl_info 2016-10-25 15:20:10 -07:00
Brad Hefta-Gaub
e22a2e9e2f add gl info and gpu free memory to user stats 2016-10-25 14:56:54 -07:00
Brad Hefta-Gaub
272055b6ee add location and build info to user activity stats 2016-10-25 14:19:44 -07:00
Seth Alves
3903a51062 fix a couple of crash-on-exits 2016-10-25 13:58:48 -07:00
samcake
133b0b38fd Fixing build issue on non win 2016-10-25 13:24:39 -07:00
samcake
c586bef452 Actually remove the multiplication of the color buffer cost by the swapchain length in the pixel SIze estimation since it doesn;t look true 2016-10-25 12:56:26 -07:00
samcake
507d3e5a39 IMprove the counting and namoing of the new couters the gl swapchain 2016-10-25 12:28:07 -07:00
Stephen Birarda
b753871fc1 don't change DF or buffer sizes for ice-server 2016-10-25 11:20:10 -07:00
Brad Hefta-Gaub
1bbf0179dd Merge pull request #8894 from ZappoMan/xboxLasers
Adds support for "lasers" to the Oculus+xbox controller
2016-10-25 09:18:00 -07:00
Brad Hefta-Gaub
da0d1f1f13 Merge pull request #8896 from ZappoMan/i5SandboxHeartbeat
actually make the RunningMarker run on a different thread
2016-10-25 08:47:06 -07:00
Brad Hefta-Gaub
4cb693315f CR feedback 2016-10-25 08:31:23 -07:00
Chris Collins
9846614468 Merge pull request #8879 from AndrewMeadows/show-physics-stats
add Bullet profile info to PerformanceTimer stats
2016-10-25 06:29:27 -07:00
sam
6b2b68e691 trying to add counters for the default FBO 2016-10-25 03:36:23 -07:00
Brad Hefta-Gaub
2c28316e39 CR feedback 2016-10-24 20:40:43 -07:00
Brad Hefta-Gaub
ed4279783d CR feedback 2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub
62f63f32a7 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 20:24:29 -07:00
Brad Hefta-Gaub
ae6022c498 actually make the RunningMarker run on a different thread 2016-10-24 18:55:25 -07:00
samcake
58b81e3b0c Adding counter for the amount of memory used in texture for Framebuffers 2016-10-24 18:34:16 -07:00
Clément Brisset
dd45500313 Merge pull request #8891 from huffman/fix/disconnected-dialog-updates
Fix several aspects of the "disconnected" dialog
2016-10-24 15:39:16 -07:00
Chris Collins
48215009c1 Merge pull request #8885 from jherico/qml_limit
4k display & QML Offscreen rendering fixes
2016-10-24 15:22:33 -07:00
Brad Hefta-Gaub
779f326452 cleanup 2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
a25d50387e gak 2016-10-24 14:47:10 -07:00
Ryan Huffman
e0c109d6ca Simplify ConnectionMonitor to only rely on domainConnectionRefused instead of authRequired 2016-10-24 14:45:41 -07:00
Brad Davis
7900fd3e18 New texture memory scheme 2016-10-24 13:10:41 -07:00
Brad Davis
da9eb0433c Remove workaround for QML HDPI offscreen rendering bug 2016-10-24 11:51:40 -07:00
Ryan Huffman
5b58e8ae97 Fix ConnectionHandler not handling connected-but-need-auth condition 2016-10-24 10:44:33 -07:00
Brad Hefta-Gaub
0f8967970a Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546 more work on extra lasers 2016-10-24 07:46:04 -07:00
Ryan Huffman
b5881146df Merge pull request #8878 from zzmp/fix/half-sec-audio-crash
reduce sound from crashed avatars
2016-10-23 20:38:35 -07:00
Brad Davis
861b69aa94 Add free GPU memory to the displayed stats 2016-10-23 13:07:38 -07:00
Brad Davis
7879bf37f2 Fix typo in comment 2016-10-22 18:12:40 -07:00
Brad Davis
b572fb2a91 Only use sparse texture memory for the memory pressure calculation (since that's all we can modify) 2016-10-22 14:49:10 -07:00
Brad Davis
62de2af944 Add more GPU stats, make stats easier to read 2016-10-22 14:38:46 -07:00
Brad Hefta-Gaub
ee1f3ac38c Merge pull request #8881 from jherico/offscreen_texture_memory_stats
Report offscreen texture memory usage in stats
2016-10-21 19:15:59 -07:00
Ryan Downe Karpf
f5a116fc92 Merge pull request #8880 from hyperlogic/feature/controller-display
Show hand controllers in away.js
2016-10-21 17:43:52 -07:00
Brad Davis
e9ac110072 Correct mip calculation 2016-10-21 17:05:56 -07:00
Zach Pomerantz
3bea1069f2 fix unit conversion for audio fade factor 2016-10-21 16:10:33 -07:00
David Kelly
bdcb58bf8b Merge pull request #8847 from sethalves/fix-audio-mixer-data-race-1
fix some data-races in logging system
2016-10-21 15:33:40 -07:00
Anthony J. Thibault
c431c69d60 Merge branch 'master' into feature/controller-display 2016-10-21 13:48:07 -07:00
Andrew Meadows
e44672180a add Bullet profile info to PerformanceTimer stats 2016-10-21 13:22:22 -07:00
Brad Davis
1bd398ae5e Report offscreen texture memory usage in stats 2016-10-21 11:31:37 -07:00
Chris Collins
8481d0baa5 Merge pull request #8872 from birarda/master
always go to dev welcome when not using stable services
2016-10-21 06:16:26 -07:00
Anthony J. Thibault
2193c5faad Integrated controller display from tutorial scripts + assets 2016-10-20 18:24:58 -07:00
Brad Hefta-Gaub
6279b273fc Merge pull request #8867 from jherico/offscreen_textures
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
2016-10-20 17:07:29 -07:00
Philip Rosedale
8c5dd1170e Merge pull request #8871 from howard-stearns/fix-system-hand-laser-flicker
fix flicker in system (inside the hud) hand-lasers.
2016-10-20 16:53:57 -07:00
Clément Brisset
b63eb6ba9f Merge pull request #8665 from zzmp/feat/audio-stats
move audio stats to QML/JS, with graphs
2016-10-20 16:43:49 -07:00
Stephen Birarda
5886996bc3 always go to dev-welcome when not using stable services 2016-10-20 16:29:40 -07:00
howard-stearns
0141110805 fix flicker in system (inside the hud) hand-lasers. 2016-10-20 15:42:19 -07:00
Brad Davis
c27ee634ea Fix debug compile issues 2016-10-20 13:56:01 -07:00
Brad Davis
9523660027 Fix offscreen QML texture leak, improve texture sharing for same size surfaces 2016-10-20 11:55:25 -07:00
Seth Alves
b31acc421a fix crash on startup 2016-10-20 10:36:14 -07:00
Seth Alves
8ac799ddaf Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1 2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0
Fix some audio mixer data races
2016-10-20 10:01:26 -07:00
Brad Hefta-Gaub
1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers
Conflicts:
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub
6109f41ae2 Merge pull request #8859 from Atlante45/seq-num-race
Fix sequence number race condition
2016-10-20 08:26:31 -07:00
Brad Hefta-Gaub
4a6101060c Merge pull request #8862 from zzmp/fix/quick-leak
fix leak from qml surfaces' render controls
2016-10-20 08:23:28 -07:00
Brad Hefta-Gaub
bf732127ca Merge pull request #8856 from jherico/geometry_ids
Remove the use of implicit ids in geometry cache
2016-10-20 08:14:49 -07:00
Brad Hefta-Gaub
9bfc8502f1 Merge pull request #8863 from zzmp/fix/quick-crash
fix intermittent crash on teleport from contextless Qt connection
2016-10-19 22:22:51 -07:00
Brad Hefta-Gaub
9008de72e0 Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments
Adjustment to position and visibility of grab sphere.
2016-10-19 21:51:02 -07:00
Brad Hefta-Gaub
00d613a60e Merge pull request #8848 from sethalves/quiet-compiler
quiet warnings in Linux build
2016-10-19 17:41:19 -07:00
Brad Hefta-Gaub
9cb0c973de Merge pull request #8849 from zzmp/fix/shapekey-ref
fix invalid ShapeKey ref
2016-10-19 17:39:06 -07:00
Anthony J. Thibault
55c062098a Adjustment to position and visibility of grab sphere.
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
2016-10-19 17:33:05 -07:00
Zach Pomerantz
02b4c43cff delete _renderControl after use 2016-10-19 17:09:29 -07:00
Zach Pomerantz
df51646307 add ctx to qml surface cxs 2016-10-19 16:56:13 -07:00
Anthony J. Thibault
bcd31e3d99 Adjust size and offset of grab balls to better align with hand controllers.
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
2016-10-19 15:59:26 -07:00
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
Atlante45
bc8554fd90 Fix sequence number race condition 2016-10-19 13:31:00 -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
eb8f67b612 cleanup asset file regex, comment in renameMapping 2016-10-19 11:47:57 -07:00
Brad Davis
2705ee7030 Remove the use of implicit ids in geometry cache 2016-10-19 11:18:25 -07:00
Stephen Birarda
7aac2e6916 restrict asset file mapping operations to file path 2016-10-19 10:57:23 -07:00
Brad Hefta-Gaub
6bd193cdd8 hacking 2016-10-18 21:33:37 -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
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
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
22e0e649b1 add a comment for ack count calculations 2016-10-18 16:16:09 -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
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
Stephen Birarda
0a7d799abf don't double set _lastACK in TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
fdcface8cb use enum in PacketHeaders, coding standard fixes in Connection 2016-10-18 15:54:25 -07:00
Stephen Birarda
e7c0ed035f remove SendQueue fast re-transmit debug 2016-10-18 15:54:25 -07:00
Stephen Birarda
6d69a0dc71 push version for asset packets to mismatch for TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
af969231e7 remove some extra lines 2016-10-18 15:54:25 -07:00
Stephen Birarda
54b28e646a remove congestion window halving on reno dupe loss 2016-10-18 15:54:25 -07:00
Stephen Birarda
ec51f01c59 remove debugs from TCPVegasCC 2016-10-18 15:54:25 -07:00
Stephen Birarda
a075bb6b1c slow down new UDT debug for asset-server tests 2016-10-18 15:54:25 -07:00
Stephen Birarda
b03bb6b73f halve the congestion window on 3rd duplicate ACK 2016-10-18 15:54:25 -07:00
Stephen Birarda
b74a967c95 fix an additional reference to preAIWindowSize 2016-10-18 15:54:25 -07:00
Stephen Birarda
d05e3e1dd6 drop CWS to 2 if reno fast re-transmit is hit 2016-10-18 15:54:25 -07:00
Stephen Birarda
64a0239248 add reno fallback for fast re-transmit 2016-10-18 15:54:25 -07:00
Stephen Birarda
0b2e0a4167 initial re-implementation of reno cong avoid 2016-10-18 15:54:25 -07:00