Commit graph

51434 commits

Author SHA1 Message Date
Faye Li
0ba934f543 sort online users array alphabetically 2017-02-10 16:39:14 -08:00
Faye Li
8f43ceed9d filter out yourself from users online list 2017-02-10 16:22:30 -08:00
samcake
13d1642ace Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-02-10 15:46:33 -08:00
Brad Hefta-Gaub
e6142d9719 Merge pull request #9645 from ZappoMan/binaryDataOverMessages
implement support for binary data over messages
2017-02-10 15:12:56 -08:00
David Kelly
8a7a3926c5 rest of issues w/linux and mac 2017-02-10 15:57:27 -07:00
samcake
2da1801fbf Fixing the failing shader 2017-02-10 14:40:39 -08:00
David Kelly
9891d7b7d2 build issue on linux/mac 2017-02-10 15:24:58 -07:00
David Rowe
acaf8c69c6 Better tablet mic muted and unmuted iconography 2017-02-11 11:07:31 +13:00
David Kelly
2996298e79 First bit of cleanup
consolidate to one map, some minor other cleaning.  More coming.
2017-02-10 14:57:09 -07:00
Andrew Meadows
66a315cb9c cap number of avatar entities 2017-02-10 13:14:20 -08:00
Andrew Meadows
d2315c15a1 avoid duplicate parse of AvatarEntityData entries 2017-02-10 13:14:20 -08:00
Andrew Meadows
c551a41e0a restore exposure of setAvatarEntityData() to JS 2017-02-10 13:14:20 -08:00
Andrew Meadows
563bf65e89 fix bug: performance problem for avatarEntities 2017-02-10 13:14:20 -08:00
Andrew Meadows
ee702f945f cleanup around when to send identityPacket 2017-02-10 13:14:20 -08:00
Andrew Meadows
0e504e9ec6 make methods private: avoid sanity check logic 2017-02-10 13:14:20 -08:00
David Rowe
b5b92c1508 Make the tablet's mic icon reflect the current mute state 2017-02-11 09:53:02 +13:00
David Kelly
1c1b0d1332 oops, debugging left in 2017-02-10 13:16:52 -07:00
David Kelly
7ec27cab13 Use EntityItem.contains
Cuz it works - seemed like it was broken but nope.  Also, trim off the
filters for zones that no longer are in the tree.
2017-02-10 12:47:48 -07:00
samcake
c4364e0f61 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-02-10 11:41:07 -08:00
samcake
b9102204ea FIx the filtering problem on color and normals introduced since we generate mips with QImage 2017-02-10 11:40:39 -08:00
David Kelly
cf780b3b73 fixed persist issue, working much better 2017-02-10 11:42:56 -07:00
Brad Hefta-Gaub
765500ebce remove debug and fix bug in test script 2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub
f6d4dbb7a4 some debugging 2017-02-10 09:18:04 -08:00
Ken Cooke
542a668723 Merge pull request #9641 from zzmp/load/test
log AVX2 support in audio-mixer
2017-02-10 08:13:20 -08:00
Zach Pomerantz
9b0f9e8d33 log full i/o stats 2017-02-10 04:32:42 -05:00
David Rowe
8a995cc1d2 Display list of audio input devices before list of audio output devices 2017-02-10 20:14:52 +13:00
David Rowe
9e3d8b0b6d Move the audio devices list into the root audio dialog 2017-02-10 20:11:20 +13:00
Brad Hefta-Gaub
7fba30f0dd add a test script to show binary message passing 2017-02-09 22:21:51 -08:00
Brad Hefta-Gaub
6a4f66677e Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages 2017-02-09 21:10:10 -08:00
Brad Hefta-Gaub
987f147ed4 implement support for binary data over messages 2017-02-09 20:41:34 -08:00
David Kelly
5ca80803c0 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-09 20:01:43 -07:00
David Kelly
415d71956f minor logging crap 2017-02-09 19:59:55 -07:00
David Kelly
8d666854c7 working it seems
But, AABox for zones isn't very helpful (box is _small).  Time to use
the shape of the zone.
2017-02-09 15:39:38 -07:00
Clément Brisset
20c8c8c278 Merge pull request #9636 from huffman/feat/stopwatch-updates
Stopwatch updates
2017-02-09 14:11:45 -08:00
Brad Hefta-Gaub
e329696cc8 Merge pull request #9581 from Atlante45/ess-pr
Add log window for the EntityScriptServer in interface.
2017-02-09 13:31:15 -08:00
Atlante45
3a30de79aa CR 2017-02-09 13:04:43 -08:00
Atlante45
72ed1add94 CR log spam cleanup 2017-02-09 13:04:43 -08:00
Atlante45
6fbe3c9187 Windows specific changes 2017-02-09 13:04:43 -08:00
Atlante45
43d2501993 Add HMD friendly window for the ESS log 2017-02-09 13:04:43 -08:00
Atlante45
0f39356e94 Only users with perm rez can see the log 2017-02-09 13:04:43 -08:00
Atlante45
35f8afe456 Handle domain reconnections 2017-02-09 13:04:43 -08:00
Atlante45
191121888c Add log window to the ESS log 2017-02-09 13:04:43 -08:00
Atlante45
2962dd6dc2 Factor LogDialog 2017-02-09 13:04:43 -08:00
Atlante45
fcb74bce10 First draft for entity script server log streaming 2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
74f10a1e7f Merge pull request #9603 from huffman/feat/trace-thread-script
Add thread names and scripts to chrome traces
2017-02-09 13:00:05 -08:00
Brad Hefta-Gaub
bc22326ec8 Merge pull request #9640 from ZappoMan/avatarSimulationStats
New stats for avatar simulation
2017-02-09 12:58:30 -08:00
Brad Hefta-Gaub
bb4654506a CR 2017-02-09 11:37:21 -08:00
Brad Hefta-Gaub
57e0dadd65 CR 2017-02-09 11:35:00 -08:00
samcake
850be620f9 Merge pull request #9606 from samcake/blue
More intrumentation, Pixel Format clean up and minor improvments in texture transfers
2017-02-09 11:18:09 -08:00
Zach Pomerantz
9d830d7ea9 log AVX2 support in audio-mixer 2017-02-09 18:56:49 +00:00