David Kelly
d84ea6bf0f
Don't populate user list in pal until you connect the events up
2018-04-20 16:09:20 -07:00
Seth Alves
84e71a9bca
missed a file
2018-04-20 16:08:57 -07:00
Seth Alves
6fc02638d7
control verbose logging with a menu-item in developer menu
2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7
remove some uncatagorized logging, suppress some categories by default
2018-04-20 16:08:57 -07:00
David Rowe
7087abd201
Merge branch 'master' into 21815
2018-04-21 10:49:56 +12:00
John Conklin II
39ad8be1b8
Merge pull request #12743 from SimonWalton-HiFi/short-id
...
Use 16-bit local IDs for Nodes in NL packets
2018-04-20 15:28:18 -07:00
Andrew Meadows
3858e7b43c
update workload::Engine to agree with new API
2018-04-20 15:08:51 -07:00
Andrew Meadows
06af31594e
merge 'master' into 'workload'
2018-04-20 15:07:46 -07:00
John Conklin II
4705472960
Merge pull request #12889 from Atlante45/fix/threaded-crashes
...
Fix threaded force crashes
2018-04-20 13:20:40 -07:00
samcake
3d651de797
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-20 13:20:19 -07:00
humbletim
b86f553550
poke per-avatar gain into per-stream HRTF
2018-04-20 15:36:31 -04:00
Seth Alves
c20346ca53
Merge pull request #12937 from SamGondelman/startup
...
Make Audio.cpp threadsafe
2018-04-20 11:36:08 -07:00
Simon Walton
3f894fe5fa
Merge fix
2018-04-20 11:15:59 -07:00
Simon Walton
ed0fd8c4d2
Merge fix
2018-04-20 11:13:15 -07:00
Simon Walton
9f9a68188d
Merge remote-tracking branch 'upstream/master' into short-id
2018-04-20 11:10:21 -07:00
Stephen Birarda
7d68d5fd17
Merge pull request #12779 from birarda/cve/brace-expansion
...
update to latest electron version for server console
2018-04-20 10:53:07 -07:00
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings
...
fix some xcode warnings for unnecessary captured this
2018-04-20 10:30:27 -07:00
Seth Alves
512b1911eb
Merge pull request #12858 from ctrlaltdavid/21836
...
Update location.hostname JSDoc per serverless domains
2018-04-20 10:27:09 -07:00
SamGondelman
3b4b43cf66
try to fix audio crash on startup
2018-04-20 10:23:47 -07:00
vladest
0e28e41107
Fix various issues with SpinBox-es and Sliders
2018-04-20 19:15:29 +02:00
John Conklin II
a529c7cfc5
Merge pull request #12948 from samcake/rc66.1-metaSubItems
...
RC66.1: Re apply extra sanity check that hasn't been applied correctly in rc66
2018-04-20 09:55:09 -07:00
John Conklin II
7378c87ade
Merge pull request #12690 from SimonWalton-HiFi/hmac-auth
...
Change packet authentication to use HMAC
2018-04-20 09:54:25 -07:00
John Conklin II
92bf99f436
Merge pull request #12786 from huffman/fix/node-list-connections
...
Fix avatars not coming back when briefly disconnected from avatar mixer
2018-04-20 09:53:50 -07:00
samcake
0f4aa7e27e
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-20 09:31:36 -07:00
vladest
b8577bd791
Merge branch 'master' into fix_spinbox
2018-04-20 18:09:16 +02:00
Ryan Huffman
9cf133cff2
Increase packet version for Ping
2018-04-20 08:25:57 -07:00
Ryan Huffman
5bd89159dd
Update variable naming in NodeList from Id to ID
2018-04-20 08:25:52 -07:00
Ryan Huffman
a930e39bd4
Fix nodelist connections not resetting on both ends
...
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
2018-04-20 08:25:45 -07:00
Ken Cooke
a9c5edcb2f
Merge pull request #12942 from kencooke/audio-devices-crfix
...
Minor changes to meet coding standard
2018-04-20 08:20:32 -07:00
Olivier Prat
46a1ff4dd2
Set jitter to O on RenderableWebEntityItems
2018-04-20 12:02:17 +02:00
Olivier Prat
c6d598cc88
Jitter is now set through a batch command
2018-04-20 10:52:50 +02:00
Olivier Prat
57ff1c54e1
Created shared c++/glsl header for transformcamera
2018-04-20 09:01:19 +02:00
Sam Gateau
cfaf75e196
Using the std::chrono to measure the physics time
2018-04-19 23:28:32 -07:00
Olivier Prat
440e2b8452
Merged with master
2018-04-20 08:13:25 +02:00
David Rowe
8173ac87a8
Minor improvement to Quat.IDENTITY JSDoc
2018-04-20 16:41:10 +12:00
David Rowe
b1e214de5a
Vec3 API JSDoc
2018-04-20 16:40:15 +12:00
humbletim
238f59f229
make positional streams honor user-specified gain overrides
2018-04-20 00:08:25 -04:00
Stephen Birarda
0da51672bb
don't stop image slideshow when install concludes
2018-04-19 18:52:45 -07:00
Stephen Birarda
752d8368cc
add slideshow plugin to list of requirements in install doc
2018-04-19 18:16:44 -07:00
Stephen Birarda
7ecc279e00
show default or campaigned slideshow during install
2018-04-19 17:58:21 -07:00
David Rowe
0a7cccc3f7
Move Vec2 and Vec4 JSDoc
2018-04-20 12:47:53 +12:00
samcake
9b1a887469
Starting to move dynamically yeah
2018-04-19 17:43:14 -07:00
samcake
cb706cb9d9
Reapply extra sanity check that hasn;t been applied correctly in rc66
2018-04-19 17:24:04 -07:00
Simon Walton
377fc6d6c6
Revert to old packet version for ICE packets
...
Some ICE (& STUN) packets were using the default version,
which we bumped for the HMAC change. This commit breaks
out the switch for them and reverts to 17.
2018-04-19 16:55:32 -07:00
David Back
ef447cedfb
Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip
2018-04-19 16:30:01 -07:00
David Back
8950c31378
fix mouse equipping while someone else far grabbing
2018-04-19 16:29:49 -07:00
Simon Walton
999e5beba1
Move linear pass down sample shader to deferred compile
2018-04-19 15:30:16 -07:00
Simon Walton
529d5517e5
Move antialiasing and velocity buffer makeProgram to deferred scheme
2018-04-19 15:30:16 -07:00
David Rowe
8ade4f34f4
Tweak wording
2018-04-20 10:11:01 +12:00
David Rowe
0552a7242a
Further JSDoc updates for serverless domains
2018-04-20 09:52:35 +12:00
