Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-06 20:18:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48351 commits 25 branches 0 tags 1.1 GiB
Commit graph

1072 commits

Author SHA1 Message Date
Stephen Birarda
e3f194b4dd use the err directly on upload error 2016-10-19 12:41:01 -07:00
Stephen Birarda
179cb67cdb change order of asset upload failure changes 2016-10-19 11:55:54 -07:00
Stephen Birarda
b80f3fbd7b fix error handling for failed asset upload 2016-10-19 11:37:35 -07:00
howard-stearns
36951c3c95 colors 2016-10-19 11:24:21 -07:00
howard-stearns
a5fc0d92a2 Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar 2016-10-19 11:11:05 -07:00
Howard Stearns
20ed77d425 Merge pull request #8840 from Atlante45/keyboard 
Add virtual keyboard for steam username collision
 2016-10-18 17:34:55 -07:00
Stephen Birarda
9f2627d31d Merge pull request #8828 from birarda/web-engine-interceptor 
move HF access token to authorization header
 2016-10-18 17:24:58 -07:00
David Rowe
c8e9e4ecd0 Fix suggestion card appearing behind keyboard 2016-10-19 10:13:07 +13:00
Ryan Huffman
3ad039cadc Update default system toolbar position 2016-10-18 13:57:03 -07:00
Atlante45
0858b3fc8d Inform user their Steam informations will not be shared 2016-10-18 12:07:18 -07:00
Stephen Birarda
5682d51667 use the HFWebEngineProfile in Desktop.qml 2016-10-18 11:42:55 -07:00
Atlante45
c40a027108 Add virtual keyboard for steam username collision 2016-10-18 11:16:14 -07:00
Stephen Birarda
c4cec8eb1e use desktop profile again, move classes to networking subdir 2016-10-18 10:22:31 -07:00
howard-stearns
ecd84bf23d desktop vertical 2016-10-18 10:05:39 -07:00
howard-stearns
0d2bd23874 cleanup 2016-10-18 09:38:55 -07:00
howard-stearns
0dd5c65036 Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar 2016-10-18 09:36:43 -07:00
howard-stearns
3ce3e57c38 Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar 2016-10-18 09:36:09 -07:00
Chris Collins
a9dd31f59d Merge pull request #8833 from jherico/gpu_stats 
Add GPU buffer and texture current counts to the main stats display
 2016-10-17 21:03:23 -07:00
Stephen Birarda
3cbdf13931 add intercepted profile to uit WebView 2016-10-17 15:04:33 -07:00
Stephen Birarda
4ec703b7dc remove unused import from uit WebView 2016-10-17 14:29:12 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
409ebe526b qml keyboard for Browser window 2016-09-14 10:38:08 -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
Seth Alves
38a1556716 qml keyboard for running-scripts window 2016-09-12 13:28:46 -07:00
Seth Alves
44af3b43cc fix property access 2016-09-09 17:02:11 -07:00
Seth Alves
c396196e0f show and hide keyboard for qml windows 2016-09-09 16:48:46 -07:00
Seth Alves
e5b56fec7c put keyboard on location dialog 2016-09-09 11:32:17 -07:00
Brad Hefta-Gaub
ad8a832c86 Merge pull request #8582 from howard-stearns/open-browser-and-close 
Handle window.open/close in Web content.
 2016-09-08 21:17:40 -07:00