Commit graph

61663 commits

Author SHA1 Message Date
Brad Hefta-Gaub
28b75abcee
Merge pull request #11816 from druiz17/fix-bringing-up-logs
Fix issue of User is unable to bring up the High Fidelity Interface log.
2017-11-17 17:02:50 -08:00
Brad Hefta-Gaub
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain
Adjustable master avatar volume
2017-11-17 16:58:27 -08:00
Brad Hefta-Gaub
592f4921bc
Merge pull request #11825 from druiz17/fix-tablet-rez
fix tablet rez point for commence button
2017-11-17 16:51:52 -08:00
Brad Hefta-Gaub
ed4ec3208d
Merge pull request #11797 from luiscuenca/case7589
Fix notifications shrink with avatar
2017-11-17 15:27:46 -08:00
Brad Hefta-Gaub
a85a6f6795
Merge pull request #11308 from luiscuenca/patch-1
glTF import DEMO
2017-11-17 14:52:51 -08:00
John Conklin II
24e0d5ba67
Merge pull request #11846 from marko8904/master
Updated the README with CLA details.
2017-11-17 14:08:43 -08:00
Zach Fox
4cc8db8aff
Merge pull request #11843 from zfox23/commerce_fixMyItems
Fix 'My Items' display
2017-11-17 12:59:51 -08:00
Stephen Birarda
239b116874
Merge pull request #11835 from birarda/bug/octree-connection-id
Reset EntityTreeSendThread known state if client disconnects from Entity Server
2017-11-17 12:56:25 -08:00
luiscuenca
df51d66f60 no double scaling and comments 2017-11-17 13:40:22 -07:00
Brad Hefta-Gaub
f5bb29f767
Merge pull request #11842 from birarda/networking-api-info
clarify the send packet list APIs
2017-11-17 12:30:09 -08:00
Dante Ruiz
8f6c781014
Merge pull request #11831 from misslivirose/feat/scale-emit-hands
Emit avatar scale changed signal when scaled with hand controllers
2017-11-17 11:55:31 -08:00
Dante Ruiz
4de0fdf7d1
Merge pull request #11768 from ctrlaltdavid/21596
Add instructions and cursor to GOTO dialog input
2017-11-17 11:45:40 -08:00
luiscuenca
bbf5e3b023 simplifications and comments 2017-11-17 12:45:36 -07:00
Andrew Meadows
98001b64d9
Merge pull request #11788 from ctrlaltdavid/21579-a
Particles emitter fixes
2017-11-17 11:31:12 -08:00
Zach Fox
f570e3c874 Fix 'My Items' display 2017-11-17 11:27:00 -08:00
Andrew Meadows
6a784794c9
Merge pull request #11789 from ctrlaltdavid/21599
Don't remove entities from list when try to delete locked entity
2017-11-17 11:26:00 -08:00
Stephen Birarda
16d93ee168 clarify signatures in LNL to send packet lists 2017-11-17 11:17:11 -08:00
Stephen Birarda
dd27e3db31 add diff traversal reset when resetting state 2017-11-17 09:44:35 -08:00
Andrew Meadows
d207803f26
Merge pull request #11837 from SamGondelman/hOverlay
Fix tablet home button highlight overlay dimensions
2017-11-17 08:25:27 -08:00
Zach Fox
57c86c3035
Merge pull request #11836 from zfox23/commerce_fixStepSkip
Fix skipping wallet setup step in certain cases
2017-11-16 16:01:10 -08:00
SamGondelman
b252c81d84 fix home button hover overlay dimensions 2017-11-16 15:34:42 -08:00
Zach Fox
7f64ede940 Fix skipping wallet setup step in certain cases 2017-11-16 11:44:52 -08:00
Stephen Birarda
eedb77dae9 add clearing of known state if client resets ES connection 2017-11-16 11:40:35 -08:00
John Conklin II
b5d4f6c65f
Merge pull request #11826 from jherico/bug/fb9107
Fix for black screen on HMDs on startup
2017-11-16 11:32:20 -08:00
Clément Brisset
2b39cb4500
Merge pull request #11832 from highfidelity/RC59
Merge RC59 into master
2017-11-16 11:19:54 -08:00
Liv Erickson
dda32f1987 Emit scale changed signal when scaled with hand controllers 2017-11-16 09:26:42 -08:00
Dante Ruiz
94ac8e52d5
Merge pull request #11822 from druiz17/fix-tablet-3d-person
fixing tablet in 3d person
2017-11-16 08:55:27 -08:00
Brad Davis
7bbc719d79 Fix for black screen on HMD derived display plugins 2017-11-16 08:53:12 -08:00
John Conklin II
0306c22394
Merge pull request #11823 from luiscuenca/case9267
Fix not restoring animations after changing view modes
2017-11-15 16:38:35 -08:00
John Conklin II
21503a635f
Merge pull request #11811 from birarda/feat/entity-server-flap
Hold entity data until client is presumably reachable and has queried
2017-11-15 16:16:50 -08:00
Dante Ruiz
dd8ea759d4 fix tablet rez for commence button 2017-11-15 15:48:39 -08:00
Sam Gateau
3f5b21ec22
Merge pull request #11559 from Zvork/bloom
Bloom
2017-11-15 15:11:31 -08:00
Ryan Huffman
60a222e4b4
Merge pull request #11810 from Atlante45/fix/stuck-acs
Fix stuck ACs
2017-11-15 14:59:51 -08:00
Zach Fox
9ad27e93f5
Merge pull request #11820 from ElderOrb/FB9264
9264 dismiss keyboard after user finished typing in marketplace searc…
2017-11-15 14:56:00 -08:00
David Kelly
009e6b252a
Merge pull request #11814 from AndrewMeadows/fix-cylinders
fix cylinder collision shape
2017-11-15 15:24:29 -07:00
Zach Fox
9f80a5f081
Merge pull request #11817 from zfox23/commerce_rezFix
Fix rezzing non-JSON marketplace items
2017-11-15 14:17:05 -08:00
luiscuenca
bf0d55aa98 9267 Fix not restoring animations after changing view modes 2017-11-15 15:04:24 -07:00
Dante Ruiz
9564b7567b fixing tablet in 3d person 2017-11-15 13:39:21 -08:00
Dante Ruiz
b42704012e
Merge pull request #11819 from hyperlogic/bug-fix/avatar-eye-height
Bug fix for MyAvatar.getEyeHeight()
2017-11-15 13:20:30 -08:00
Alexander Ivash
78d89d886f 9264 dismiss keyboard after user finished typing in marketplace search bar and hit search or return key 2017-11-16 00:13:46 +03:00
John Conklin II
703d1e1739
Merge pull request #11808 from Atlante45/hazeUIFix
RC-59 patch - Removed Keylight attenuation from .js (as well as .html).
2017-11-15 12:54:14 -08:00
Anthony J. Thibault
b49891c0f8 Bug fix for MyAvatar.getEyeHeight() 2017-11-15 11:27:42 -08:00
Zach Fox
e8c4878c8f Fix rezzing non-JSON marketplace items 2017-11-15 11:25:18 -08:00
Atlante45
d8b1cb10df CR 2017-11-15 11:20:30 -08:00
Atlante45
e68ce97697 Remove the number of socket change tracking 2017-11-15 11:19:54 -08:00
Dante Ruiz
d83f3152dd
Merge pull request #11809 from ElderOrb/FB8984
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-15 11:16:49 -08:00
Dante Ruiz
b633968865 fix-bringing-up-logs 2017-11-15 10:47:06 -08:00
Sam Gateau
2c51e516eb
Merge pull request #11744 from Zvork/shadow
Shadow caster culling fix
2017-11-15 09:49:39 -08:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587
7587 Lasers resize with avatar
2017-11-15 09:31:45 -08:00
Andrew Meadows
d538a9aaa8 fix typo making cylinders collide as sphere 2017-11-15 09:04:04 -08:00