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

18105 commits

Author SHA1 Message Date
Seth Alves
e247f0aa34 Merge pull request #8850 from zzmp/fix/model-attachment-lifetime 
ensure model attachment lifetimes
 2016-10-19 09:56:02 -07:00
Brad Hefta-Gaub
6bd193cdd8 hacking 2016-10-18 21:33:37 -07:00
Stephen Birarda
18523558f7 move HFWebEngineProfile back to interface/networking 2016-10-18 20:04:11 -07:00
Brad Davis
61e5e2861e Rate limit QML web surfaces 2016-10-18 19:29:11 -07:00
Zach Pomerantz
a9bad592f9 ensure model attachment lifetimes 2016-10-18 18:01:18 -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
Stephen Birarda
f8e0d7ad88 move QWebEngine classes to ui library 2016-10-18 12:53:32 -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
Stephen Birarda
a45677c2a2 mark intercept override, only add header for HTTPS 2016-10-18 10:03:46 -07:00
Brad Hefta-Gaub
834a15a03b Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-18 10:01:57 -07:00
Brad Hefta-Gaub
c50cd865e5 add RTClick and LTClick support to gamepad 2016-10-18 09:50:35 -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
Brad Hefta-Gaub
0d48eb55b9 Merge pull request #8835 from zzmp/fix/entity-del-deadlock 
fix deadlock when removing tablet
 2016-10-18 01:21:55 -07:00
Brad Hefta-Gaub
13e5c31d0d Merge pull request #8829 from jherico/gpu_leak 
Fix GPU buffer leak in geometry cache / overlays
 2016-10-18 01:12:44 -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
Seth Alves
ff32ddae01 Merge pull request #8832 from howard-stearns/fix-directory-picker-when-choosing-default 
directory picker works when choosing the initial value
 2016-10-17 17:40:25 -07:00
Brad Davis
99ed7ac08c Fix shutdown crash (hopefully) 2016-10-17 17:38:10 -07:00
Stephen Birarda
3cbdf13931 add intercepted profile to uit WebView 2016-10-17 15:04:33 -07:00
howard-stearns
7a3c14683e switchable placeholder for domain-connection failure, currently a modal 2016-10-17 14:50:46 -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
Zach Pomerantz
95eb52ad17 bail early when removing entity focus 2016-10-17 14:02:22 -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
Brad Hefta-Gaub
bf4489f3cf Merge pull request #8830 from huffman/feat/update-gamepad-help 
Update gamepad help image
 2016-10-17 13:30:44 -07:00
Chris Collins
f1b2dd8b1a Merge pull request #8825 from howard-stearns/recover-from-cancelled-snapshot-directory 
check for empty snapshot dir, and default to temp
 2016-10-17 13:21:58 -07:00
Chris Collins
1c30d98cf9 Merge pull request #8823 from ZappoMan/shutdownSandbox 
Auto-shutdown of sandbox if it was launched by interface
 2016-10-17 13:20:15 -07:00
Brad Hefta-Gaub
dcab5a5dbc fix unix warning 2016-10-17 13:12:24 -07:00
Brad Hefta-Gaub
c575e19b81 more CR feedback 2016-10-17 13:09:10 -07:00
Ryan Huffman
1432a7c951 Update gamepad help image 2016-10-17 12:43:39 -07:00
Brad Davis
dde79ef3c5 Fix GPU buffer leak in geometry cache / overlays 2016-10-17 12:22:20 -07:00
Brad Hefta-Gaub
d5c87a0db6 CR feedback 2016-10-17 12:02:23 -07:00
Stephen Birarda
edc83f547b only add token for HFWebEngineProfile if present 2016-10-17 11:34:37 -07:00
Stephen Birarda
b4b5c648c2 use a QWebEngineProfile request interceptor for auth in HTTP header 2016-10-17 11:34:37 -07:00
Stephen Birarda
89a4bc8434 add custom QWebEngine request interceptor 2016-10-17 11:34:10 -07:00
Brad Hefta-Gaub
d46170bec0 auto shutdown of sandbox when interface quits 2016-10-17 07:55:24 -07:00
Howard Stearns
baea0f5cb0 create a directory chooser that works in hmd, and use it 2016-10-16 17:27:51 -07:00
Howard Stearns
615325c17f check for empty snapshot dir, and default to temp 2016-10-16 12:25:32 -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
Chris Collins
90b283f83b Merge pull request #8806 from huffman/fix/atp-script-cache 
Update ScriptCache to clear ATP assets when disconnected from a domain
 2016-10-13 16:30:29 -07:00
David Rowe
8f42a3fe9e Fix keyboard state in browser when switching focus to/from dialog frame 2016-10-14 12:14:23 +13:00
Ryan Huffman
decb94b719 Update ScriptCache to clear ATP assets when disconnected from a domain 2016-10-13 14:05:53 -07:00
David Rowe
64c54f9c6b Fix keyboard in new browser window opened from Web view 2016-10-14 10:03:52 +13:00
Brad Hefta-Gaub
0e1b377227 Merge pull request #8785 from jherico/oculus_crash 
Additional plugin debugging, better plugin resource cleanup
 2016-10-13 13:54:34 -07:00
Brad Hefta-Gaub
37e58d123e Merge pull request #8793 from AndrewMeadows/recenter-above-ground2 
prevent avatar from recentering below ground
 2016-10-13 13:50:06 -07:00
Chris Collins
7ec1e05165 Merge pull request #8791 from hyperlogic/bug-fix/avatar-hold-action-deadlock-fix 
Deadlock fix in avatar grab action.
 2016-10-13 13:48:28 -07:00
Chris Collins
635e3d1ea1 Merge pull request #8796 from hyperlogic/bug-fix/avatar-hold-action-crash-on-exit 
Prevent crash on exit.
 2016-10-13 13:23:43 -07: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
Anthony J. Thibault
f0dba9e766 Prevent crash on exit. 
If you or another user begins to near-grab an object while you exit the application, you might run into this crash.
The PhysicalEntitySimulation has a list of AvatarHoldActions shared_ptr's.
When it is destroyed, via the Application destructor, it will release these pointers.
This in turn will invoke a AvatarHoldAction destructor, which attempts to reference the AvatarManager via the DependencyManager.
However at this point the AvatarManager has already been destroyed, leading to a null dereference.

The fix is to check the AvatarManager pointer first.
 2016-10-12 16:29:05 -07: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
Andrew Meadows
867fc3ccbf prevent avatar from recentering below ground 2016-10-12 13:23:44 -07: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
Anthony J. Thibault
ba4c356d7f Deadlock fix in avatar grab action. 
Reverse the order we acquire the entityTree & holdActions locks, to avoid deadlocks when the network thread also acquires them.
The network thread does this when hold actions from other avatars are received.
 2016-10-12 11:05:19 -07: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 Davis
28771cbda9 Additional plugin debugging, better plugin resource cleanup 2016-10-11 19:40:02 -07: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
Andrew Meadows
abb05bc686 Merge pull request #8753 from ctrlaltdavid/21068 
Improve indication of user not being logged in
 2016-10-11 10:40:37 -07: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
Ryan Huffman
c995e51128 Fix compilation bugs in Application 2016-10-07 10:30:18 -07:00
Ryan Huffman
b839926396 Remove unnecessary lambda for location initialization on startup 2016-10-07 10:30:18 -07:00
Ryan Huffman
9ddeda389e Update initial run logic 2016-10-07 10:30:18 -07:00
Ryan Huffman
20b93a7afa Add redirection to entry on first turn if you don't have Vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
216cf2b4bc Update tutorial to work with HMD + Hand Controllers only 2016-10-07 10:30:18 -07:00
Ryan Huffman
1699299de9 Fix location that server content version is looked for 2016-10-07 10:30:18 -07:00
Ryan Huffman
37096910fc Fix tutorial begin location 2016-10-07 10:30:18 -07:00
Ryan Huffman
9c7ea6ac7c Update logic for going to tutorial on launch 2016-10-07 10:30:18 -07:00
Ryan Huffman
1e0772d613 Remove unused variable 2016-10-07 10:30:18 -07:00
Ryan Huffman
4c3cb83d47 Set default preferred device to vive and rift 2016-10-07 10:30:18 -07:00
Ryan Huffman
9f53652dfb Add routing of new users to tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
54498a8f3f Add the ability to ignore invisible entities in findRayIntersection 2016-10-07 10:30:18 -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
c76bb01359 Make Interface title say if user not logged in 2016-10-07 15:39:46 +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
Ryan Downe Karpf
877d62069e Merge pull request #8750 from ctrlaltdavid/21066 
QA READY: Improve address bar address entry
 2016-10-06 14:45:25 -07: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
Chris Collins
80ecf88935 Merge pull request #8731 from huffman/feat/interface-run-server 
Add flag to interface to have it start the sandbox server
 2016-10-06 09:18:41 -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
Chris Collins
bc6797fc3a Merge pull request #8733 from zzmp/fix/audio-channel-swap 
fix intermittent channel swapping
 2016-10-05 15:54:25 -07: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
Zach Pomerantz
afce8c4a45 STEREO_FACTOR -> AudioConstants::STEREO 2016-10-05 13:02:28 -07:00
Clément Brisset
d18394f249 Merge pull request #8596 from huffman/feat/my-avatar-self-id 
Add ability to parent overlays to MyAvatar for use across servers
 2016-10-05 12:03:01 -07:00
Clément Brisset
3f64847888 Merge pull request #8726 from huffman/feat/model-overlay-hide-change-textures 
Fix model overlay visibility and texture properties
 2016-10-05 11:54:11 -07: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
Howard Stearns
32db63e177 Merge pull request #8737 from highfidelity/domain-check 
Domain check
 2016-10-05 08:47:27 -07:00
Brad Hefta-Gaub
415b492c8c Merge pull request #8715 from jherico/offscreen_fences2 
Support external GL textures with proper fencing
 2016-10-05 05:13:06 -07:00
Ryan Huffman
ff8f45d36c Fix application directory path 2016-10-04 16:47:59 -07:00
Ryan Huffman
224c35d568 Clean up launch server in main.cpp 2016-10-04 16:47:59 -07:00
Ryan Huffman
0aba1d3e54 Fix server arguments causing crash on startup 2016-10-04 16:47:58 -07:00
Ryan Huffman
fe6382d1b6 Update server content path to be relative 2016-10-04 16:47:58 -07:00
Ryan Huffman
392ecb0dae Update interface to launch server 2016-10-04 16:47:58 -07:00
Ryan Huffman
847a5cc7a1 Remove old texture setting code in ModelOverlay 2016-10-04 16:25:48 -07:00
Ryan Huffman
93d995a5ae Fix model overlay visible not working 2016-10-04 16:25:40 -07:00
Ryan Huffman
c683c82817 Fix setting textures in model overlays 2016-10-04 16:24:43 -07:00
Howard Stearns
4974c88880 Merge pull request #8663 from howard-stearns/address-bar-text-area-changes 
Address bar text area changes
 2016-10-04 13:50:40 -07:00
Anthony Thibault
60aff44f33 Merge pull request #8717 from hyperlogic/bug-fix/near-grab-lag-fix 
Remove frame lag and jitter from near grabbed physical objects.
 2016-10-04 11:14:22 -07:00
Anthony J. Thibault
dcd425a165 Add an entityTree lock around the AvatarHoldAction::lateAvatarUpdate calls 2016-10-04 10:56:44 -07:00
Brad Davis
8c5028158f Fix crash on destroying web entities and overlays 2016-10-03 18:02:21 -07:00
Brad Davis
ca3572f991 Support external GL textures with proper fencing 2016-10-03 17:09:10 -07:00
Anthony J. Thibault
327fcc970b Remove frame lag from near grabbed physical objects. 
In the game loop, physics occurs before avatar update.
Before this PR, when the avatar is moved during avatar update, near grabbed objects will not pick up this move until one frame later, when
the physics is run on the next update.

After this PR, near grabbed objects are adjusted to reflect any position or rotation change that occurred during the avatar update.
 2016-10-03 16:01:54 -07:00
Ryan Huffman
b5eb943c1d Add hmd stats to stats event 2016-10-03 15:12:14 -07:00
Ryan Huffman
dafb5c5bab Add processor information to launch user activity event 2016-10-03 15:11:56 -07:00
David Rowe
caf1a93354 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
 2016-10-04 10:51:14 +13:00
howard-stearns
4fcddfdf2b Merge branch 'davidkelly-dk/triggerMenuInScriptPlus' into domain-check 2016-10-03 13:02:32 -07:00
howard-stearns
0809484e33 Merge branch 'dk/triggerMenuInScriptPlus' of https://github.com/davidkelly/hifi into davidkelly-dk/triggerMenuInScriptPlus 2016-10-03 13:01:51 -07:00
David Rowe
4818ad2615 Merge branch 'master' into 21055 2016-10-04 08:46:30 +13:00
samcake
0189e3aea7 Github is borked ? 2016-10-03 11:29:17 -07:00
samcake
5adedbbb8b replace the simple log by a unique log 2016-10-03 11:27:15 -07:00
samcake
0df69b8e15 Protecting the usage of the defaultSkyboxTexture in case its creation has failed to avoid crash on the first usage, removing an uncorrect assert in GL45BackendTexture that would trigger in debug 2016-10-03 10:06:58 -07:00
Brad Davis
d3d3aa587c Remove oglplus usage from OpenVR 2016-10-02 11:44:33 -07:00
Clément Brisset
becee3bba3 Merge pull request #8685 from thoys/ac-fixes 
Assignment Client fixes
 2016-09-30 11:05:58 -07:00
David Kelly
621e3fc000 Expose triggerOption to scripts, plus _physicsEnabled 
Now any menu item can be triggered.  Plus you can do a
Window.isPhysicsEnabled to detect when we are done loading assets and
such.  Whee!
 2016-09-30 09:06:17 -07:00
David Rowe
5e842843c6 Set alphabetic/numeric keyboard per field entered 2016-09-30 11:54:32 +13:00
Thijs Wenker
3d14a32d17 fix controller::ScriptingInterface not found warning in AC 2016-09-29 22:11:12 +02:00
Brad Hefta-Gaub
38eccd32a8 add developer menu support to enable/disable dynamic texture management 2016-09-29 10:18:54 -07: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
Zach Pomerantz
b9c4018b8e expose AudioStats to qml/js 2016-09-26 15:35:29 -07:00
howard-stearns
2dfc5ca268 Merge branch 'master' of https://github.com/highfidelity/hifi into address-bar-text-area-changes 2016-09-26 11:32:59 -07: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
3f31da68fe Merge pull request #8638 from howard-stearns/uniform-story-handling 
Uniform story handling
 2016-09-23 16:11:41 -07:00
Chris Collins
be33524990 Merge pull request #8636 from zzmp/clean/audio-config 
strip unused audio settings, hide the rest
 2016-09-23 15:08:48 -07:00
Zach Pomerantz
277eefafd7 remove the audio stats dialog 2016-09-23 14:39:07 -07:00
howard-stearns
a5fb0c9bd5 Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling 2016-09-23 13:16:36 -07:00
Zach Pomerantz
d0f4a29031 Merge branch 'master' of github.com:highfidelity/hifi into fix/local-audio-injection 2016-09-23 13:12:39 -07:00
Zach Pomerantz
a9318d052b Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config 2016-09-23 13:11:52 -07:00
Brad Davis
f33d3a3b36 Migrate logging functionality to shared library 2016-09-23 12:04:58 -07:00
Brad Davis
a7f0ba24ed Dynamic texture memory management 2016-09-23 12:04:42 -07: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
4357bb391d Merge branch 'master' of https://github.com/highfidelity/hifi into uniform-story-handling 2016-09-22 14:54:15 -07:00
Howard Stearns
8e9b743515 rollover images 2016-09-21 19:15:01 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Zach Pomerantz
e2ff738fc3 strip unused audio settings 
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
 2016-09-21 17:35:27 -07:00
Zach Pomerantz
9e2ec27b29 always play audio injectors locally 2016-09-21 17:20:51 -07:00
Ken Cooke
b14f43b11e Merge pull request #8610 from zzmp/test/audio-jitter 
add audio jitter simulator testing tool
 2016-09-21 16:43:36 -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
Clément Brisset
f26fbca699 Merge pull request #8623 from ZappoMan/improvedPreview 
Improved preview
 2016-09-20 19:05:26 -07:00