Clément Brisset
|
f450e70f1e
|
Merge pull request #10717 from birarda/feat/replicants
fix race for isUpstream and node hole punch
|
2017-06-15 17:39:12 -07:00 |
|
Stephen Birarda
|
c332244f4f
|
fix race for isUpstream and node hole punch
|
2017-06-15 17:34:20 -07:00 |
|
Clément Brisset
|
062713de8a
|
Merge pull request #10716 from birarda/feat/replicants
fix for table additions when there is no initial row
|
2017-06-15 17:22:06 -07:00 |
|
Stephen Birarda
|
36b4990114
|
fix for table additions when there is no initial row
|
2017-06-15 17:19:05 -07:00 |
|
Clément Brisset
|
cf4bc34572
|
Merge pull request #10712 from birarda/feat/replicants
merge upstream/master into upstream/replicants
|
2017-06-15 15:47:12 -07:00 |
|
Stephen Birarda
|
e6ef153148
|
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants
|
2017-06-15 15:43:13 -07:00 |
|
Clément Brisset
|
8c0bb4140e
|
Merge pull request #10709 from birarda/feat/downstream-in-nodelist
send downstream nodes in domain list, fix identity packet bug
|
2017-06-15 15:32:26 -07:00 |
|
Stephen Birarda
|
d7724b90af
|
address code review comments
|
2017-06-15 15:01:03 -07:00 |
|
Stephen Birarda
|
0565cfa2b7
|
fix for array additions in DS settings
|
2017-06-15 14:59:12 -07:00 |
|
Chris Collins
|
a1933b535d
|
Merge pull request #10704 from sethalves/remove-chat-from-default-scripts
remove chat from default scripts
|
2017-06-15 14:44:47 -07:00 |
|
Stephen Birarda
|
ea6a38148c
|
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist
|
2017-06-15 14:30:08 -07:00 |
|
Ryan Huffman
|
36381aa584
|
Merge pull request #10707 from birarda/feat/replication-to-broadcast
nomenclature changes from replication to broadcast
|
2017-06-15 14:27:31 -07:00 |
|
Ryan Huffman
|
330a27b3a0
|
Fix removing all downstream nodes in settings not killing nodes
|
2017-06-15 14:27:01 -07:00 |
|
Stephen Birarda
|
8f154321a4
|
never process null avatar ID in avatar manager
|
2017-06-15 14:25:10 -07:00 |
|
Stephen Birarda
|
6cf4ff1daf
|
remove debug and fix peek of session ID
|
2017-06-15 13:44:44 -07:00 |
|
Andrew Meadows
|
5e0be1a823
|
Merge pull request #10662 from ctrlaltdavid/21394
Smoothly ease hands from uncontrolled to controlled positions
|
2017-06-15 13:17:26 -07:00 |
|
Stephen Birarda
|
94abfc2d6b
|
nomenclature changes from replication to broadcast
|
2017-06-15 11:47:13 -07:00 |
|
Brad Hefta-Gaub
|
0597c3105f
|
Merge pull request #10705 from ZappoMan/moreAudioFixes
fix no audio device from previously removed audio device
|
2017-06-15 11:04:14 -07:00 |
|
Seth Alves
|
023ca85623
|
remove chat from default scripts
|
2017-06-15 09:27:43 -07:00 |
|
ZappoMan
|
d352163d77
|
fix no audio device from previously removed audio device
|
2017-06-15 09:24:14 -07:00 |
|
Brad Hefta-Gaub
|
035a9e898f
|
Merge pull request #10684 from howard-stearns/avatar-whitelist
avatar whitelist
|
2017-06-15 08:45:16 -07:00 |
|
druiz17
|
347f020b04
|
Merge pull request #10692 from jherico/fix_tablet_crash
Fix crash on exit when tablet is open
|
2017-06-15 08:15:02 -07:00 |
|
Brad Hefta-Gaub
|
c807827a36
|
Merge pull request #10693 from seefo/master
Incomplete sandbox content updates are now removed and reperformed
|
2017-06-14 19:32:01 -07:00 |
|
Stephen Birarda
|
2e5d92a537
|
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist
|
2017-06-14 17:23:12 -07:00 |
|
Stephen Birarda
|
0fa88db1d3
|
Merge pull request #10699 from seefo/replicants
Fixed default value bug in dropdowns inside domain server settings
|
2017-06-14 17:22:55 -07:00 |
|
Stephen Birarda
|
10649c8f6e
|
change new Node flag to isForcedNeverSilent
|
2017-06-14 17:20:37 -07:00 |
|
seefo
|
0fa172a4ef
|
Fixed default value bug in dropdowns inside domain server settings
|
2017-06-14 17:19:48 -07:00 |
|
Stephen Birarda
|
747cca9beb
|
don't manage display name or send empty to downstream
|
2017-06-14 17:17:32 -07:00 |
|
Stephen Birarda
|
224a559602
|
keep downstream nodes around in domain, alive in upstream
|
2017-06-14 17:17:14 -07:00 |
|
Andrew Meadows
|
9c928f16b2
|
Merge pull request #10632 from Atlante45/fix/node-leak
Fix SharedNodePointer leak
|
2017-06-14 17:03:52 -07:00 |
|
Stephen Birarda
|
1ed0b693da
|
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist
|
2017-06-14 16:57:28 -07:00 |
|
Andrew Meadows
|
becb968a75
|
Merge pull request #10685 from ctrlaltdavid/21327-b
Use HMD roll angle to turn while flying or walking in HMD
|
2017-06-14 16:56:29 -07:00 |
|
Ryan Huffman
|
785156ad9f
|
Move downstram server adding to DS
|
2017-06-14 16:54:04 -07:00 |
|
Clément Brisset
|
72bf879eb2
|
Merge pull request #10677 from birarda/feat/avatar-mixer-downstream
add replication to avatar mixers, fixes for audio
|
2017-06-14 16:44:56 -07:00 |
|
Stephen Birarda
|
806ebd3401
|
add return to queueReplicatedAudioPacket if no type match
|
2017-06-14 16:13:20 -07:00 |
|
Stephen Birarda
|
4c2fa4be64
|
fix indentation in AvatarMixerSlave/AvatarMixerSlavePool
|
2017-06-14 15:53:24 -07:00 |
|
Stephen Birarda
|
afc9978841
|
add a comment for hop over sequence in AudioMixerClientData
|
2017-06-14 15:20:47 -07:00 |
|
Stephen Birarda
|
6c2134901e
|
Merge pull request #10695 from Atlante45/feat/replicants
Server side fix for jurisdiction listener
|
2017-06-14 15:13:54 -07:00 |
|
Stephen Birarda
|
9407a65f80
|
peek the nodeID to keep message in right place
|
2017-06-14 15:12:23 -07:00 |
|
Atlante45
|
3f1dfc346d
|
Merge branch 'fix/node-leak' of github.com:Atlante45/hifi into feat/replicants
|
2017-06-14 15:12:13 -07:00 |
|
Stephen Birarda
|
e818a511b9
|
cleanup debug in updateReplicatedNodes
|
2017-06-14 15:07:48 -07:00 |
|
Stephen Birarda
|
54832d995d
|
fix a typo in shouldReplicateNode
|
2017-06-14 15:05:58 -07:00 |
|
Ryan Huffman
|
67113330b3
|
Make replicated username list case insensitive
|
2017-06-14 15:03:54 -07:00 |
|
Ryan Huffman
|
8d5dc21de8
|
Fix replicated nodes not being properly updated when logging in or changing settings
|
2017-06-14 15:03:53 -07:00 |
|
Stephen Birarda
|
ca196f6141
|
Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/avatar-mixer-downstream
|
2017-06-14 15:03:26 -07:00 |
|
Clément Brisset
|
44117ac001
|
Merge pull request #10694 from highfidelity/master
Update replicants branch with master
|
2017-06-14 15:01:22 -07:00 |
|
Stephen Birarda
|
bfa5df778d
|
remove avatar entity data debug
|
2017-06-14 14:59:49 -07:00 |
|
Stephen Birarda
|
e3c3831efa
|
only output sequence number information if debug is requested
|
2017-06-14 14:56:15 -07:00 |
|
Stephen Birarda
|
5b45beaa39
|
cleanup some debug from identity packet changes
|
2017-06-14 14:51:28 -07:00 |
|
seefo
|
9fa21fc79f
|
Incomplete sandbox content updates are now removed and reperformed
|
2017-06-14 14:45:25 -07:00 |
|