Commit graph

29649 commits

Author SHA1 Message Date
Amer
f97cde46bf
Merge pull request #15868 from amerhifi/bugz-103
case BUGZ-103: HMD Mouse rendering
2019-07-03 09:17:23 -07:00
Anna
75c5a99ee2 removed secondary camera tone mapping compensation during 360 screenshot 2019-07-02 17:59:30 -07:00
amer cerkic
75beb95a97 Since switching to system mouse due to eco mode trailing mouse issues, this in turn caused hmd mode to render a blank mouse. Added a mouse setting functionality on activeplugin change lambda so taht when in hmd mode it uses either reticle mouse, if selected, or arrow. Othewise if non hmd use system mouse. 2019-07-02 10:31:31 -07:00
Anthony Thibault
6c66f5a37b Fix for DependencyManager crash on shutdown on Mac
On Mac, it is possible to crash when shutting down, it is not clear if this is due to
shutting down the app on another thread during logout or something that can happen
during normal shutdown, because it is so difficult to reproduce.

However, from looking at the stack traces it is possible for a [NSApplication terminate:]
event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning()
This causes AppKit to invoke the static destructors too early.  Which in turn, causes the
DependencyManager destructor to fire while there are still many dependencies running.
Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown
in an incorrect order.

To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible,
in the Application destructor. Theoretically, this will be a safe time for the static destructors
to be invoked, because it is after all of the DependencyManager's dependencies have been
manually destroyed.

However, this is only a speculative fix, because this is so difficult to reproduce.
2019-07-01 17:37:57 -07:00
Andrew Meadows
4bbfd7cad1 more correct bounding sphere around avatar for SafeLanding query 2019-07-01 15:53:42 -07:00
Andrew Meadows
0d8fdf51c5 fix safe landing to load proper set of objects 2019-07-01 14:18:19 -07:00
Zach Fox
b8485361ce
Merge pull request #15858 from zfox23/PTTDuckingSlider
DEV-194: Iterate on PTT Ducking Slider design
2019-07-01 12:00:17 -07:00
Zach Fox
73db19464f DEV-194: Iterate on PTT Ducking Slider design 2019-07-01 11:28:48 -07:00
Brad Hefta-Gaub
191086c57a
Merge pull request #15857 from PrestonB1123/webcamPermissions
DEV-193: Disallow mic and webcam access always.
2019-07-01 09:54:58 -07:00
Shannon Romano
89f654175c
Merge pull request #15856 from PrestonB1123/defaultShortcuts
DEV-173: Re-enable shortcuts
2019-06-28 15:29:53 -07:00
Preston Bezos
ef674a5934 removed permission for qml to access webcam and mic 2019-06-28 15:23:50 -07:00
Preston Bezos
1315677aec fixed doc and removed log spam 2019-06-28 15:02:33 -07:00
Preston Bezos
d1470d3323 readded ctrl+n and ctrl+b as shortcuts with a default script 2019-06-28 14:33:03 -07:00
Shannon Romano
7ff751567b
Merge pull request #15848 from jherico/fix/dev-175-source
DEV-175: QML content URL validation, whitelist trusted sources
2019-06-28 14:18:56 -07:00
Sabrina Shanman
0b6dfe3f7c
Merge pull request #15846 from AndrewMeadows/avoid-SafeLanding-event-flood
BUGZ-868: Avoid SafeLanding signal-slot connection resource leak
2019-06-28 13:29:31 -07:00
Brad Hefta-Gaub
8082ff8529
Merge pull request #15850 from zfox23/PTTAttenuationOption
BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option
2019-06-28 11:08:11 -07:00
Brad Davis
e3393a8ee5 Apply URL validation to top level window QML 2019-06-28 10:43:03 -07:00
Shannon Romano
67901166ba
Merge pull request #15851 from ctrlaltdavid/DOC-79
DOC-79: Entities JSDoc Update - Doc Review
2019-06-28 10:12:05 -07:00
Zach Fox
5cc6efc831 CR feedback 2019-06-28 09:07:58 -07:00
David Rowe
2d6d3eb4fe Doc review 2019-06-28 17:05:36 +12:00
Brad Davis
8bcde84d89 Disable remote QML unless whitelisted 2019-06-27 16:37:56 -07:00
Zach Fox
8af469992e BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option 2019-06-27 15:55:58 -07:00
Andrew Meadows
0bec2bca83 OctreePacketProcessor should process packet even when no SafeLanding 2019-06-27 14:44:23 -07:00
Zach Fox
7c189d46f2 BUGZ-363: Remove 20dB output attenuation during PTT 2019-06-27 13:28:29 -07:00
Andrew Meadows
bf068a3211 fix SafeLanding start/stop on entity-server connection flow 2019-06-27 11:33:51 -07:00
Andrew Meadows
dfb7ac7044 name changes and improved flow for SafeLanding logic 2019-06-27 08:14:34 -07:00
Andrew Meadows
00185ee82e cleaup to help unravel one spaghetti strand 2019-06-26 17:05:44 -07:00
Andrew Meadows
496a7f3608 less cruft, more readable 2019-06-26 16:02:00 -07:00
Andrew Meadows
46b3d84be5 remove unused cruft 2019-06-26 15:41:50 -07:00
Andrew Meadows
355de0e6d5 move Application::setFailedToConnect() to cpp for easier debugging 2019-06-26 15:41:01 -07:00
Andrew Meadows
c96b704a28 avoid dupe connections and teardown old connections 2019-06-26 15:38:59 -07:00
SamGondelman
5937a219dd wait on thread pool threads 2019-06-26 15:25:17 -07:00
Zach Fox
6e4b9c1723
Merge pull request #15774 from PrestonB1123/iconChanges
New Top Bar Icons
2019-06-26 11:01:12 -07:00
Preston Bezos
f0dd28e71a removed extra line 2019-06-26 09:54:43 -07:00
Preston Bezos
bd3fe8a092 fixed conflict and spacing 2019-06-26 09:12:32 -07:00
Sam Gateau
48f9c33bdd
Merge pull request #15822 from samcake/yellow
BUGZ-664: Introduce scaling of rendering for forward renderer
2019-06-25 14:27:17 -07:00
Andrew Meadows
20376c9542
Merge pull request #15823 from ctrlaltdavid/DOC-79
DOC-79: Entities JSDoc Update
2019-06-25 14:18:13 -07:00
Sam Gateau
768dd051aa Add sanity check for viewport resolution scale to avoid negative value 2019-06-25 11:54:50 -07:00
Zach Fox
b7a3d82f0f DEV-170: Increase the speed of the animation when clicking between tabs in Settings 2019-06-25 11:30:25 -07:00
Preston Bezos
1481c7424f changed ptt muted icon 2019-06-25 11:02:44 -07:00
Preston Bezos
5686f51171 fixed hmd settings buttons spacing 2019-06-25 09:19:30 -07:00
Sam Gateau
b0ebcc745d Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-24 15:36:28 -07:00
Zach Fox
3e2e020731 BUGZ-746: About tab: Better CPU/GPU info reporting; New copied info (including OS version) 2019-06-24 12:48:13 -07:00
David Rowe
b2b7a6ae99 Merge branch 'master' into DOC-79 2019-06-22 12:11:22 +12:00
Sam Gateau
7bf2c5fc8e Simplify the setting name 2019-06-21 16:22:01 -07:00
Sam Gateau
aa160c4d0f Improving presentation of stats & debug information 2019-06-21 16:17:28 -07:00
Sam Gateau
35d7211aca Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-21 11:38:33 -07:00
Sam Gateau
a856fdb3ca getting rid of the resolution Scale on the display plugin 2019-06-21 10:36:25 -07:00
amer cerkic
67e42148ef Merge branch 'master' of https://github.com/highfidelity/hifi 2019-06-21 09:43:33 -07:00
Sam Gateau
69bb9ac0b6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-06-20 22:23:15 -07:00