Menithal
dc5e374485
Merge remote-tracking branch 'upstream/master' into 21484
2017-08-17 22:28:43 +03:00
Liv
1ae4a5c019
remove class from function call
2017-08-15 15:30:43 -07:00
Liv
aea5f170f2
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-08-15 13:58:22 -07:00
Liv
49eab847fd
Refactor handleOctreeFileReplacement, style changes, align with handler for other file types
2017-08-15 13:58:02 -07:00
Stephen Birarda
8d0ed51035
clear entity tree in Agent if ES disappears
2017-08-10 11:02:56 -07:00
Menithal
982d4a451f
Updated Protocol to add allowTranslation
...
There still is a bug for the value no actually updating
2017-08-08 23:47:37 +03:00
Liv Erickson
da70071b5a
Merge branch 'master' into feat/domain-setup
2017-08-07 10:04:54 -07:00
Seth Alves
186035dc5d
adjust various things that cause a crash-on-exit on Linux
2017-08-06 11:57:55 -07:00
Ken Cooke
6ea4ed80cd
Suppress initial PacketType::SilentAudioFrame on audio gate startup
2017-08-03 09:19:08 -07:00
burtsloane
d4ae298a8d
Merge branch 'master' into midi
2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444
Merge branch 'master' of https://github.com/burtsloane/hifi into midi
2017-07-26 13:30:57 -07:00
Burt Sloane
d2975c79c9
add midi to 3 CMakeLists.txt for linking
2017-07-26 08:41:26 -07:00
Liv
57b27a7bb7
change packet type to be sourced, change from packet list to single packet
2017-07-25 20:17:20 -07:00
Liv
9458e4a1eb
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-07-25 11:32:13 -07:00
Liv
76cc833747
move domain management into a separate API
2017-07-21 17:44:53 -07:00
Liv
5ea7fbc62a
Add node check on permissions for deletion
2017-07-21 10:27:30 -07:00
Liv
26558da794
Fix stupid typo that was giving connection refused - now working
2017-07-20 18:07:08 -07:00
Liv
4ba9b08125
first attempt at url handling in octree server
2017-07-20 14:00:51 -07:00
Liv
bdb12c38cf
Move API call to Entities scripting and out of Users
2017-07-20 11:41:57 -07:00
Andrew Meadows
a069620013
Merge pull request #10970 from Atlante45/feat/ac-shutdown-info
...
AC shutdown info + PPID watcher on Unix
2017-07-19 08:34:45 -07:00
Atlante45
91d65469a0
Use timer instead of dedicated thread to tick avatar
2017-07-17 15:52:52 -07:00
Atlante45
366ce69e66
Add info on how the child AC finished
2017-07-14 11:39:32 -07:00
Brad Hefta-Gaub
b063c2f45d
Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission
...
Cleanup OctreeSendThread::packetDistributor()
2017-07-13 09:58:28 -07:00
Clément Brisset
d346b1c68f
Merge pull request #10924 from Atlante45/fix/debug-asserts
...
Misc servers debug asserts fixes
2017-07-12 15:05:15 -07:00
Atlante45
b3d73fd0df
Add comments to DebugDraw instanciation
2017-07-12 10:39:15 -07:00
Stephen Birarda
f6d9a79fb5
Revert "Revert "fix for invisible avatars after radius ignore""
2017-07-12 10:36:53 -07:00
Andrew Meadows
1fe7718b9f
restore wasted byte count when unable to fit stats
2017-07-11 15:02:45 -07:00
Andrew Meadows
782155e9ea
Merge pull request #10876 from Atlante45/fix/ac-crash
...
Fix AC crash (buffer overflow)
2017-07-11 14:26:08 -07:00
Andrew Meadows
badbe98097
minor cleanup and constency for packet stats
2017-07-11 14:21:49 -07:00
Andrew Meadows
3226d33830
use cached OctreeSendThread::_nodeUuid
2017-07-11 14:02:16 -07:00
Andrew Meadows
15879b2832
+ OctreeSendThread::traverseTreeAndSendContents()
...
this abstracts a portion of OctreeSendThread::packetDistributor()
which will make it easier to split apart the tree traversal
from the sending of packets
also cleaned up some of the packet stats tracking
2017-07-11 13:53:08 -07:00
Andrew Meadows
9d111d1f92
remove unused OctreeSendThread::_nodeMissingCount
2017-07-11 13:42:35 -07:00
Andrew Meadows
a5cd11cea7
remove more crufty comments
2017-07-11 10:11:24 -07:00
Andrew Meadows
ca3f0ceecb
remove crufty comments
2017-07-11 10:02:18 -07:00
Andrew Meadows
076ae28bed
one less strand of spaghetti when counting packets
2017-07-11 09:52:39 -07:00
Andrew Meadows
b74aad32ed
minor cleanup in OctreeSendThread::packetDistributor()
2017-07-10 18:27:40 -07:00
Atlante45
c32f4ab0d3
CR
2017-07-10 14:24:53 -07:00
Stephen Birarda
98ccfa80a2
don't add node missing from a replicated kill packet
2017-07-10 11:14:13 -07:00
Atlante45
7160fca4f7
Fix bad read access on shutdown
2017-07-07 17:14:08 -07:00
Atlante45
aa306c3450
Fix debug asserts on shutdown
2017-07-07 17:01:07 -07:00
Stephen Birarda
420e9233b6
Revert "fix for invisible avatars after radius ignore"
2017-07-07 16:50:28 -07:00
Stephen Birarda
f07ce6d294
Merge pull request #10835 from birarda/bug/invisible-avatars
...
fix for invisible avatars after radius ignore
2017-07-07 16:06:44 -07:00
Atlante45
0778fbaea9
Fix Debug Mode Assert
2017-07-07 15:58:39 -07:00
Clément Brisset
34e3f56002
Merge pull request #10843 from birarda/bug/user-activities-interface-only
...
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
Atlante45
1d07ab70f0
Fix warnings
2017-07-06 10:56:09 -07:00
Stephen Birarda
916f57772b
default the UAL off for all targets, enable manually for Interface
2017-07-06 10:21:07 -07:00
Atlante45
95abbd0ad4
Prevent Interface from trying to send packets bigger than an MTU
2017-07-05 17:08:04 -07:00
Seth Alves
70a7b302fc
Merge pull request #10860 from jherico/deadlock_guards
...
Don't use blocking connections on the main thread
2017-07-03 09:05:56 -07:00
Clément Brisset
8744b8e58d
Merge pull request #10859 from Atlante45/fix/ac-cleanup
...
Fix AC cleanup
2017-06-30 16:42:15 -07:00
Stephen Birarda
f6fe3f91fd
Merge pull request #10829 from birarda/bug/sequence-skips
...
fix avatar mixer sending empty avatar identities
2017-06-30 15:28:29 -07:00