Commit graph

48202 commits

Author SHA1 Message Date
Atlante45
2f2da8ccd3 Do not read launchClientNowState if client disabled 2016-11-16 13:15:10 -08:00
Atlante45
9e0230980b Enable Server Only install 2016-11-16 10:52:30 -08:00
Atlante45
d7d54dd82f Only launch interface if selected 2016-11-16 10:44:59 -08:00
Brad Hefta-Gaub
01b2a893be Merge pull request #9078 from davidkelly/dk/2263
Logging to help find audio device issue
2016-11-16 08:25:55 -08:00
Brad Hefta-Gaub
84573d373b Merge pull request #9070 from huffman/fix/docs
Add jsdoc to Camera
2016-11-15 13:46:16 -08:00
Ryan Huffman
936ff5e0be Merge pull request #9076 from birarda/domain-agent-guard
guard patched agents asking for other agents in domain-server
2016-11-15 13:01:49 -08:00
David Kelly
40914d9790 Logging to help find audio device issue
We sometimes show duplicate devices in Audio > Devices menu.  But
I cannot reproduce it, so maybe best thing is log timing and contents
of input and output device arrays, to try to run down where the issue
is.
2016-11-15 12:58:51 -08:00
Stephen Birarda
39afb24982 explictly remove Agent from NIS for other Agents 2016-11-15 10:37:19 -08:00
Brad Hefta-Gaub
fe9e97346f Merge pull request #9051 from sethalves/fix-include-race
block scripts until follow-on includes are finished but still avoid multiple evaluation of included urls
2016-11-15 10:21:24 -08:00
Stephen Birarda
1791a1c1fe never send agents to other agents 2016-11-15 10:15:17 -08:00
Seth Alves
d73fc1681c Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-15 09:11:06 -08:00
Seth Alves
bc9b29bd71 Merge branch 'fix-include-race' of github.com:sethalves/hifi into fix-include-race 2016-11-15 09:10:56 -08:00
Brad Hefta-Gaub
0cd70e90c7 Merge pull request #9075 from ZappoMan/fixMacOpenGL
fix for mac min openGL version
2016-11-15 09:01:02 -08:00
Brad Hefta-Gaub
2200e32ba3 Merge pull request #9073 from ZappoMan/fixOculusWithOpenVR
disable threaded reprojection when running oculus in OpenVR
2016-11-15 08:27:54 -08:00
Brad Hefta-Gaub
5dd33c8dce fix for mac min openGL version 2016-11-14 20:58:09 -08:00
Brad Hefta-Gaub
86430e4121 Merge pull request #8960 from samcake/red-backup-many-stereo-paths
Introduce Instanced Stereo Drawcall
2016-11-14 18:30:42 -08:00
Ryan Huffman
5fd1ae64b0 Begin adding entities jsdoc 2016-11-14 16:54:55 -08:00
Brad Hefta-Gaub
3a68f48cd7 disable threaded reprojection when running oculus in OpenVR 2016-11-14 16:30:18 -08:00
Chris Collins
786d09795b Merge pull request #9066 from birarda/ignored-ignore-ignoree
don't send audio/avatar data for ignoree to ignored node
2016-11-14 14:02:51 -08:00
Ryan Huffman
3fcc2d3fa5 Add jsdoc to Clipboard 2016-11-14 13:52:16 -08:00
Ryan Huffman
7e2bb0e5ed Cleanup camera docs 2016-11-14 13:51:51 -08:00
Brad Hefta-Gaub
5272a9b460 Merge pull request #9069 from Atlante45/blast-screen
Fix Blast screen typos
2016-11-14 13:10:50 -08:00
Ryan Huffman
ec86b82079 Add jsdoc to Camera 2016-11-14 12:14:24 -08:00
Atlante45
f8be4227d9 Fix Blast screen typos 2016-11-14 12:06:25 -08:00
Stephen Birarda
dadcaa9959 don't send audio/avatar data for ignoree to ignored node 2016-11-14 10:12:36 -08:00
Seth Alves
28d1b5430d Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-14 10:12:24 -08:00
Seth Alves
43b73f0380 Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-14 10:00:46 -08:00
Chris Collins
e599e13809 Merge pull request #9063 from sethalves/fix-some-crash-on-exits
Fix some crash on exits
2016-11-14 09:20:03 -08:00
Brad Hefta-Gaub
cc6d68ffdf Merge pull request #8973 from humbletim/fix-batched-script-keys
Use matching hash keys for input/output when batch-loading scripts.
2016-11-14 08:13:32 -08:00
Brad Hefta-Gaub
dd23fcc0c9 Merge pull request #9008 from hyperlogic/feature/debug-draw-marker-color
Add color support to debug draw marker rendering
2016-11-14 08:12:57 -08:00
Brad Hefta-Gaub
b0fc17cbb9 Merge pull request #9060 from sethalves/fix-plugins-work-with-asan
fix Linux plugins when using address-sanitizer
2016-11-14 08:12:38 -08:00
Chris Collins
3d5a178a1d Merge pull request #9064 from birarda/mod-overlay-cleanup
fix kick and mute overlay cleanup
2016-11-13 16:15:18 -08:00
Seth Alves
92e24e6ded code review 2016-11-13 16:09:57 -08:00
Seth Alves
7a160ce5e8 try, try again 2016-11-13 13:39:31 -08:00
Seth Alves
645134e4b0 try, try again 2016-11-13 13:26:15 -08:00
Seth Alves
da83fd9fa4 try, try again 2016-11-13 12:56:16 -08:00
Stephen Birarda
212d518109 use for loop for kick and mute overlay cleanup 2016-11-13 12:17:12 -08:00
Seth Alves
946dc256f0 try, try again 2016-11-13 12:15:35 -08:00
Seth Alves
359f05426c try, try again 2016-11-13 12:14:48 -08:00
Seth Alves
45bcf626aa try, try again 2016-11-13 11:48:49 -08:00
Seth Alves
f8fb5b9709 avoid some more static/global QStrings in plugins 2016-11-13 11:29:19 -08:00
Seth Alves
9b4a8427e6 global/static QString 2016-11-13 11:09:27 -08:00
Seth Alves
9868ddd602 global/static QStrings in plugins appear to cause crashes during shutdown 2016-11-13 10:22:14 -08:00
Seth Alves
804f25740d these qDebugs happen too late and cause a crash 2016-11-13 10:21:27 -08:00
Seth Alves
5133ce0548 print a debug message when skipping evaluation of a previously included url 2016-11-12 10:50:21 -08:00
Seth Alves
92836caf57 when creating plugins on Linux with memory-debugging enabled, use asan flags such that the shared libraries can be loaded 2016-11-12 10:01:29 -08:00
Seth Alves
55d894bd6f Merge branch 'master' of github.com:highfidelity/hifi into fix-include-race 2016-11-12 07:38:07 -08:00
Chris Collins
0876dbc809 Merge pull request #9050 from sethalves/last-edited-by
lastEditedBy property for entities
2016-11-11 16:02:18 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226
Add ability to mute user
2016-11-11 16:02:08 -08:00
Ryan Huffman
2203607044 Merge pull request #9056 from Atlante45/networking
Protect against empty packet lists
2016-11-11 15:28:46 -08:00