Wayne Chen
a30f4ed0b3
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-12-05 08:17:06 -08:00
Wayne Chen
07599c02c8
true reversion of scrips param
2018-12-05 08:16:54 -08:00
Wayne Chen
4daa943510
fixing scripts param/reverting some qml
2018-12-04 17:17:58 -08:00
Wayne Chen
2a77a29f8a
Delete LoginScreenDialog.qml
2018-12-04 17:07:03 -08:00
Wayne Chen
57b21730de
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-04 17:01:56 -08:00
Wayne Chen
3951203b55
adding tablet bg/no movement in login state
2018-12-04 16:50:01 -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
Wayne Chen
2d8b638370
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-04 14:19:28 -08:00
Wayne Chen
a24cd41367
getting textfield into focus
2018-12-04 14:19:09 -08:00
Wayne Chen
1375e85f2c
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-04 10:21:12 -08:00
Wayne Chen
e7e42e3430
adding steam linking
2018-12-04 10:03:40 -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
Wayne Chen
dc3381d4a9
updating artwork
2018-12-03 17:28:10 -08:00
Wayne Chen
22bf4fc5c4
removing fromBody
2018-12-03 16:11:13 -08:00
Wayne Chen
5beb810604
adding more steam login flow
2018-12-03 16:09:10 -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
Wayne Chen
43b5a14180
fixing missing header function
2018-11-30 20:25:35 -08:00
Wayne Chen
09bc886c20
Merge branch 'master' into loginInitiative2
2018-11-30 13:05:17 -08:00
Wayne Chen
c8783776fe
removing mousearea, fixing continue button
2018-11-30 13:02:29 -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
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
Wayne Chen
5e82bc78b7
fixing sign up screen
2018-11-29 20:17:18 -08:00
Wayne Chen
707339dd2a
allowing clicking any mousearea back to the textfield/disable movement ctrls
2018-11-29 17:18:40 -08:00
Wayne Chen
e033492472
enable mouse capture upon resume
2018-11-29 15:40:00 -08:00
Wayne Chen
62848700f3
disable mouse capture in login state
2018-11-29 15:37:35 -08:00
Wayne Chen
a80017c8c3
fixing typo
2018-11-29 15:04:34 -08:00
Wayne Chen
ba62cbf45c
making lasers appear on the tip of the mallets
2018-11-29 14:17:39 -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
Wayne Chen
295d40724a
adding difference in text shown between tablet/other mode
2018-11-28 19:24:47 -08:00
Wayne Chen
34fb7159e2
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-11-28 19:24:20 -08:00
Wayne Chen
b0fb7778cf
fixing some text, turning off lasers until they intersect login overlay
2018-11-28 19:17:30 -08:00
Wayne Chen
9deb15b9f6
Merge branch 'master' into loginInitiative2
2018-11-28 19:10:20 -08:00
Clement
181f2b4263
Fix Agent crash on shutdown
2018-11-28 18:40:52 -08:00
Wayne Chen
527f8a2b59
UI feedback + new overlay position update
2018-11-28 15:38:37 -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
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
Wayne Chen
d8a1c4e956
reverting header in qml
2018-11-27 14:34:58 -08:00
Zach Fox
a4175b0428
Error handling in checkout
2018-11-27 14:17:28 -08:00
