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 |
|
Stephen Birarda
|
c7e37a09fb
|
Merge pull request #10710 from seefo/fb5376
Fixed a bug where custom port wasn't used in AC when passed through CLI
|
2017-06-15 15:38:11 -07:00 |
|
Zach Fox
|
130d98fcfc
|
Merge pull request #10708 from zfox23/spectatorCamera_fixMonitorDisplay
Ensure monitor never shows frozen SpectatorCamera preview
|
2017-06-15 15:35:31 -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 |
|
Zach Pomerantz
|
eb4255e1ac
|
fix audio checkbox bindings
|
2017-06-15 18:21:23 -04:00 |
|
Ryan Huffman
|
154b33bddb
|
Remove /tutorial in favor of new repo
Tutorial code has been moved to a new hifi-tutorial repo
|
2017-06-15 15:17:45 -07:00 |
|
Stephen Birarda
|
d7724b90af
|
address code review comments
|
2017-06-15 15:01:03 -07:00 |
|
seefo
|
6d480600d8
|
Fixed a bug where custom port wasn't used in AC when passed through CLI
|
2017-06-15 14:59:36 -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 |
|
Zach Fox
|
eef4c9d747
|
Merge pull request #10706 from zfox23/spectatorCamera_cauterizedFix
Show MyAvatar's head in the SpectatorCamera view!
|
2017-06-15 13:49:13 -07:00 |
|
Stephen Birarda
|
6cf4ff1daf
|
remove debug and fix peek of session ID
|
2017-06-15 13:44:44 -07:00 |
|
Zach Fox
|
d7a9354b37
|
More CR comments; rename function
|
2017-06-15 13:25:16 -07:00 |
|
Zach Fox
|
70569021a8
|
Merge pull request #10697 from zfox23/spectatorCamera_HMDOnly
Make the Spectator button only appear in HMD (also add a debug mode for devs)
|
2017-06-15 13:20:56 -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 |
|
Zach Fox
|
1088d248e3
|
Howard's CR comments
|
2017-06-15 13:13:58 -07:00 |
|
Zach Fox
|
834a2a5c3b
|
Ensure monitor never shows frozen SpectatorCamera preview
|
2017-06-15 12:49:09 -07:00 |
|
Zach Pomerantz
|
3093a73ce1
|
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
|
2017-06-15 15:04:06 -04:00 |
|
Stephen Birarda
|
94abfc2d6b
|
nomenclature changes from replication to broadcast
|
2017-06-15 11:47:13 -07:00 |
|
Zach Fox
|
47e5fb56d3
|
Show MyAvatar's head in the SpectatorCamera view!
|
2017-06-15 11:31:20 -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 |
|
Zach Fox
|
68662bb209
|
Bugfixes
|
2017-06-15 10:20:17 -07:00 |
|
Zach Fox
|
a795822919
|
Comments and disable camera when switching
|
2017-06-15 10:09:28 -07:00 |
|
Zach Fox
|
498ed4cbe8
|
showSpectatorInDesktop true for now
|
2017-06-15 10:09:28 -07:00 |
|
Zach Fox
|
0114962e75
|
Make the Spectator button only appear in HMD (with debug mode)
|
2017-06-15 10:09:28 -07:00 |
|
Zach Fox
|
60549075dd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-06-15 10:09:07 -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 |
|
Dante Ruiz
|
a1782bf7d2
|
Merge branch 'controller-ui' into hand-pucks
|
2017-06-15 16:27:55 +01:00 |
|
Dante Ruiz
|
d65c0dfbac
|
Merge branch 'master' of github.com:highfidelity/hifi into controller-ui
|
2017-06-15 16:24:59 +01: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 |
|
NeetBhagat
|
a6b1b17d45
|
Merge branch 'master' into 21369
|
2017-06-15 11:04:22 +05:30 |
|
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 |
|