7372 commits

Author	SHA1	Message	Date
John Conklin II	99c26e6363	Merge pull request #13674 from r3tk0n/16984-CompositorHelper ... Added _aboutToQuit guard on eventFilter()	2018-07-24 11:37:19 -07:00
MuteTab	52e5bdb360	Added _aboutToQuit guard on eventFilter()	2018-07-23 14:27:38 -07:00
r3tk0n	bc91affa70	Bring this PR inline with RC70.1 PR.	2018-07-20 15:13:44 -07:00
MuteTab	63089df2dd	Re-added missing semi-colon.	2018-07-19 12:42:45 -07:00
MuteTab	a99f9310da	Add first-run checks for flying settings.	2018-07-19 12:41:24 -07:00
Sam Gondelman	b53772f9ca	Merge pull request #13431 from Cristo86/android_stop_downloads_bg ... Android - Prevent pending downloads to happen when going back to home	2018-07-12 15:22:56 -07:00
John Conklin II	b59e9f9899	Merge pull request #13582 from Zvork/scale ... Render Scale Resolution applied only to 3D rendering not HUD	2018-07-12 10:56:03 -07:00
John Conklin II	7ea46e26cf	Merge pull request #13587 from wayne-chen/updateControlsReference-case-9539 ... MS9539: Update Controls Reference pages	2018-07-12 10:53:00 -07:00
John Conklin II	de33ca512f	Merge pull request #13553 from Atlante45/feat/crashpad-mac ... Add Crashpad to Mac	2018-07-11 19:16:24 -07:00
Wayne Chen	179ba6506e	Adding check for WindowsMR to the showHelp menu	2018-07-11 11:56:14 -07:00
Olivier Prat	703fc20856	Separate scale between 3D rendering and HUD	2018-07-11 12:17:36 +02:00
Olivier Prat	9f4fd47b85	Not using render resolution scale in application and display plugin	2018-07-11 10:11:49 +02:00
Wayne Chen	81aac274ed	Updating controls reference page	2018-07-10 17:34:03 -07:00
John Conklin II	81f5631ce9	Merge pull request #13386 from ElderOrb/FB13949 ... AvatarApp	2018-07-09 15:20:18 -07:00
John Conklin II	e6801c303a	Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request ... Implement AvatarRequestIdentity and use if interface gets unknown avatar data	2018-07-09 10:07:19 -07:00
Cristian Luis Duarte	be8351dc0d	Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background	2018-07-06 20:43:52 -03:00
Clement	23e5dd0d2c	annotate with fingerprint immidiately	2018-07-06 15:52:30 -07:00
John Conklin II	01610a1520	Merge pull request #13559 from wayne-chen/fixCopyAddress-case-16444 ... Fix AddressManager copyAddress/copyPath functionality	2018-07-06 14:11:08 -07:00
John Conklin II	6e13b0e141	Merge pull request #13453 from gcalero/web_overlay_android ... Support web3d overlays in android	2018-07-06 13:02:56 -07:00
Wayne Chen	eb4704620c	reverting unintended line from previous debug	2018-07-06 11:06:16 -07:00
Wayne Chen	0facbedbbc	adding Q_INVOKABLE method for copying to Application clipboard	2018-07-06 11:03:58 -07:00
Alexander Ivash	929fec731c	remove 'Avatar' top level menu & 'Avatar...' item in settings menu per request from Mukul	2018-07-06 21:00:54 +03:00
John Conklin II	7aaf17a3c8	Merge pull request #13496 from thoys/feat/interactive-window ... InteractiveWindow scripting API	2018-07-06 10:58:12 -07:00
Thijs Wenker	1b63dfa20a	- OSX fixes (right camera after coming from native window, disappearing content) ... - Fix show() to show the window after it was minimized	2018-07-06 17:50:48 +02:00
Wayne Chen	3994ec4176	adding potential fix - moving methods to Application	2018-07-05 17:54:27 -07:00
John Conklin II	65daee2353	Merge pull request #13513 from vladest/double_asset_server_fix ... Tablet Asset Server dialog was instantiated twice	2018-07-03 13:14:12 -07:00
Thijs Wenker	d886bc2d9c	Merge branch 'master' of github.com:highfidelity/hifi into feat/create/interactive-window	2018-07-03 18:19:48 +02:00
Sam Gateau	96b26c94eb	Really add safe check for targetDisplayPLugin	2018-07-03 16:59:40 +02:00
Thijs Wenker	7390983721	introduce scriptable presentationMode instead of automatic mode switching windows	2018-07-03 16:49:49 +02:00
Cristian Duarte	6b5e5702dd	Android - implement pause-resume of requests chain in ResourceCache	2018-07-02 20:05:59 -03:00
John Conklin II	3f975cfa84	Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit ... Fix Mac Crashes On Shutdown	2018-07-02 15:27:26 -07:00
Cristian Duarte	6b3a9def7a	Merge branch 'hifi_master' into android_stop_downloads_bg	2018-07-02 17:37:40 -03:00
vladest	0657992e9c	Tablet Asset Server dialog was instantiated twice	2018-07-01 19:56:51 +02:00
Gabriel Calero	762e8f4bf0	Refactor WebViewActivity using fragment. Try SlidingDrawer.	2018-06-29 20:43:58 -03:00
sabrina-shanman	9dc03f5013	Destroy GeometryCache explicitly in Application destructor	2018-06-29 10:39:16 -07:00
sabrina-shanman	c849d8e2a8	Merge branch 'mac-shutdown-crash-on-present' into fix-osx-crash-on-exit	2018-06-29 09:37:54 -07:00
Sam Gateau	d543cd0766	Fixing a bug if the last session display pluginis an invalid name, resolve to default	2018-06-29 15:42:19 +02:00
Thijs Wenker	5029767493	InteractiveWindow scripting API	2018-06-28 19:04:08 +02:00
Sam Gondelman	736c56f5f4	Merge pull request #13487 from gcalero/single_account_manager_android ... Remove the duplicated AccountManager used for android	2018-06-28 09:07:23 -07:00
Gabriel Calero	e15fc787d3	Remove the duplicated AccountManager used for android	2018-06-27 19:04:27 -03:00
Stephen Birarda	e90ea82ef5	move AddressManager to NodeList thread, fix AccountManager invokes	2018-06-27 11:41:37 -07:00
sabrina-shanman	18219464f1	Fix shutdown crash on Mac in Application::onPresent	2018-06-27 09:56:03 -07:00
Seth Alves	d9f8cd46ea	Merge pull request #13415 from ctrlaltdavid/21896 ... Zero avatar velocity if protocol version mismatch so that overlays show	2018-06-27 09:35:15 -07:00
Seth Alves	dcebbada28	fix various crashes-upon-exits	2018-06-26 10:08:44 -07:00
Simon Walton	0dca842102	Add avatar identity requests to analytics	2018-06-22 17:06:33 -07:00
Andrew Meadows	4424a8df11	Merge pull request #13303 from highfidelity/workload ... workload project part 1	2018-06-20 15:39:01 -07:00
Cristian Luis Duarte	3837952418	Android - Add a clear method on pending downloads and use it when going background	2018-06-20 18:29:04 -03:00
Brad Davis	787fb1b9bd	Fix crash in display plugin caused by audio device changed	2018-06-19 16:13:57 -07:00
David Rowe	0e1e44a3f5	Zero avatar velocity if protocol version mismatch so that overlays show	2018-06-19 20:44:53 +12:00
Andrew Meadows	44c3620b6e	remove cruft	2018-06-18 17:45:58 -07:00