Commit graph

48308 commits

Author SHA1 Message Date
Zach Fox
c4b59eafbb Add 'Snapshot' text. My very first commit! 2016-11-01 14:09:25 -07:00
Ryan Huffman
ba7eac5281 Override getSubdeviceNames in OculusControllerManager 2016-11-01 13:53:10 -07:00
Ryan Huffman
3147ea9e33 Update help window to auto select xbox or vive controller tab on availability of device 2016-11-01 13:43:55 -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
Chris Collins
3625f329d9 Merge pull request #8971 from hyperlogic/bug-fix/deterministic-plugin-load-order
Load plugins in alphabetical order.
2016-11-01 11:30:04 -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
David Kelly
404c08b0c7 Un-do of previous commit
Seems to add an artifact when using our test scripts.  Will work on that
as a separate issue, as it would be an existing issue in any case.
2016-11-01 10:46:22 -07:00
Anthony J. Thibault
09511111cf Load plugins in alphabetical order. 2016-11-01 10:23:54 -07:00
Chris Collins
4d798edfb0 Merge pull request #8959 from highfidelity/RC-25
Beta Release 25 - Includes up to Developer Release 5622
2016-11-01 09:16:57 -07:00
David Kelly
fb2968a419 Reset bytes sent counter when setting avatar sound
It could be past the end of the buffer if you changed sounds, and the
new one is shorter.  Won't happen with our current tests, but that could
change, and in general no reason it couldn't happen.
2016-11-01 09:12:35 -07:00
Ryan Huffman
5f8cee787f Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename 2016-11-01 09:07:56 -07:00
Ryan Huffman
0cc98d4501 Add VersionInfo.rc to interface 2016-11-01 09:00:08 -07:00
Ryan Huffman
ea31a8e3b4 Add VersionInfo.rc.in 2016-11-01 08:59:56 -07:00
Ryan Huffman
b7f5fc2516 Update 'Sandbox' to 'High Fidelity Sandbox' in task manager 2016-11-01 08:58:29 -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
David Kelly
5714063eff Make more reliable
Need to be sure we don't change the _isAvatar or
_isListeningToAudioStream from one thread while processing audio in
another.  Also, fixed issue sending NLPacketList.
2016-10-31 16:38:01 -07:00
samcake
91d878666c Remove experimental scripts 2016-10-31 14:56:28 -07:00
samcake
ce055fc1e6 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-10-31 14:53:19 -07:00
David Kelly
e63e9bc017 Remove HRTFs for Avatar too
Turns out there was already a function for that, if you just call
removeHRTFForStream without a 2nd param, it appears to just delete
the audio with uuid of QUuid() which is the avatar's mic.  That is
what we want, so cool.
2016-10-31 13:25:22 -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
6698b1617b Merge pull request #8945 from thoys/patch-8
Fix Oculus hand controllers to only work in HMD
2016-10-31 11:02:40 -07:00
David Kelly
80e38c395e Send KillAvatar to AudioMixer too
So it can remove the listening agent avatar audio streams.  Otherwise
they stick around forever, and eventually swamp the audio mixer.
2016-10-31 10:35:16 -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
Chris Collins
3b6faefe05 Merge pull request #8931 from sethalves/possible-fix-for-2068
Possible fix for 2069
2016-10-31 10:21:01 -07:00
Brad Hefta-Gaub
a79541a83a Merge pull request #8962 from ZappoMan/removeFaceMute
remove mute icons
2016-10-30 13:12:23 -07:00
Brad Hefta-Gaub
8fbac58091 remove mute icons 2016-10-30 09:33:02 -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
Ryan Huffman
4148abe28f Add comment to tutorial.js generateUUID usage 2016-10-28 16:17:54 -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
David Kelly
a8832fafeb Merge pull request #8934 from howard-stearns/more-reliable-crowds
More reliable crowds
2016-10-28 16:17:35 -07:00
Ryan Huffman
214d8ebc33 Merge pull request #8954 from Atlante45/sandbox
Exit Sandbox instead of asking to quit
2016-10-28 16:09:03 -07:00
Ryan Huffman
8fe6278831 Update wentToEntry tutorial step to #9 2016-10-28 16:01:52 -07:00
Seth Alves
43536e0046 in C, order of argument evaluation isn't defined 2016-10-28 15:48:54 -07:00
Stephen Birarda
207d26091c Merge pull request #8953 from Atlante45/being-of-light
Update being of light model
2016-10-28 15:36:19 -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
Atlante45
e1ed7929e3 exit sandbox instead of asking to quit 2016-10-28 15:10:27 -07:00
Stephen Birarda
142fc99ef0 Merge pull request #8946 from birarda/master
make the socket readyRead check fire more frequently
2016-10-28 15:02:15 -07:00
Zach Pomerantz
e2826d311f fix test interface 2016-10-28 14:57:18 -07:00