Commit graph

39424 commits

Author SHA1 Message Date
David Rowe
ea247cd796 Fix information, question, and warning OffscreenUI message box icons 2016-02-22 14:08:00 +13:00
David Rowe
db6c76bf67 Merge branch 'master' into 20805 2016-02-22 13:15:40 +13:00
Brad Davis
f35c1694f7 Merge pull request #7133 from ZappoMan/hmdHacking
Working on making HMD mouse really work
2016-02-21 12:20:12 -08:00
Brad Hefta-Gaub
ba36eed9eb whitespace fixes 2016-02-21 11:40:15 -08:00
Brad Hefta-Gaub
68771c92f7 change position to use mutex instead of atomic<> 2016-02-21 11:38:26 -08:00
Brad Hefta-Gaub
2c7c6be6a6 fix build buster 2016-02-21 10:40:11 -08:00
Brad Hefta-Gaub
a12446dab5 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
2016-02-21 10:10:24 -08:00
Brad Hefta-Gaub
f41ebdf71d CR feedback 2016-02-21 10:03:54 -08:00
Brad Hefta-Gaub
3e6cddede3 CR feedback 2016-02-21 10:03:51 -08:00
Brad Hefta-Gaub
dd558f0656 Merge pull request #7147 from jherico/too_many_webs
Too many (or too large) web views crash Interface
2016-02-21 10:03:16 -08:00
Brad Hefta-Gaub
32a7179c62 CR feedback 2016-02-21 09:59:19 -08:00
Brad Hefta-Gaub
1a4591db58 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-21 09:30:41 -08:00
Brad Davis
4aec42893f Merge pull request #7150 from thoys/smooth_particle_trail
Smooth particle trails
2016-02-20 20:19:43 -08:00
David Rowe
bfedd24ad7 Fixes after reviewing against latest UI Toolkit doc 2016-02-21 16:43:41 +13:00
David Rowe
558c8872b1 Rework scrollbar to make layout more robust 2016-02-21 14:02:51 +13:00
David Rowe
b2c74447fb Fix OSX scrollbars in scripts lists starting too low 2016-02-21 12:44:29 +13:00
Thijs Wenker
58539171a3 give particle trails a nice smooth path between frames 2016-02-20 22:46:19 +01:00
Brad Davis
786747c2d7 Properly preserve and restore the GL context after building a web entity 2016-02-20 12:01:34 -08:00
Brad Hefta-Gaub
9c3abd3eb7 some cleanup and standardization in how headPose is gathered 2016-02-20 11:40:30 -08:00
Brad Hefta-Gaub
9066fb0622 Merge pull request #7145 from howard-stearns/lod-pid-removal
Lod pid removal
2016-02-20 10:29:42 -08:00
Brad Hefta-Gaub
e6614fb9e5 Merge pull request #7141 from sethalves/fix-avatar-fade
Fix avatar fade
2016-02-20 10:26:07 -08:00
Brad Hefta-Gaub
db448c240f Merge pull request #7122 from howard-stearns/audio-output-buffer
Audio output buffer
2016-02-20 09:40:06 -08:00
Brad Hefta-Gaub
28638f19e3 Merge pull request #7148 from hyperlogic/tony/smooth-vive-controllers
Vive: smoother updates for IK driven by vive controllers
2016-02-20 09:37:37 -08:00
Brad Hefta-Gaub
4e2c514eb1 fix mac warning 2016-02-19 18:27:25 -08:00
Brad Hefta-Gaub
04fa37324f tweak to virtual desktop size, to make text more readable, 240d horz FOV 2016-02-19 18:24:32 -08:00
Brad Hefta-Gaub
2810be8787 fix scripts to use new API 2016-02-19 17:57:49 -08:00
Brad Hefta-Gaub
1fa6e294e7 allow mouse to move outside of the overlay extents 2016-02-19 17:49:33 -08:00
David Rowe
91e4fb478d Don't display dialog focus or content shadows on OSX
Alpha gradients display as fuchsia on OSX.
2016-02-20 13:12:51 +13:00
Anthony Thibault
942f2c13ab Vive: smoother updates for IK driven by vive controllers
Before this PR the simulation rate was clamped to never exceed 60htz.
This had problems when waving the vive hand controllers in the world,
they would jitter.  The simulation rate is now clamped to never exceed
120 htz.  This has the effect of synchronizing the display and the
update rates to 90htz.

Also there are improvements to vive support if threaded present is
disabled.
2016-02-19 15:58:13 -08:00
Brad Davis
021b86c3fe Cap the max concurrent webviews, and deallocate unrendered views after 30 seconds 2016-02-19 15:41:40 -08:00
Brad Davis
64ec56bf89 Guards and warnings in QML rendering 2016-02-19 15:36:51 -08:00
Howard Stearns
13c602e2a3 Remove mumbleUnsynchronizedFPS, which is obsolete now that the update/render rate is not in power-of-two lockstep with present rate, and which had users other than the LOD PID. 2016-02-19 15:12:44 -08:00
Brad Hefta-Gaub
1a8b926534 Merge pull request #7144 from hyperlogic/tony/first-rotation-fix
MyAvatar: fix for turning with arrow keys on start up
2016-02-19 14:59:53 -08:00
Howard Stearns
1d84bd17da Merge pull request #7134 from ericrius1/acInjectors
Injector Load Test script
2016-02-19 14:41:11 -08:00
Anthony J. Thibault
b94410a323 MyAvatar: fix for turning with arrow keys on start up 2016-02-19 14:39:46 -08:00
Howard Stearns
a22b25aad9 Make defaults match our performance statements. (Half of present rate.) 2016-02-19 14:37:58 -08:00
Brad Hefta-Gaub
342391cb2f Merge pull request #7143 from imgntn/webengine-new-windows
Add support for pop-up windows to Qt WebEngineView
2016-02-19 14:31:16 -08:00
Brad Hefta-Gaub
edb241807a Merge pull request #7137 from imgntn/webengine-fun
Enable HTML5 userMedia APIs in QTWebengine view
2016-02-19 14:27:27 -08:00
Brad Hefta-Gaub
7219a925d2 remove getTrueMouse() 2016-02-19 14:17:28 -08:00
Howard Stearns
00f3d6e382 Remove LODPreference enum. 2016-02-19 14:05:21 -08:00
Howard Stearns
9f7feed544 Remove LOD PID controller. 2016-02-19 14:00:22 -08:00
James B. Pollack
56f8282607 dont need this code here 2016-02-19 13:54:31 -08:00
James B. Pollack
7ec09c49f3 feature request is in another pull 2016-02-19 13:53:22 -08:00
James B. Pollack
afb6f1fe84 no clipboard 2016-02-19 13:50:30 -08:00
James B. Pollack
66e8f070e4 popup windows 2016-02-19 13:48:54 -08:00
howard-stearns
e21d9042d0 Remove some logging. 2016-02-19 13:34:06 -08:00
Brad Hefta-Gaub
d9aa5d8857 cleanup dead code 2016-02-19 13:25:53 -08:00
Brad Hefta-Gaub
7be5811f34 tweak to UI size, clean up screen to overlay 2016-02-19 13:22:37 -08:00
ericrius1
e4508e1d34 added comment and name 2016-02-19 12:06:08 -08:00
Howard Stearns
30b4eace95 Remove LOD PID-related preferences and the related toggling of preferences. 2016-02-19 11:52:07 -08:00