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
Anthony Thibault
7f2e427584
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
...
This is a hybrid of None and Drop strategies.
Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.
2018-12-03 18:56:45 -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
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
Wayne Chen
43b5a14180
fixing missing header function
2018-11-30 20:25:35 -08:00
sabrina-shanman
243a1d6598
Add ModelFormatRegistry for handling model loading on the application side
2018-11-30 16:50:53 -08:00
Zach Fox
0d66d230c5
Merge branch 'master' of github.com:highfidelity/hifi into payOut1
2018-11-30 16:45:03 -08:00
Wayne Chen
224ad28ed7
lowering banner/adding space btwn cancel/signup
2018-11-30 13:09:54 -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
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
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
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
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
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
Sam Gondelman
4d621ba61c
Merge branch 'master' into splash
2018-11-27 16:01:07 -08:00
SamGondelman
1f354f813c
rework shader pre-compilation
2018-11-27 14:38:02 -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
Wayne Chen
d5e16ae920
removing login state sound
2018-11-27 13:31:41 -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
Wayne Chen
94789d0170
standardizing font of text fields
2018-11-26 21:06:42 -08:00
Wayne Chen
1258676d56
fixing text height/toolbar coming back
2018-11-26 21:01:34 -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
Wayne Chen
c53febceac
adding oculus to login dialog/adding focus wip
2018-11-26 15:10:04 -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
Wayne Chen
bf285b3570
adding experimental login state sound
2018-11-21 14:14:07 -08:00
Wayne Chen
51f5942a7f
adding sound to login screen
2018-11-21 13:36:36 -08:00
sam gateau
be03859ed6
Warnings from build
2018-11-21 13:31:54 -08:00
Wayne Chen
d12655ed7b
sfx to login mousearea/hiding desktop toolbar
2018-11-21 12:21:19 -08:00
sam gateau
44b9b92450
Getting ready for merge
2018-11-20 17:32:04 -08:00
Wayne Chen
cdee10d0b8
getting dominant hand laser + sign up working
2018-11-20 16:54:16 -08:00
sabrina-shanman
be511378cd
Merge branch 'master' into hfm_serializer
2018-11-20 13:42:24 -08:00
Wayne Chen
4d55081184
changing the keyboard password flag appropriately
2018-11-20 10:56:34 -08:00
Wayne Chen
5f658b90ff
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-11-20 10:44:29 -08:00
Wayne Chen
d55c9467e7
fixing keyboard offset
2018-11-20 10:37:30 -08:00
Dante Ruiz
db607e564f
fixing keyboard mallets dimensions
2018-11-20 09:13:07 -08:00
SamGondelman
372f4390e8
replicate default skybox
2018-11-19 19:14:07 -05:00
sam gateau
84cd2a8ef6
Merge branch 'master' of github.com:highfidelity/hifi into one
2018-11-19 15:23:55 -08:00
Wayne Chen
e0eba2135a
Merge branch 'master' into loginInitiative2
2018-11-19 15:23:43 -08:00
Wayne Chen
2820328137
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-11-19 15:21:24 -08:00
Wayne Chen
1419ec907b
adding wip
2018-11-19 13:57:55 -08:00
Ryan Huffman
c87748830f
Merge pull request #14430 from thoys/fix/create/propertiesAutoScrollOnNewEntity
...
MS19903: don't trigger virtual keyboard scroll on non input focus.
2018-11-19 13:52:22 -08:00
David Rowe
7ffa70d0ac
Fix memory accumulating while Interface is minimized
2018-11-20 09:36:58 +13:00
Thijs Wenker
84e8e21d85
don't trigger virtual keyboard scroll on non input focus.
2018-11-19 21:08:21 +01:00
John Conklin II
6b25179aa9
Merge pull request #14420 from danteruiz/fix-keyboard-loging-issue
...
Dismiss keyboard when backout of the login screen
2018-11-19 09:58:54 -08:00
John Conklin II
d63a850ec0
Merge pull request #14409 from danteruiz/keyboard-touchups
...
keyboard address some feedback
2018-11-19 09:48:00 -08:00
Wayne Chen
3555276817
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-11-19 09:02:30 -08:00
Wayne Chen
b8d8710604
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-19 09:02:16 -08:00
vladest
db82994b4d
Merge branch 'master' into qml_warning_fix
2018-11-18 16:10:21 +01:00
Sam Gateau
837b321004
merging with master
2018-11-17 10:35:05 -08:00
Alexander Ivash
fe43c733f8
FB19400 during shutdown -- TypeError: Cannot read property 'buttons'
2018-11-17 22:56:59 +05:30
vladest
932d1dbcd7
Fixed width binding loop warning
2018-11-17 17:20:02 +01:00
vladest
53b7cc1376
Fix QML achoring warnings on Layouts
2018-11-17 15:06:25 +01:00
SamGondelman
0fccb4c73c
move to batch, try to use static
2018-11-17 01:45:16 -08:00
Sam Gateau
5f062bbcf5
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-11-16 20:05:08 -08:00
Dante Ruiz
4388763c34
fixing keyboard not being dismissing when backout of the login screen
2018-11-16 16:04:40 -08:00
Jason Najera
da3ea682ba
Merge pull request #14347 from r3tk0n/19550-oculus-store-v2
...
MS19550 - Don't show help for HMDs that aren't plugged in and active
2018-11-16 15:49:46 -08:00
SamGondelman
cbe5814c64
shader compilation prototype
2018-11-16 15:18:56 -08:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading
...
Fixing case of interstitial not finishing loading
2018-11-16 14:53:01 -08:00
Dante Ruiz
a77121a588
keyboard touch ups
2018-11-16 14:20:17 -08:00
Shannon Romano
ba699e3e9b
Merge pull request #14273 from NissimHadar/MAC
...
Case 19722 - Auto-Tester on Mac.
2018-11-16 12:49:58 -08:00
Wayne Chen
4f1361c0ea
adding keyboard following login dialog
2018-11-16 12:31:22 -08:00
sam gateau
9dd6c8d9d9
Merge branch 'master' of github.com:highfidelity/hifi into one
2018-11-16 11:55:44 -08:00
Wayne Chen
a2a09bc2b9
fixing compile error
2018-11-16 11:16:24 -08:00
Sam Gateau
0166d7748a
Merging with master around rc76 cut time
2018-11-15 22:52:37 -08:00
Wayne Chen
27f02c072a
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-15 18:49:49 -08:00
Wayne Chen
02248e77e4
got the overlay to start recentering
2018-11-15 17:03:55 -08:00
Howard Stearns
8e1785bd90
security settings post-oculus-store wording
2018-11-15 15:59:52 -08:00
Jamil Akram
35ec0b60ab
Merge pull request #14251 from humbletim/fb18302-deprecated-package-model
...
FB18302 Remove deprecated Package Model functionality
2018-11-15 15:52:04 -08:00
John Conklin II
1ea2ab338e
Merge pull request #13975 from ElderOrb/FB16697
...
Fix multiple issues on 'Calibration' tab of 'Controls' dialog
2018-11-15 14:54:26 -08:00
r3tk0n
60832b071c
Fix logic for cases with rift headset but no touch controllers.
2018-11-15 14:08:38 -08:00
John Conklin II
8177d5bbcd
Merge pull request #14275 from Atlante45/fix/injector-crash
...
Rework audio data memory ownership model to fix injector crashes
2018-11-15 13:25:42 -08:00
Dante Ruiz
20ad05726e
entity server timout
2018-11-15 10:52:40 -08:00
NissimHadar
e6190eb429
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-15 10:45:05 -08:00
Jeff Clinton
c72dd3d690
Merge pull request #14395 from ctrlaltdavid/M19859
...
Fix Goto app clicks not working
2018-11-15 09:56:56 -08:00
Wayne Chen
bf731f32b9
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-15 09:46:32 -08:00
Jamil Akram
60b58977cd
Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease
...
FB17479 - Fix scripted key release events for handshakes.
2018-11-15 09:21:32 -08:00
Wayne Chen
e787fd5371
experimenting with overlay pos/rot. update
2018-11-15 08:02:28 -08:00
humbletim
d0e4c62978
fix merge conflict
2018-11-14 23:50:02 -05:00
humbletim
21030fbe5b
Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model
2018-11-14 23:40:04 -05:00
NissimHadar
a74e123229
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
2018-11-14 20:20:41 -08:00
Atlante45
31033ad685
Update TTS audio API use
2018-11-14 15:42:39 -08:00
Wayne Chen
c85b840db0
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-14 14:47:56 -08:00
Wayne Chen
6707bf55ef
experimenting login overlay following hmd
2018-11-14 14:46:59 -08:00
Clement
7f910a38e3
Update keyboard injector to new interface
2018-11-14 14:46:08 -08:00
Clement
7192aed131
Rework audio data memory ownership model
2018-11-14 14:45:18 -08:00
John Conklin II
b08283d9e9
Merge pull request #14401 from sethalves/rc76-revert-pr-14238
...
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
2018-11-14 14:38:34 -08:00
Wayne Chen
76f33ff853
dont allow auto-switch after display mode change
2018-11-14 13:27:00 -08:00
David Rowe
9c5d318341
Fix highlighting
2018-11-15 10:15:30 +13:00
Seth Alves
1593c1185a
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
2018-11-14 12:29:09 -08:00
SamGondelman
079d1dcbd6
convert clientOnly to entityHost and add local entities
2018-11-14 11:25:37 -08:00
David Rowe
010f7121a3
Fix Goto app clicks not working
...
Includes better card highlighting fix.
2018-11-14 15:27:18 +13:00
Wayne Chen
7375840eda
adding 3d keyboard/get anchor id wip for reposition
2018-11-13 17:09:47 -08:00
Thijs Wenker
0248323bee
fix test path
2018-11-14 01:05:38 +01:00
Thijs Wenker
cc207537a3
Fix for unintended snapshots while parenting/un-parenting
2018-11-14 01:05:38 +01:00
Thijs Wenker
afd69d04dd
Make ctrl+shift shortcuts work for create app
2018-11-14 01:05:37 +01:00
sabrina-shanman
e08bc7296f
Merge branch 'master' into hfm_serializer
2018-11-13 15:41:49 -08:00
r3tk0n
dd8bbeb0e5
Clean up code and remove comments.
2018-11-13 15:36:25 -08:00
r3tk0n
ecee319602
Get logic working correctly.
2018-11-13 15:20:46 -08:00
John Conklin II
79e67ad45f
Merge pull request #14238 from ElderOrb/FB19400
...
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
2018-11-13 15:07:21 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
...
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -08:00
Jeff Clinton
2afc8c505d
Merge pull request #14344 from ElderOrb/FB19348
...
FB19348 - Interface doesn't save changes to avatar animation text field
2018-11-13 14:29:25 -08:00
Wayne Chen
e84361f267
getting hmd/desktop switch working
2018-11-13 14:20:23 -08:00
Jamil Akram
822e4bfe48
Merge pull request #14386 from ctrlaltdavid/M19820
...
Fix entities not loading when Interface doesn't have focus
2018-11-13 13:45:42 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
...
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
4cab805392
Merge pull request #12718 from gcalero/tester_flag
...
Detect if Interface is running on an android testing device
2018-11-13 13:13:52 -08:00
Brad Hefta-Gaub
153b8920be
Merge pull request #14348 from sabrina-shanman/hfm_library
...
(case 19302) Create the HFM library and namespace
2018-11-13 12:03:53 -08:00
Brad Hefta-Gaub
b5e432bcb1
Merge pull request #14265 from amantley/needToSquat
...
Bug fix for Users unable to Squat
2018-11-13 12:01:06 -08:00
Brad Hefta-Gaub
41d8220cbd
Merge pull request #14362 from ctrlaltdavid/M19768
...
Add option to enable/disable the mini tablet
2018-11-13 11:59:24 -08:00
