Dante Ruiz
089a223c2d
more CR changes
2018-12-12 15:29:01 -08:00
Dante Ruiz
f3fad52e1d
make CR changes
2018-12-12 13:29:32 -08:00
Dante Ruiz
51bdf1bf78
adding keyboards settings
2018-12-12 11:55:13 -08:00
Zach Fox
7dcf5da954
Merge pull request #14503 from zfox23/payOut1
...
Pay-Out API Frontend, Part One
2018-12-06 15:25:54 -08:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays
2018-12-06 11:29:06 -08:00
Jeff Clinton
43f84a9577
Merge pull request #14426 from ElderOrb/FB19400
...
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' of null
2018-12-06 11:18:39 -08:00
Zach Fox
a2af50a9d0
Show pre-auth'd transactions in Recent Activity before redemption
2018-12-06 11:07:26 -08:00
Jeff Clinton
b9156d68e5
Merge pull request #14508 from amantley/restingHandsBug
...
removed the code that turns off inactive hands in MyAvatar.cpp
2018-12-06 09:42:34 -08:00
Jeff Clinton
e8c1c4a27b
Merge pull request #14536 from danteruiz/fix-audio-switching
...
Respect changed audio settings when switch displays (Master)
2018-12-06 09:13:47 -08:00
Zach Fox
235b27a198
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
2018-12-05 16:35:07 -08:00
Zach Fox
02307d2308
Secret to Coupon ID
2018-12-05 16:34:53 -08:00
Dante Ruiz
3123bb37e4
fix audio switching issue
2018-12-05 10:34:47 -08:00
Brad Hefta-Gaub
77e1c98264
Merge pull request #14528 from sethalves/fix-delete-home
...
work around menu-item name hash collision for Home
2018-12-04 15:04:25 -08:00
John Conklin II
725cf6c526
Merge pull request #14518 from hyperlogic/bug-fix/puck-offsets
...
Head and Hand offsets for Vive Trackers now function as expected
2018-12-04 14:25:02 -08:00
Sam Gateau
d2ff4d4674
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-12-03 20:52:43 -08:00
Seth Alves
541d0ab4d6
work around menu-item name hash collision for Home
2018-12-03 17:33:04 -08:00
Zach Fox
ab184c5c2b
Authorized Script to Coupon
2018-12-03 15:16:06 -08:00
Clément Brisset
62f21822ce
Merge pull request #14494 from Atlante45/fix/agent-shutdown-crash
...
Fix Agent crash on shutdown
2018-12-03 14:17:35 -08:00
Anthony Thibault
c0bf832e39
Head and Hand offsets for Vive Trackers now function as expected
...
In the Settings > Controller... > Calibration menu, when using head or hand trackers
The provided Y and Z offsets should function correctly now. This gives you the ability to adjust
the offsets of the pucks to the hands/head. For example: this allows you to wear the hand pucks on your forearms
rather then the backs of your palms.
2018-12-02 16:18:36 -08:00
Zach Fox
0d66d230c5
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
2018-11-30 16:45:03 -08:00
Shannon Romano
1f29423a58
Merge pull request #14423 from vladest/qml_warning_fix
...
Fix QML achoring warnings on Layouts
2018-11-30 10:50:30 -08:00
Jeff Clinton
0bca290de2
Merge pull request #14485 from sethalves/crash-on-exits
...
suppress 'No instance available' messages during shutdown. try a dif…
2018-11-30 10:10:43 -08:00
amantley
88a9a96346
removed the code that turns off inactive hands in MyAvatar.cpp
2018-11-30 10:08:05 -08:00
Shannon Romano
0bf5be57f8
Merge pull request #14488 from danteruiz/limit-avatar-entity-data
...
don't save joint information for avatar entities in avatarbookmarks.json
2018-11-30 09:49:01 -08:00
Shannon Romano
dacf43d70c
Merge pull request #14483 from danteruiz/keyboard-toggle-option
...
Keyboard menu option in general settings
2018-11-30 09:43:10 -08:00
Shannon Romano
1b24d051f7
Merge pull request #14432 from ctrlaltdavid/M17988
...
Fix memory accumulating while Interface is minimized
2018-11-30 09:39:14 -08:00
Shannon Romano
08bbe27522
Merge pull request #14489 from ctrlaltdavid/M17990-a
...
Remove unused avatar attachment constant
2018-11-30 09:37:40 -08:00
Zach Fox
bc39dbba8b
Finish out the feature
2018-11-29 12:44:30 -08:00
Sam Gateau
54fa4365b8
FIxing build issue doh...
2018-11-28 22:21:58 -08:00
Sam Gateau
9353745054
MErge with master
2018-11-28 21:40:24 -08:00
Clement
181f2b4263
Fix Agent crash on shutdown
2018-11-28 18:40:52 -08:00
Jeff Clinton
f98f070c8b
Merge pull request #14445 from danteruiz/fix-stylus-dimensions
...
fixing keyboard mallets dimensions
2018-11-28 14:19:53 -08:00
David Rowe
1683179fe5
Remove unused constant
2018-11-29 09:14:10 +13:00
Shannon Romano
ff934a8f87
Merge pull request #14394 from sabrina-shanman/hfm_serializer
...
(case 20005) Create HFMSerializer interface for model loaders
2018-11-28 11:10:27 -08:00
Zach Fox
371c50b2ab
Start work on Pay Out UI
2018-11-28 11:01:40 -08:00
Dante Ruiz
8be775c2b7
don't save joint information for avatar entities
2018-11-28 10:54:39 -08:00
Zach Fox
022fea107f
Merge pull request #14476 from zfox23/payIn1
...
Pay-In API Frontend, Part One
2018-11-28 10:32:01 -08:00
Seth Alves
fac27553d7
suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient.
2018-11-27 17:02:48 -08:00
Zach Fox
a4175b0428
Error handling in checkout
2018-11-27 14:17:28 -08:00
Seth Alves
8f21ade0c7
make cmake -DDISABLE_QML=1 work again
2018-11-27 12:41:40 -08:00
Dante Ruiz
29028386c8
Keyboard menu option in general settings
2018-11-27 11:56:07 -08:00
Zach Fox
67dfccafec
Show item name when sending item
2018-11-27 10:19:14 -08:00
Zach Fox
a9fd443f28
'improve' UI slightly
2018-11-26 16:03:07 -08:00
Zach Fox
31f7d747c8
Bugfixes; enable purchase asset from marketplace screen raise
2018-11-26 15:48:49 -08:00
Zach Fox
8df5db4239
Allow scripts to open SendAsset screen with pre-filled info
2018-11-26 13:26:17 -08:00
SamGondelman
e282d51883
CR
2018-11-26 01:15:07 -05:00
sam gateau
9ee35def3d
trying to fix the include issue
2018-11-21 15:42:35 -08:00
sam gateau
be03859ed6
Warnings from build
2018-11-21 13:31:54 -08:00
sam gateau
44b9b92450
Getting ready for merge
2018-11-20 17:32:04 -08:00
sabrina-shanman
be511378cd
Merge branch 'master' into hfm_serializer
2018-11-20 13:42:24 -08:00
