Commit graph

66932 commits

Author SHA1 Message Date
David Back
e21c451815 ensure deleted or cleared entities properly unequipped 2018-04-23 16:56:18 -07:00
John Conklin II
5cf93ebd1f
Merge pull request #12966 from SamGondelman/audio
Fix audio level meter
2018-04-23 14:56:57 -07:00
John Conklin II
2e6a563c87
Merge pull request #12959 from davidkelly/dk/14375
Don't populate user list in pal until you connect the events up
2018-04-23 14:47:31 -07:00
John Conklin II
6af6423056
Merge pull request #12905 from dback2/desktopEquip
Desktop equip/unequip
2018-04-23 14:35:29 -07:00
John Conklin II
91197cadcf
Merge pull request #12967 from SimonWalton-HiFi/hmac-shortid-merge-fix
Fix for null sourceNode use
2018-04-23 14:11:06 -07:00
Stephen Birarda
0de1a49c78
Merge pull request #12949 from birarda/feat/installer-marketing-images
add default or campaigned marketing slideshow during install
2018-04-23 13:52:53 -07:00
John Conklin II
70689dd297
Merge pull request #12968 from birarda/bug/wrong-domain-local-id
fix setting of domain local ID from domain list
2018-04-23 13:50:21 -07:00
John Conklin II
5a3f44fa15
Merge pull request #12965 from NissimHadar/bug12979
Fix for bug #12979: Setting colors [0, 0, 254] from js api ends up as black color
2018-04-23 13:49:41 -07:00
Sam Gateau
d3fccc4104
Merge pull request #12881 from SamGondelman/scaleAssert
Minimum entity dimension (1mm)
2018-04-23 13:40:53 -07:00
John Conklin II
b3dbf7a025
Merge pull request #12943 from vladest/fix_spinbox
Fix SpinBox.
2018-04-23 13:02:01 -07:00
Stephen Birarda
779386fbc4 fix setting of domain local ID from domain list 2018-04-23 12:29:02 -07:00
Simon Walton
f849d6f937 Change packetSourceAndHashMatchAndTrackBandwidth logging in same manner 2018-04-23 12:26:02 -07:00
Simon Walton
2f72b789a3 Fix for null sourceNode use 2018-04-23 12:13:31 -07:00
SamGondelman
1deb38f06d fix copy error 2018-04-23 12:05:30 -07:00
NissimHadar
ea6585a0b9 Corrected tosRGBFloat() computation. 2018-04-23 11:53:35 -07:00
Sam Gateau
d1e2e9ce71
Merge pull request #12921 from SamGondelman/precisionq
Fix AMD shader compilation
2018-04-23 10:17:35 -07:00
vladest
cf070e6e92 Cleanup 2018-04-23 18:56:16 +02:00
Sam Gateau
7842ee8eac
Merge pull request #12962 from SamGondelman/menu
Android: Hide menu and fix shader compilation
2018-04-23 09:51:20 -07:00
Ken Cooke
ae33205d80
Merge pull request #12944 from humbletim/fix-pal-adjusted-injector-gain
Support per-avatar gain adjustment on positional audio streams
2018-04-23 09:22:53 -07:00
Seth Alves
9e1bd69af3
Merge pull request #12918 from kitely/fix-addentity-failure
Fixed null pointer exception if importing an entity from JSON fails
2018-04-21 18:12:48 -07:00
vladest
60115752ad Fixed saving after editing 2018-04-21 20:18:24 +02:00
MiladNazeri
3710ce593d
Merge pull request #12922 from ctrlaltdavid/21815
Controller API JSDoc
2018-04-21 10:44:05 -07:00
vladest
2e44220b80 Merge branch 'master' into fix_spinbox 2018-04-21 19:38:28 +02:00
David Rowe
34d0a892a0 Point to example using Hardware.Application item 2018-04-21 15:01:46 +12:00
David Rowe
3792b28a3e Add input recorder examples 2018-04-21 14:53:40 +12:00
David Rowe
f865a13326 Doc review 2018-04-21 14:10:14 +12:00
SamGondelman
ac7e8623bf quiet shader warnings 2018-04-20 18:25:30 -07:00
MiladNazeri
080e26f408
Merge pull request #12952 from ctrlaltdavid/21851
Vec3 API JSDoc
2018-04-20 18:10:18 -07:00
David Rowe
748052614f Doc review 2018-04-21 12:45:00 +12:00
SamGondelman
d59f368ad6 hide menu, fix shaders 2018-04-20 17:38:38 -07:00
David Kelly
d84ea6bf0f Don't populate user list in pal until you connect the events up 2018-04-20 16:09:20 -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
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
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
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
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
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