Seth Alves
|
8f21ade0c7
|
make cmake -DDISABLE_QML=1 work again
|
2018-11-27 12:41:40 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
David Rowe
|
010f7121a3
|
Fix Goto app clicks not working
Includes better card highlighting fix.
|
2018-11-14 15:27:18 +13: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 |
|
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 |
|
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 |
|
Brad Hefta-Gaub
|
47cd6b332c
|
Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode
Bug fix for head trackers in desktop mode
|
2018-11-13 11:49:24 -08:00 |
|
NissimHadar
|
ef34ff622a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-13 11:11:53 -08:00 |
|
Dante Ruiz
|
1a95ee2b31
|
making requested changes
|
2018-11-13 11:11:18 -08:00 |
|
Dante Ruiz
|
10d045b11b
|
fix infinate loading if entity server is not running
|
2018-11-13 11:07:26 -08:00 |
|
Brad Hefta-Gaub
|
4bafcd2cfa
|
Merge pull request #14271 from SamGondelman/oculus
Case 19475: Fix various Oculus Store test failures
|
2018-11-13 11:06:39 -08:00 |
|
Brad Hefta-Gaub
|
63e52ba8bd
|
Merge pull request #14284 from ctrlaltdavid/M19404
Fix interstitial page not displaying at Interface start-up
|
2018-11-13 10:38:38 -08:00 |
|
NissimHadar
|
2011e7b94c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-13 10:12:52 -08:00 |
|