Seth Alves
|
e22926eb89
|
Merge pull request #11762 from ctrlaltdavid/21594
Speed up entity list update after deleting entities
|
2017-11-07 09:34:47 -08:00 |
|
Seth Alves
|
ce7d0c324b
|
Merge pull request #11761 from ctrlaltdavid/21593
Don't move or rotate entities if Alt or Meta keys are pressed
|
2017-11-07 09:33:21 -08:00 |
|
Seth Alves
|
e9c0e53aa6
|
Merge pull request #11760 from druiz17/far-grab-parent
Far grab rolls up parent tree when grabbing and add offset to LaserPointer::lockEndUUID
|
2017-11-07 08:53:13 -08:00 |
|
David Rowe
|
fadbf09cdd
|
Avoid potentially slow entity list refresh upon deleting entities
|
2017-11-07 18:10:10 +13:00 |
|
David Rowe
|
60319e8d53
|
Don't move or rotate entities if Alt or Meta keys are pressed
|
2017-11-07 13:35:31 +13:00 |
|
Zach Fox
|
fff2160113
|
Merge pull request #11759 from zfox23/commerce_fixLogOutCrash
Fix crash when logging out while Passphrase screen visible
|
2017-11-06 16:21:08 -08:00 |
|
Dante Ruiz
|
c9d67f762b
|
made requested changes
|
2017-11-06 16:20:16 -08:00 |
|
Dante Ruiz
|
067ed2ffe0
|
apply coding standard
|
2017-11-06 16:09:31 -08:00 |
|
Dante Ruiz
|
646e5455ac
|
forgot to remove unused variable
|
2017-11-06 16:05:44 -08:00 |
|
Dante Ruiz
|
41c6261b74
|
LaserPointer: made _objectLockEnd into a struct
|
2017-11-06 16:04:33 -08:00 |
|
Dante Ruiz
|
3b15897b12
|
fixed farGrab parent grabbing and laser LockEndUUID
|
2017-11-06 15:21:20 -08:00 |
|
Zach Fox
|
bb21c52783
|
Fix crash when logging out while Passphrase screen visible
|
2017-11-06 15:12:01 -08:00 |
|
Stephen Birarda
|
99552910f7
|
Merge pull request #11754 from ctrlaltdavid/21591
Fix Asset Browser's "Copy URL" context menu
|
2017-11-06 13:42:22 -08:00 |
|
Howard Stearns
|
d7429094e4
|
Merge pull request #11728 from howard-stearns/stable-v-staging-update-for-marketplace-injection
stable-v-staging for marketplace injection
|
2017-11-06 13:36:56 -08:00 |
|
Brad Hefta-Gaub
|
26c77ba72d
|
Merge pull request #11749 from ZappoMan/fixImportLargeEntities
allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU
|
2017-11-06 10:06:07 -08:00 |
|
Howard Stearns
|
0898ad8b25
|
Merge pull request #11745 from zfox23/commerce_receiveAtFingerprint
Add Machine Fingerprint to receive_at endpoint txn
|
2017-11-06 09:06:01 -08:00 |
|
Dante Ruiz
|
e432e62a39
|
Merge branch 'master' of github.com:highfidelity/hifi into far-grab-parent
|
2017-11-06 09:02:03 -08:00 |
|
David Rowe
|
9db0dd6fea
|
Fix Asset Browser's "Copy URL" context menu
|
2017-11-05 20:38:37 +13:00 |
|
Brad Hefta-Gaub
|
c1dfa24c12
|
Merge pull request #11743 from kencooke/audio-peakmeters-bugfix
Fix the audio input device peak meters
|
2017-11-04 13:55:08 -07:00 |
|
ZappoMan
|
d4b4d188ed
|
allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU
|
2017-11-04 13:40:41 -07:00 |
|
Ken Cooke
|
9c1a33c826
|
Merge pull request #11748 from kencooke/audio-wasapi-update
Update WASAPI audio plugin
|
2017-11-04 09:25:00 -07:00 |
|
Ken Cooke
|
6ca9cc0239
|
Update WASAPI audio plugin
|
2017-11-03 18:40:55 -07:00 |
|
Dante Ruiz
|
539cf35f30
|
saving work
|
2017-11-03 17:14:27 -07:00 |
|
Brad Hefta-Gaub
|
d5eb670819
|
Merge pull request #11746 from highfidelity/RC-58
Merge RC58 into master
|
2017-11-03 12:50:02 -07:00 |
|
Melissa Brown
|
a14e98053e
|
Merge pull request #11138 from Nex-Pro/21466
Fix Avatar Rotation upon Teleporting Using PAL
|
2017-11-03 11:58:15 -07:00 |
|
Ryan Huffman
|
7210a457c9
|
Merge pull request #11740 from huffman/fix/placename-erase-domain-id
Fix domain id getting set to empty when adding place name
|
2017-11-03 11:37:07 -07:00 |
|
Zach Fox
|
c496429a85
|
Add Machine Fingerprint to receive_at endpoint txn'
|
2017-11-03 10:40:25 -07:00 |
|
Nex-Pro
|
3171418173
|
Update NameCard.qml
|
2017-11-03 17:21:35 +00:00 |
|
John Conklin II
|
c946e46506
|
Merge pull request #11737 from AndrewMeadows/scale-to-fit_RC-58
RC-58: scaleToFit() the model before updating render items
|
2017-11-03 09:46:20 -07:00 |
|
John Conklin II
|
ff36cbf45f
|
Merge pull request #11731 from sethalves/fix-ignore
stop drawing ignored avatars, even if PAL is still open
|
2017-11-03 09:45:03 -07:00 |
|
Ken Cooke
|
babaef8399
|
Fix the audio input device peak meters
|
2017-11-03 05:59:59 -07:00 |
|
Zach Fox
|
35343da281
|
Merge pull request #11739 from zfox23/commerce_setPassphraseWhenLogout
Reset Wallet passphrase when login username changes
|
2017-11-02 19:46:00 -07:00 |
|
Zach Fox
|
6f3c61c4e0
|
Slightly modify invalid cert language
|
2017-11-02 17:59:36 -07:00 |
|
Brad Hefta-Gaub
|
6dbffe2367
|
Merge pull request #11736 from AndrewMeadows/scale-to-fit
scaleToFit() the model before updating render items
|
2017-11-02 17:49:05 -07:00 |
|
Brad Hefta-Gaub
|
6049582600
|
Merge pull request #11738 from jherico/ssl_dll_fix
Fix finding the SSL binary path
|
2017-11-02 17:47:57 -07:00 |
|
Ryan Huffman
|
b1fe3699f9
|
Fix domain id getting set to empty when adding place name
|
2017-11-02 17:42:24 -07:00 |
|
John Conklin II
|
b990b4f3e0
|
Merge pull request #11726 from NissimHadar/newHazeZoneUpdate
RC-58: Fix entity serialization bug due to Zone Haze group properties
|
2017-11-02 16:40:01 -07:00 |
|
John Conklin II
|
a4e6b2911d
|
Merge pull request #11734 from highfidelity/stable
Make sure RC-58 is up to date with stable
|
2017-11-02 16:39:27 -07:00 |
|
John Conklin II
|
05fd9f45d5
|
Merge pull request #11733 from sethalves/pr-11731-for-rc-58
stop drawing ignored avatars, even if PAL is still open
|
2017-11-02 16:20:15 -07:00 |
|
Zach Fox
|
6173ad810b
|
Reset wallet passphrase when login username changes
|
2017-11-02 15:48:59 -07:00 |
|
Zach Fox
|
48979a5ce8
|
Merge pull request #11730 from zfox23/pop_avatarEntityTests
Commerce: Avatar Entity Tests
|
2017-11-02 15:34:37 -07:00 |
|
Brad Davis
|
56b1c7d0ee
|
Fix finding the SSL binary path
|
2017-11-02 14:51:40 -07:00 |
|
Stephen Birarda
|
25c10d5de2
|
Merge pull request #11735 from highfidelity/stable
Merge stable back into master
|
2017-11-02 14:22:31 -07:00 |
|
Zach Fox
|
23e627a46f
|
Send empty decrypted text if impossible to decrypt
|
2017-11-02 13:46:24 -07:00 |
|
Andrew Meadows
|
2b06df1c33
|
call Model::scaleToFit() before update render items
|
2017-11-02 12:52:46 -07:00 |
|
Andrew Meadows
|
60fce3d4f7
|
make Model::scaleToFit() public not protected
|
2017-11-02 12:52:31 -07:00 |
|
Andrew Meadows
|
490483fde8
|
call Model::scaleToFit() before update render items
|
2017-11-02 12:32:51 -07:00 |
|
Andrew Meadows
|
db9c3cc103
|
make Model::scaleToFit() public not protected
|
2017-11-02 12:31:36 -07:00 |
|
Seth Alves
|
e77b9e0e97
|
stop drawing ignored avatars, even if PAL is still open
|
2017-11-02 10:23:26 -07:00 |
|
Zach Fox
|
19945c5991
|
Update cert UI
|
2017-11-02 10:22:00 -07:00 |
|