Commit graph

57166 commits

Author SHA1 Message Date
Andrew Meadows
4fad9d9b1a Merge pull request #10858 from jherico/trace_cores
Additional threaded tracing of CPU cores
2017-07-06 08:23:21 -07:00
David Kelly
936c21e849 remove unnecessary cacheDir member 2017-07-06 07:24:58 -07:00
Brad Davis
d91516c630 Merge pull request #10894 from jherico/acclient_fix
Fix ACClient on Linux
2017-07-05 18:26:15 -07:00
utkarshgautamnyu
9d2fe8da9c Update DomainServer.cpp 2017-07-05 18:02:44 -07:00
Atlante45
9a1d38384d Remove unecessary loops 2017-07-05 17:43:09 -07:00
Atlante45
20a633eb89 Check struct sizes at compile time 2017-07-05 17:42:59 -07:00
Seth Alves
98ac2ccb90 rearrange code so authed connection works better 2017-07-05 17:36:25 -07:00
Seth Alves
f7131027e0 if user has provided login credentials, wait for the keypair to be ready before proceeding 2017-07-05 17:26:15 -07:00
Zach Fox
8c36e5c69f Merge pull request #10893 from zfox23/spectatorCamera_instructions
Spectator Camera preview instructions
2017-07-05 17:23:17 -07:00
Seth Alves
c058a166d4 Merge pull request #10888 from jherico/overlay_crashes
Trying to fix overlay crashes again
2017-07-05 17:16:53 -07:00
Atlante45
95abbd0ad4 Prevent Interface from trying to send packets bigger than an MTU 2017-07-05 17:08:04 -07:00
Seth Alves
d62b0ffb3b Merge branch 'acclient_fix' of github.com:jherico/hifi into atp-client 2017-07-05 17:03:16 -07:00
David Kelly
4a22fbca1b redo cache switch 2017-07-05 17:01:31 -07:00
utkarshgautamnyu
8c96d00f14 Update DomainServerSettingsManager.cpp 2017-07-05 16:59:47 -07:00
utkarshgautamnyu
9b7a561c28 Update describe-settings.json 2017-07-05 16:56:21 -07:00
Brad Davis
2409c83d5d Fix ACClient on Linux 2017-07-05 16:53:42 -07:00
Dante Ruiz
6c15dffb9d added new glyph 2017-07-06 00:45:59 +01:00
Atlante45
7e9ce5a58b Don't overflow during AvatarData::toByteArray 2017-07-05 16:15:18 -07:00
Zach Fox
39bdc20b4f On checkbox language change 2017-07-05 16:13:36 -07:00
Seth Alves
3916e3ec61 Merge branch 'master' of github.com:highfidelity/hifi into atp-client 2017-07-05 15:50:57 -07:00
Seth Alves
55b7c2d767 avoid doing a lot of work during mouse-move event-handlers 2017-07-05 15:50:05 -07:00
Chris Collins
d6ecad34f4 Merge pull request #10885 from highfidelity/RC-46-HOTFIX
Build 46.1 Hotfix: Fixing the bug appearing on NVidia driver 384.76
2017-07-05 15:10:43 -07:00
Zach Fox
f6583a1b87 Use correct text color for checkboxes 2017-07-05 14:46:59 -07:00
Zach Fox
0af53bb4a5 Instructions and cool static :) 2017-07-05 14:46:59 -07:00
Zach Fox
aea5779ed6 When a display texture isn't set, show preview instructions 2017-07-05 14:46:58 -07:00
David Kelly
8c0697f26b Merge pull request #10882 from davidkelly/dk/spectatorCameraPreview
render issue fixes
2017-07-05 14:46:16 -07:00
utkarshgautamnyu
f824290a4c Update describe-settings.json 2017-07-05 14:38:06 -07:00
utkarshgautamnyu
25773fcf5a Update describe-settings.json 2017-07-05 14:36:17 -07:00
utkarshgautamnyu
872751bb16 Update describe-settings.json 2017-07-05 14:30:48 -07:00
Brad Davis
7f1bc07d04 Trying to fix overlay crashes again 2017-07-05 14:30:01 -07:00
utkarshgautamnyu
c069c13ebb Update DomainServerSettingsManager.cpp 2017-07-05 14:12:18 -07:00
utkarshgautamnyu
1385ef80a7 Update DomainServerSettingsManager.cpp 2017-07-05 13:56:40 -07:00
utkarshgautamnyu
7b79e8c41e Update describe-settings.json 2017-07-05 13:53:04 -07:00
Sam Gateau
7c55370f26 Fixing the bug appearing on Nvidia 284.76 2017-07-05 13:49:08 -07:00
Zach Fox
64a443ee0d Merge pull request #10883 from zfox23/snapshots_TweakShareButton
Tweak the Snapshot 'Share' button to make its purpose more clear
2017-07-05 13:27:51 -07:00
David Kelly
89c05244bf remove unnecessary extra update() calls 2017-07-05 13:24:31 -07:00
Zach Fox
6f2e7f5b83 Tweak the Snapshot 'Share' button to make its purpose more clear 2017-07-05 12:39:15 -07:00
Dante Ruiz
07d098b95b coding standard fix 2017-07-05 19:45:52 +01:00
David Kelly
85813ac908 render issue fixes 2017-07-05 11:29:34 -07:00
Seth Alves
d917878638 fix whitespace 2017-07-05 11:29:09 -07:00
Seth Alves
ab340530b8 don't do a lot of processing during the mouse-move event handler 2017-07-05 11:27:13 -07:00
Dante Ruiz
275f48b65a another requested change made 2017-07-05 19:22:19 +01:00
Seth Alves
b147c3a843 Merge branch 'master' of github.com:highfidelity/hifi into atp-client 2017-07-05 11:07:51 -07:00
Dante Ruiz
e567cf0196 made requested changes 2017-07-05 19:04:34 +01:00
Brad Davis
1bcfe1eaba Merge pull request #10880 from samcake/hobbes
Fixing the bug appearing on Nvidia 384.76
2017-07-05 10:56:03 -07:00
Dante Ruiz
27a9880eff removed double add of head offset 2017-07-05 18:34:33 +01:00
Dante Ruiz
b86a8b8338 Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop 2017-07-05 18:27:33 +01:00
Dante Ruiz
691b59ffff remove debug statments 2017-07-05 18:26:58 +01:00
Zach Fox
44cb48b17d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-05 09:59:57 -07:00
Sam Gateau
48b4b5f49c Fixing the bug appearing on Nvidia 284.76 2017-07-05 18:39:09 +02:00