Amer
4c145386e5
Merge pull request #15899 from amerhifi/bugz-907
...
Case bugz-907: On launch default to non hmd device
2019-07-10 16:03:29 -07:00
amer cerkic
e463a828ef
removed extra line
2019-07-10 14:09:51 -07:00
amer cerkic
bc51b8e709
removed extra space
2019-07-10 14:08:20 -07:00
amer cerkic
fc21f6088a
undoing code structures changes to else blocks
2019-07-10 14:07:10 -07:00
Shannon Romano
f235778a6e
Merge pull request #15866 from huffman/feat/override-default-scripts
...
DEV-164: Add defaultScriptsOverride option
2019-07-10 10:16:55 -07:00
RebeccaStankus
169b15c985
Merge branch 'master' of github.com:highfidelity/hifi into createAgain
2019-07-09 13:03:08 -07:00
RebeccaStankus
714a3f6b08
Fixed path to tabletAssetServer in HMD, simplifiedUI system folder
2019-07-09 13:02:54 -07:00
amer cerkic
09ecb49e5b
--no-launcher is the launcher override for interface. if app is launched with the args, the first run is bypassed and default display device will always be desktop. not hmd
2019-07-09 11:39:42 -07:00
amer cerkic
45b339a6c7
removing comment
2019-07-09 09:35:58 -07:00
amer cerkic
d04a06e757
changing the default fallback to non hmd device
2019-07-09 09:33:44 -07:00
Howard Stearns
7aef864d7f
Merge pull request #15898 from howard-stearns/log-windows-wakeup
...
log wakeup (on client and report to DS) during connection on Windows
2019-07-09 09:29:57 -07:00
Amer
749a78680d
Merge pull request #15877 from amerhifi/bugz-690
...
case BUGZ-690 & BUGZ382 : adding a null check escape to the activeItem. On right click back to …
2019-07-09 09:17:30 -07:00
Howard Stearns
335119cb58
log wakeup (on client and report to DS) during connection on Windows
2019-07-08 16:50:36 -07:00
amerhifi
84055a6f0d
adding focus back on _glWidget
2019-07-08 11:12:50 -07:00
Seth Alves
708979a30c
use the correct gl format when creating the initial platform window
2019-07-05 10:48:57 -07:00
amer cerkic
9384c5b3a3
testing what happens (for mac specifically) when we specify the focus item to be the root, not NULL as sometimes happens when toggling between modal popups and the main window
2019-07-03 16:02:56 -07:00
amer cerkic
e429b7a1e2
Merge branch 'master' into bugz-690
2019-07-03 14:00:27 -07:00
amer cerkic
39fd16fc9e
adding a null check escape to the activeItem. On right click back to root window active item becomes null instead of root item
2019-07-03 11:05:38 -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
Ryan Huffman
d29cd796ca
Add defaultScriptsOverride option
2019-07-01 23:51:34 -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
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 Davis
8bcde84d89
Disable remote QML unless whitelisted
2019-06-27 16:37:56 -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
SamGondelman
5937a219dd
wait on thread pool threads
2019-06-26 15:25:17 -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
Sam Gateau
22cd631a04
Merge And Modifying the Graphics settings and the dev menu
2019-06-20 17:48:36 -07:00
amer cerkic
1218f7e014
moved audioclient stop to dtor
2019-06-20 15:10:21 -07:00
Andrew Meadows
cd9b450475
re-expose mic and camera to disable crash
2019-06-20 15:03:15 -07:00
Sam Gateau
b5e4a47375
Proper allocation of the resource in forward and starting to remove the ui as we have it
2019-06-19 17:33:26 -07:00
Andrew Meadows
eee52deefe
destroy WebSurfaces on shutdown
2019-06-12 16:07:15 -07:00
Shannon Romano
453085f992
Merge pull request #15741 from huffman/feat/set-and-get-bookmarks
...
BUGZ-484: Add --setBookmark and getAddress API
2019-06-11 15:31:41 -07:00
Ryan Huffman
a1b7392854
Add --setBookmark and getAddress API
2019-06-11 14:10:09 -07:00
dante ruiz
01fab12942
fixing interface and laucnher script argument
2019-06-11 09:18:20 -07:00
Shannon Romano
69094aa8f3
Merge pull request #15715 from kencooke/audio-injecctor-shutdown-crashfix
...
BUGZ-399: Fix shutdown crash in AudioInjectorManager::stop()
2019-06-10 10:12:26 -07:00
Shannon Romano
e213fd6b5e
Merge pull request #15712 from amerhifi/master
...
case BUGS:560 . wrapping dependencyManager::get<ddeFacetracker>with ifdef
2019-06-07 18:59:34 -07:00
Ken Cooke
9d57f5ac62
Defer DependencyManager::destroy<AudioInjectorManager>() until all ScriptAudioInjectors have been destroyed
2019-06-07 18:35:39 -07:00
PrestonB1123
059d931d17
Merge pull request #15711 from PrestonB1123/removingShortcuts
...
DEV-108: Removed ctrl+b and ctrl+n as shortcuts
2019-06-07 16:26:38 -07:00
amer cerkic
b57e4869c8
removed debug info
2019-06-07 16:26:21 -07:00
