Stephen Birarda
3ce47631b7
move the intercepted web engine profile to BaseWebView
2016-10-17 14:25:59 -07:00
Brad Davis
1e9c369660
Add GPU buffer and texture current counts to the main stats display
2016-10-17 14:02:14 -07:00
howard-stearns
e7392acb10
directory picker works when choosing the initial value
2016-10-17 13:50:23 -07:00
Ryan Huffman
1432a7c951
Update gamepad help image
2016-10-17 12:43:39 -07:00
Stephen Birarda
b4b5c648c2
use a QWebEngineProfile request interceptor for auth in HTTP header
2016-10-17 11:34:37 -07:00
Howard Stearns
313e3e7b6d
git rid of wacky scaling
2016-10-15 18:18:24 -07:00
David Rowe
a767a27e7e
Merge branch 'master' into 21070
...
Conflicts:
interface/resources/qml/AddressBarDialog.qml
2016-10-16 14:09:53 +13:00
David Rowe
bfc9974fb7
Alter layout of spacebar row
2016-10-15 12:17:59 +13:00
David Rowe
7e4f494e96
Fix no keyboard when renaming item directly in Asset Server dialog
2016-10-15 11:19:38 +13:00
howard-stearns
25f121b462
close button for address bar
2016-10-14 15:10:55 -07:00
David Rowe
c9c5436080
Fix auto scrolling dialogs when keyboard raised
2016-10-15 10:34:54 +13:00
David Rowe
94e20d9a13
Fix login dialog keyboard
2016-10-14 14:29:14 +13:00
David Rowe
0e3cb3eabf
Merge branch 'master' into 21070
2016-10-14 13:29:38 +13:00
David Rowe
8f42a3fe9e
Fix keyboard state in browser when switching focus to/from dialog frame
2016-10-14 12:14:23 +13:00
David Rowe
64c54f9c6b
Fix keyboard in new browser window opened from Web view
2016-10-14 10:03:52 +13:00
Chris Collins
b41d72a9fd
Merge pull request #8777 from hyperlogic/bug-fix/oculus-touch-fixes
...
Bug fixes in oculus_touch default mapping
2016-10-13 10:57:27 -07:00
David Rowe
2343e02454
Fix a couple of QML errors
2016-10-13 18:16:21 +13:00
David Rowe
a75925d1e3
Add numeric shift
2016-10-13 14:18:21 +13:00
David Rowe
2ef974f729
Fix alphabetic shift
2016-10-13 12:16:02 +13:00
David Rowe
4dfe290d4a
Add comma and period keys to last row of keyboard
2016-10-13 12:02:36 +13:00
David Rowe
5d390b4722
Revise positions of keys in keyboard
2016-10-13 11:45:14 +13:00
David Rowe
a359626316
Merge branch 'master' into 21070
2016-10-13 09:54:59 +13:00
David Rowe
e269a84d0e
Add placeholder "FIXME"s for making Web entity keyboard HMD-only
2016-10-13 09:35:39 +13:00
Anthony J. Thibault
aa52963e5d
Made the Grip buttons less sensitive to inadvertent squeezes.
2016-10-12 12:59:43 -07:00
David Rowe
18f19b07d4
Fix checkbox not being disabled per dropdown default
...
And tweak checkbox position.
2016-10-13 08:37:30 +13:00
David Rowe
86f6cee2ad
Fix Asset Browser add-to-world drop-down
2016-10-12 20:08:33 +13:00
David Rowe
ee31e3b896
Fix Asset Browser add-to-world with spaces unwittingly appended to names
2016-10-12 20:08:15 +13:00
Brad Hefta-Gaub
f532affdf3
hardwire xbox to match help
2016-10-11 14:39:45 -07:00
David Rowe
49709b42d7
Merge branch 'master' into 21070
2016-10-12 09:45:34 +13:00
David Rowe
31b35f0a35
Only raise keyboard if in HMD display mode
2016-10-12 09:43:33 +13:00
Anthony J. Thibault
ace8639f5b
Bug fixes in oculus_touch default mapping
...
* Made sticks less sensitive. Raised deadSpot min from 0.05 to 0.3.
* Fixed problem were grip and trigger was mapped to Standard triggers. This was causing all sorts of problems
with the handControllerGrab script. Including double lasers and a stuck right hand laser.
* mapped grip to standard grip. So now you can use the grip button to drop equipped objects.
* increased deadZone on grip to make inadvertent drops less likely to happen.
2016-10-10 18:42:06 -07:00
David Rowe
552f276a06
Load avatar browser dialog such that JavaScript EventBridge works
2016-10-11 11:12:57 +13:00
David Rowe
d0900ec75e
Add keyboard to avatar browser dialog
2016-10-11 10:11:36 +13:00
Chris Collins
2b8765b47e
Merge pull request #8765 from ctrlaltdavid/fix-address-bar
...
Fix address bar not being able to regain focus
2016-10-10 10:11:34 -07:00
David Rowe
827c2b015b
Update other dialogs to use single keyboard QML file
2016-10-09 11:52:30 +13:00
David Rowe
12f4b2854d
Fix address bar not being able to regain focus
2016-10-08 19:38:57 +13:00
David Rowe
5a4665b02f
Combine numeric keys into alpha keyboard QML file for scrolling windows
2016-10-08 16:27:51 +13:00
David Rowe
b954852ba9
Use temporary copy of keyboard QML file while refactoring
2016-10-08 15:23:11 +13:00
David Rowe
a934f59c2a
Fix virtual keyboard in login dialog
2016-10-08 13:37:31 +13:00
Ryan Huffman
6476dfecc6
Update help window images
2016-10-07 16:06:26 -07:00
Howard Stearns
3a294e77d4
Merge pull request #8745 from huffman/feat/new-help-window
...
Update the help window
2016-10-07 10:01:47 -07:00
David Rowe
bdff71151d
Updates from code review
2016-10-07 13:35:44 +13:00
David Rowe
e2e762f9e7
Merge branch 'master' into 21055
...
Conflicts:
interface/resources/qml/AddressBarDialog.qml
2016-10-07 11:27:35 +13:00
David Rowe
b6221a5f83
Fix clearing address bar after navigating using picture card
2016-10-07 09:45:34 +13:00
Ryan Huffman
a74b8f3f24
Update help window images
2016-10-06 13:37:56 -07:00
Ryan Huffman
508950841b
Adjust the img size in help.html
2016-10-06 13:22:59 -07:00
Ryan Huffman
e59069fe35
Update help window images
2016-10-06 13:00:07 -07:00
Ryan Huffman
246a816b80
Update help window tabs to activate on mouse down instead of up
2016-10-05 22:54:39 -07:00
David Rowe
1ee9317234
Fix clearing address and cursor upon address bar closing
2016-10-06 17:00:25 +13:00
David Rowe
a347936b68
Fix location not being updated after using back and forwards buttons
2016-10-06 16:47:49 +13:00
David Rowe
2807f76e68
Fix semantics of function parameter
2016-10-06 15:49:16 +13:00
David Rowe
742e603fd6
Show cursor if user clicks in address bar
2016-10-06 15:21:08 +13:00
David Rowe
7d23cd7c7c
Don't show cursor until after have started entering an address
2016-10-06 15:19:58 +13:00
David Rowe
b70eac353b
Enable address entry by typing without clicking in address bar
2016-10-06 15:18:07 +13:00
Ryan Huffman
0e3e2b8a9a
Update date in help.html
2016-10-05 15:50:49 -07:00
David Rowe
1a745094e2
Merge branch 'master' into 21055
...
Conflicts:
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-06 09:29:09 +13:00
Brad Hefta-Gaub
6f86ce8d3b
Merge pull request #8683 from jherico/oglplus_b_gone2
...
Remove all usage of oglplus
2016-10-05 09:59:42 -07:00
Brad Davis
d3d3aa587c
Remove oglplus usage from OpenVR
2016-10-02 11:44:33 -07:00
David Rowe
5e842843c6
Set alphabetic/numeric keyboard per field entered
2016-09-30 11:54:32 +13:00
David Rowe
e9a398472a
Remove duplicate keyboard
...
Fixes keyboard raising and lowering when select entity with editor open.
2016-09-29 12:09:04 +13:00
David Rowe
2933e37a0a
Fix field not scrolling into view when raise keyboard in settings
2016-09-29 10:47:15 +13:00
David Rowe
40bfbf4021
Prevent flicker of keyboard area when navigate to a new page in browser
2016-09-29 10:35:18 +13:00
David Rowe
52f2d36096
Move "," and "." to numeric keyboard for ready use with numeric fields
2016-09-29 10:17:31 +13:00
David Rowe
f8572096b1
Merge branch 'master' into 21055
2016-09-28 20:00:04 +13:00
David Rowe
b60f649e0a
Scroll HTML window if necessary when raise keyboard
2016-09-28 19:27:16 +13:00
David Rowe
2344d15dbc
Raise and lower keyboard for HTML fields in Marketplace window
2016-09-28 16:41:01 +13:00
David Rowe
875566d956
Raise and lower keyboard for HTML fields in Browser window
2016-09-28 16:40:38 +13:00
David Rowe
ec00129988
Don't flood event bridge with raise/lower keyboard messages from HTML
2016-09-28 12:51:00 +13:00
howard-stearns
39d352e1a7
display location/connection status in address bar when it doesn't have
...
focus
2016-09-26 11:27:50 -07:00
David Rowe
bc8c400448
Fix up keyboards in attachments dialogs
2016-09-26 16:39:34 +13:00
David Rowe
302c8ede60
Miscellaneous fixes
2016-09-26 15:34:39 +13:00
David Rowe
7d1d71084d
Add keyboard to custom query dialog
2016-09-26 14:32:29 +13:00
David Rowe
023efe05f0
Move keyboard QML files
2016-09-25 09:54:48 +13:00
David Rowe
5b6835fbdb
Fix defocusing
2016-09-24 21:23:30 +12:00
David Rowe
0f672c3aa2
Scroll content if necessary when keyboard is displayed
2016-09-24 18:56:35 +12:00
David Rowe
8663455d01
Unfocus field and hide keyboard when click in blank part of dialog
2016-09-24 17:34:02 +12:00
David Rowe
52137cb3c1
Put keyboard at bottom of scrolling dialogs rather than under controls
2016-09-24 11:40:38 +12:00
howard-stearns
c4ed84f9a6
remove obsolete file
2016-09-22 16:49:38 -07:00
howard-stearns
17549348b4
less busy hotspotting, and make use of restricted feed (by protocol)
2016-09-22 16:48:16 -07:00
Howard Stearns
8e9b743515
rollover images
2016-09-21 19:15:01 -07:00
Howard Stearns
660343f8c6
Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling
2016-09-21 16:31:50 -07:00
howard-stearns
41b20dc69d
single feed with snapshot and concurrency, no radio buttons, mini-card
...
has two hotspots that bring up different kinds of cards, and anywhere
else on the minicard takes you "there".
2016-09-21 16:00:29 -07:00
David Rowe
6f2956392e
Merge remote-tracking branch 'seth/qml-keyboard' into 21055
2016-09-22 08:45:58 +12:00
Seth Alves
2468b56079
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-20 13:28:20 -07:00
Brad Hefta-Gaub
8f5c5ebf0e
improved disabled preview wording
2016-09-19 18:19:35 -07:00
Brad Hefta-Gaub
41bbfcd578
Merge pull request #8603 from sethalves/quiet-logging
...
categorize some qDebugs
2016-09-15 18:09:11 -07:00
Seth Alves
4470338663
catagorize some qDebugs
2016-09-14 21:39:45 -07:00
howard-stearns
db20a8ceef
fix 1319
2016-09-14 11:20:09 -07:00
Seth Alves
1dace86df8
Merge branch 'qml-keyboard' of github.com:sethalves/hifi into qml-keyboard
2016-09-14 10:38:36 -07:00
Seth Alves
409ebe526b
qml keyboard for Browser window
2016-09-14 10:38:08 -07:00
Seth Alves
e6a1c14de6
Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard
2016-09-14 09:43:19 -07:00
Seth Alves
447de7cd5a
qml keyboard for edit.js window
2016-09-13 16:31:59 -07:00
Seth Alves
dff567054d
qml keyboard for avatar preferences dialog
2016-09-13 11:17:00 -07:00
Seth Alves
161424afaf
qml keyboard for browsable preferences
2016-09-12 21:39:52 -07:00
Seth Alves
753e4c4c7b
keyboard for avatar attachment model url dialog
2016-09-12 16:49:10 -07:00
Seth Alves
2c0676d9b1
make qml keyboard work better in running-scripts dialog
2016-09-12 16:28:24 -07:00
Seth Alves
b841e3094d
qml keyboard for file dialog
2016-09-12 16:23:05 -07:00
Seth Alves
3e86b2f0f2
remove some unneeded objectNames
2016-09-12 15:34:29 -07:00
Seth Alves
4c370d0d32
qml keyboard for query-dialog
2016-09-12 15:31:07 -07:00
David Rowe
fe8b3b4d0d
Merge branch 'master' into 21040
2016-09-13 09:12:47 +12:00