SamGondelman
|
7d420f5242
|
isLeftHand, isRightHand, isMouse
|
2017-11-06 12:29:21 -08:00 |
|
SamGondelman
|
55ac585cd9
|
Merge remote-tracking branch 'upstream/master' into ui
|
2017-11-03 17:32:13 -07:00 |
|
SamGondelman
|
ce58b6c401
|
trying to fix HUD events, abstracting touch event logic (wip), seth's comments
|
2017-11-03 17:15:30 -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 |
|
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 |
|
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 |
|
SamGondelman
|
dd4275430b
|
fix hover events, working on HUD events
|
2017-11-02 17:48:37 -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 |
|
Stephen Birarda
|
4842da1388
|
Merge pull request #11729 from huffman/fix/cloud-domain-wizard-domain-id
Update wizard to make request for domain info
|
2017-11-02 10:09:05 -07:00 |
|
Zach Fox
|
f8718efe25
|
Fix warnings
|
2017-11-02 09:42:33 -07:00 |
|
Ken Cooke
|
667f091a61
|
Merge pull request #11727 from huffman/fix/metaverse-url-comment
Fix comment in NetworkingConstants referencing shared.js location
|
2017-11-02 07:14:12 -07:00 |
|
Seth Alves
|
12792c3821
|
stop drawing ignored avatars, even if PAL is still open
|
2017-11-01 17:26:00 -07:00 |
|
Ryan Huffman
|
8401aecef5
|
Update wizard to make request for domain info
|
2017-11-01 16:04:26 -07:00 |
|
Ryan Huffman
|
edc7b91a42
|
Fix comment in NetworkingConstants referencing shared.js location
|
2017-11-01 12:57:07 -07:00 |
|
Zach Fox
|
bb1ffbc06f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests
|
2017-11-01 12:38:34 -07:00 |
|
Zach Fox
|
72d61f1825
|
Remove unnecessary log - static verif isn't working
|
2017-11-01 12:03:44 -07:00 |
|
Zach Fox
|
56cb98d96f
|
Make inspection cert work
|
2017-11-01 12:02:57 -07:00 |
|
Zach Fox
|
b335ba9a75
|
Timeout timer
|
2017-11-01 11:34:29 -07:00 |
|
Nissim Hadar
|
3d3c93f1a5
|
Fixes Bug 8802
|
2017-11-01 11:23:18 -07:00 |
|
Zach Fox
|
8a6a744099
|
It's working
|
2017-11-01 10:46:13 -07:00 |
|
Ryan Huffman
|
9a0a74c9b9
|
Merge pull request #11723 from Atlante45/fix/ds-config-version
Move DS config version to config file
|
2017-11-01 10:05:50 -07:00 |
|
Zach Fox
|
82816b5551
|
Merge pull request #11720 from zfox23/commerce_getToBuy
Change 'GET' to 'BUY' when hovering over costed items
|
2017-11-01 09:49:39 -07:00 |
|
SamGondelman
|
657a0fb036
|
Merge remote-tracking branch 'upstream/pointers' into ui
|
2017-10-31 17:41:14 -07:00 |
|
Atlante45
|
7616fe193c
|
Migrate the DS config version to the config file
|
2017-10-31 17:35:23 -07:00 |
|
SamGondelman
|
5a7298f15b
|
Merge remote-tracking branch 'upstream/master' into pointers
|
2017-10-31 17:33:52 -07:00 |
|
SamGondelman
|
64665c87b2
|
replace ids with unsigned ints
|
2017-10-31 17:07:48 -07:00 |
|
Zach Fox
|
93308dfcd3
|
Why did I think this would work before?
|
2017-10-31 16:21:10 -07:00 |
|
Stephen Birarda
|
b8370128ce
|
remove master config from HifiConfigVariantMap/domain-server
|
2017-10-31 16:19:50 -07:00 |
|
Sam Gateau
|
be74b5c9ed
|
Merge pull request #11692 from NissimHadar/hazeZone
Bug fixes 8672-8673-8674 related to Zone entity Haze component
|
2017-10-31 15:25:32 -07:00 |
|