Commit graph

2671 commits

Author SHA1 Message Date
Stephen Birarda
095bd7e6c8 cleanup logging, move packet parsing to mixers 2016-07-13 15:06:31 -07:00
Stephen Birarda
441b6d2813 fix recursive mutex lock, conditional, logging 2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6 add a scripting interface to ignore users 2016-07-13 15:06:31 -07:00
Stephen Birarda
a134ac72de add packet type and plumbing for node ignore 2016-07-13 15:06:31 -07:00
Brad Hefta-Gaub
f8910d475e Merge pull request #8225 from ZappoMan/codecPlugins
Audio codec plugins
2016-07-13 14:47:03 -07:00
Andrew Meadows
0d58274028 Merge pull request #8231 from AlexanderOtavka/fix-orientation
Fix orientation being reset to 0,0,0,1
2016-07-13 08:44:13 -07:00
Zander Otavka
87ba1ffeca Fix orientation being reset to 0,0,0,1 2016-07-12 16:20:01 -07:00
Atlante45
7a7b64e87d Use domain ID in the stream 2016-07-12 11:43:46 -07:00
Atlante45
a7d631b7e1 Revert packet version change 2016-07-12 11:43:31 -07:00
Atlante45
1a91a8e20a Make DomainList a sourced packet 2016-07-12 11:39:16 -07:00
Clément Brisset
2f07f0d24f Revert "Revert "Fix crash in packet list"" 2016-07-12 11:39:16 -07:00
Brad Hefta-Gaub
743576134f fix warnings 2016-07-11 13:38:08 -07:00
Brad Hefta-Gaub
f3f72f3c93 Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-11 13:15:27 -07:00
Brad Hefta-Gaub
a71baf5601 handle codec prioritization, handle multiple codec choices 2016-07-08 21:18:03 -07:00
Clément Brisset
d933238bda Revert "Fix crash in packet list" 2016-07-08 18:15:14 -07:00
Atlante45
f0fcb94a6a Typos 2016-07-08 16:00:34 -07:00
Atlante45
b665f38c1f Don't process DomainList packets from 2 DS
case 1037
2016-07-08 15:16:41 -07:00
Atlante45
70cf25bd8b Add missing read locks to LimitedNodeList's hash 2016-07-08 15:15:58 -07:00
Brad Hefta-Gaub
9333c7dcca Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-06 13:26:19 -07:00
Andrew Meadows
92af849204 bump version for new shape types 2016-07-06 10:52:01 -07:00
Stephen Birarda
e784d7c400 Merge pull request #8170 from huffman/fix/multiple-sessions
Fix multiple sessions being created for some users
2016-07-01 16:41:56 -07:00
Ryan Huffman
dd73f0c333 Remove unused header from AccountManager.h 2016-06-30 14:50:29 -07:00
Ryan Huffman
49da7d9a61 Remove sending of session id in request body in favor of header 2016-06-30 14:43:27 -07:00
Ryan Huffman
38776fe007 Fix multiple sessions being created for some users
If a user didn't have send-data activated they don't have their session id
sent in the header of requests, but instead send it inside the request
body. The session id being send in the request included curly braces which
the server considers invalid.
2016-06-30 14:35:27 -07:00
Sam Gondelman
aaa33bab98 Merge pull request #8080 from birarda/api-recheck-on-fail
simplify domain connection refusal dialog checking
2016-06-30 11:07:43 -07:00
Stephen Birarda
18a1f74c37 remove unused boolean for signalling protocol mismatch 2016-06-28 10:32:43 -07:00
Brad Hefta-Gaub
4bc6a3fb3b Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-06-24 12:54:55 -07:00
Brad Hefta-Gaub
4510bb1674 Merge pull request #8098 from zzmp/feat/temp-domain-heartbeats
add heartbeats to metaverse for temporary domains
2016-06-24 12:08:37 -07:00
Brad Hefta-Gaub
d7bffc3eab first cut at negotiating codecs 2016-06-23 17:14:41 -07:00
Brad Hefta-Gaub
da74114b32 Merge pull request #8070 from AndrewMeadows/triangle-soup-4
support btBvhTriangleMeshShape for static mesh entities
2016-06-23 12:17:32 -07:00
Stephen Birarda
f9b3165350 use a QSet instead of a QStringList 2016-06-23 09:37:17 -07:00
Stephen Birarda
7307bc6a1b revert to domain connection refusal check with string 2016-06-23 09:27:17 -07:00
Andrew Meadows
e5b89ebd17 bump version number 2016-06-22 15:33:44 -07:00
Zach Pomerantz
eebf8e91c6 add api_key to domains/public_key updates 2016-06-22 12:02:35 -07:00
Zach Pomerantz
3a36b0a2e5 add temporary domain info to account info 2016-06-22 12:02:35 -07:00
Ryan Huffman
847685d224 Add tracking of away.js 2016-06-22 09:06:59 -07:00
Ryan Huffman
890de1bfea Add went-to user activity back in 2016-06-22 08:54:58 -07:00
Ryan Huffman
4e52521f8c Update UserActivityLogger device blacklist 2016-06-21 16:43:16 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
Ryan Huffman
6c2c7f1eec Fix connected_device user activity event 2016-06-21 13:28:40 -07:00
Seth Alves
d8a67850f2 treat usernames in permissions-grid on domain-server settings page as case-insensitive 2016-06-17 15:17:51 -07:00
Ryan Huffman
c2ebcd1f77 Make activity logging from scripts only available for certain events 2016-06-16 13:49:25 -07:00
Ryan Huffman
3650377745 Clean up NULL => nullptr 2016-06-16 13:17:31 -07:00
Ryan Huffman
8b3b62aad7 Add UserActivityLogger scripting interface 2016-06-16 10:25:38 -07:00
Ryan Huffman
ed88232fb0 Move session id storage to AccountManager 2016-06-16 09:19:42 -07:00
Stephen Birarda
59912012c6 clear domain connection refusals on hard reset, not soft 2016-06-15 09:48:53 -07:00
Chris Collins
55330f2205 Merge pull request #8057 from jherico/settings
Fixing issues with unclosed groups in settings persistence
2016-06-14 14:34:14 -07:00
Stephen Birarda
2163f9b5f3 signal once for domain protocol mismatch, case 918 2016-06-14 10:43:45 -07:00
Bradley Austin Davis
34c8d257d2 Fixing issues with unclosed groups in settings persistence 2016-06-14 09:49:38 -07:00
Seth Alves
924c949af5 permissions for the local node were being updated without the various *changed* signals being called. this was keeping the asset-server menu item from being correct, among other things 2016-06-11 15:16:45 -07:00