Commit graph

48769 commits

Author SHA1 Message Date
Chris Collins
b9b90cc646 Merge pull request #9047 from jherico/stutter
Add stutter tracking
2016-11-11 11:39:00 -08:00
Ryan Huffman
d522d03bd2 Add repeated message suppression to request assignment packets 2016-11-11 11:29:52 -08:00
David Kelly
96f6cb7ae4 whitespace 2016-11-11 11:24:06 -08:00
David Kelly
3d7e075897 Added mute to mod.js script 2016-11-11 11:18:24 -08:00
howard-stearns
e2fded846f make hand-controller ui work in third person 2016-11-11 11:10:42 -08:00
Ryan Huffman
969cbf4cb0 Update domain server subnet whitelist description 2016-11-11 10:46:40 -08:00
Ryan Huffman
bd1bcaf1a4 Clean up subnet whitelist implementation 2016-11-11 10:38:56 -08:00
Ryan Huffman
d691aa3302 Update naming for subnet whitelist in ds 2016-11-11 10:32:45 -08:00
Ryan Huffman
e1466c0d47 Fix NULL -> nullptr 2016-11-11 10:21:58 -08:00
Ryan Huffman
ca6a74d63d Add whitelist filtering to assignment requests 2016-11-11 10:19:53 -08:00
Ryan Huffman
63cfbf55ca Add ip address whitelist processing to domain server 2016-11-11 10:19:21 -08:00
Ryan Huffman
edb8d14507 Add ac address whitelist to domain server settings 2016-11-11 10:18:16 -08:00
Brad Davis
162f24decd Add stutter tracking for Oculus 2016-11-11 10:12:41 -08:00
David Kelly
9c8f22e0e7 straight to audio mixer
since we can get the canKick there too.  (doh)
2016-11-11 09:30:58 -08:00
Seth Alves
db99295989 Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-11 06:40:31 -08:00
Seth Alves
15c247fc5e quiet warnings 2016-11-11 06:37:22 -08:00
Seth Alves
899dec8b10 Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by 2016-11-11 06:11:49 -08:00
Seth Alves
5629db9109 Merge pull request #9049 from birarda/max-min-av-scale
add a min/max avatar scale in domain-server settings
2016-11-11 06:11:02 -08:00
Brad Hefta-Gaub
13b19171e7 Merge pull request #9046 from jherico/steam_i5_enable
Change minimum cores to 3 to enable OpenVR
2016-11-10 18:51:16 -08:00
Brad Hefta-Gaub
a90a0fe8ba Merge pull request #8976 from druiz17/FixMenuOutOfView
Fixed menu out of view with HMD and Xbox controller
2016-11-10 18:49:34 -08:00
samcake
00addcad9e Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-10 17:57:34 -08:00
samcake
1d3fc1b647 Fix a bad conversion to integer for negative values of the GRid COordinates 2016-11-10 17:57:11 -08:00
Brad Hefta-Gaub
f55b660820 Merge pull request #9033 from huffman/fix/usersjs-hide-show-laser
Fix users.js maximize button unclickable with hand controllers
2016-11-10 17:53:17 -08:00
Brad Hefta-Gaub
6db3556dc5 Merge pull request #9048 from howard-stearns/disable-viewpoint-menus-in-hmd
Disable viewpoint menus in hmd
2016-11-10 17:52:50 -08:00
David Kelly
186451fcbe Merge pull request #9027 from samcake/green
Fix crashes in OpenGLVersionChecker
2016-11-10 17:22:29 -08:00
David Kelly
80d4033767 oops forgot one thing... 2016-11-10 17:13:50 -08:00
Seth Alves
576eed9941 use a mutex to avoid a smaller race 2016-11-10 17:12:06 -08:00
Stephen Birarda
7f46714645 drop the incorrect scale from domain settings 2016-11-10 16:53:56 -08:00
Stephen Birarda
020942c826 better handling for a flipped min/max scale 2016-11-10 16:50:36 -08:00
David Kelly
285520dff7 Initial cut
No script work yet, just first stab at underpinnings
2016-11-10 16:24:35 -08:00
Stephen Birarda
88c63332de protect flipped min/max scale in avatar mixer settings 2016-11-10 16:21:48 -08:00
Seth Alves
aef39ce6fa block until follow-on includes are finished but still avoid multiple evaluation of included urls 2016-11-10 16:06:53 -08:00
Brad Davis
16060d50af Merge pull request #9041 from jherico/disable_incremental
Remove incremental texture transfers
2016-11-10 15:43:20 -08:00
Stephen Birarda
f14037979a fix a typo in help text for minimum scale 2016-11-10 15:31:23 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Stephen Birarda
272d0c845e add clarifying comments about target scale changes 2016-11-10 15:25:15 -08:00
howard-stearns
b20d4a4b03 Merge branch 'master' of https://github.com/highfidelity/hifi into disable-viewpoint-menus-in-hmd 2016-11-10 15:15:51 -08:00
howard-stearns
8299e23cc3 diable some viewpoint menu options when in hmd. 2016-11-10 15:15:11 -08:00
Stephen Birarda
d5722c1654 fix clamping of scale and DRY it up 2016-11-10 15:03:13 -08:00
howard-stearns
4d18a3cc3d expose menu enablement to javascript 2016-11-10 15:01:06 -08:00
Stephen Birarda
53769f4edf change scale for avatar if domain limited scale changes 2016-11-10 14:58:04 -08:00
Stephen Birarda
9fdde49d14 clamp target scale changes on both ends 2016-11-10 14:54:42 -08:00
Stephen Birarda
6f442a74b1 request settings from agents and debug results 2016-11-10 14:43:15 -08:00
Stephen Birarda
64d9fa0f39 clamp avatar scale to domain limit in avatar mixer 2016-11-10 14:19:32 -08:00
Philip Rosedale
c0b1392685 Merge branch 'master' of git://github.com/highfidelity/hifi into drifting 2016-11-10 13:41:13 -08:00
Chris Collins
5b91c8f32b Merge pull request #8984 from sethalves/fix-setLocalJointRotation-name
fix names of model-entity joint setters
2016-11-10 13:39:14 -08:00
Stephen Birarda
77ede81fc9 limit MyAvatar scale to limits from domain settings 2016-11-10 13:27:13 -08:00
Brad Davis
c7d68aa9cf Add stutter stat logging 2016-11-10 13:15:35 -08:00
Brad Davis
90f55f0cd5 Add stutter tracking 2016-11-10 11:56:38 -08:00
Chris Collins
cd0416b5e9 Merge pull request #9039 from humbletim/fix-users-online-interactions
Disable Users Online interactions while window is hidden.
2016-11-10 10:37:13 -08:00