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
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
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
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
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
David Rowe
08defea755
Merge branch 'master' into 21836
2018-04-20 09:20:56 +12:00
John Conklin II
11f509e57a
Merge pull request #12873 from Zvork/haze
...
Fix for weird color shifting of teleportation target in Rust domain
2018-04-19 14:11:47 -07:00
Ryan Huffman
bef4eb1d05
Increase packet version for Ping
2018-04-19 14:04:17 -07:00
MiladNazeri
6b5ed27559
Merge pull request #12926 from highfidelity/MiladNazeri-patch-1
...
Fix QT typo
2018-04-19 14:01:25 -07:00
MiladNazeri
7e780ed55a
Merge pull request #12915 from ctrlaltdavid/21849
...
Add Entities materialData JSDoc
2018-04-19 13:49:24 -07:00
milad
42471c539b
initial fixes from ctralt david's comments
2018-04-19 13:40:57 -07:00
Howard Stearns
6d151f022d
Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix
...
Only dismiss letterbox when clicking on grey areas
2018-04-19 11:47:10 -07:00
vladest
663af09605
Fix SpinBox. attempt 1
2018-04-19 20:43:48 +02:00
David Back
f7723a5bba
Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip
2018-04-19 11:17:34 -07:00
David Back
8cbe0f4633
safer clear grab actions
2018-04-19 11:17:26 -07:00
Seth Alves
6f420ffae2
Merge pull request #12936 from druiz17/more-tablet-changes
...
Change tablet model and spawn position
2018-04-19 10:25:34 -07:00
Sam Gateau
f87bfc14de
Merge pull request #12898 from kitely/emissivemap-relative-path
...
In Material resources, support relative paths for 'emissiveMap'
2018-04-19 10:25:02 -07:00
John Conklin II
5ef90b242e
Merge pull request #12925 from thoys/fix/create-errorOnShutdown
...
Create app: Save light selection menu option properly
2018-04-19 10:16:40 -07:00
SimonWalton-HiFi
9d06890aea
Merge branch 'master' into short-id
2018-04-19 10:09:34 -07:00
John Conklin II
cad4d45941
Merge pull request #12871 from Atlante45/fix/dead-octree-code
...
Remove dead Octree code
2018-04-19 09:58:20 -07:00
David Back
d1bb11562b
Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip
2018-04-19 09:36:19 -07:00
Sam Gateau
1e086332cc
Merge pull request #12911 from jherico/feature/splash
...
Pre-requisite changes for splash screen rendering
2018-04-19 09:19:05 -07:00
Ken Cooke
764aa00069
Coding standard fixes
2018-04-19 07:33:14 -07:00
Olivier Prat
c8bef8651f
Fixed weird specular on hair an teleportation target! Was a stupid mistake...
2018-04-19 10:04:38 +02:00
milad
364d193499
audio added
2018-04-18 21:04:57 -07:00
milad
3f129bda13
More done on audio
2018-04-18 20:04:41 -07:00
