563 commits

Author	SHA1	Message	Date
Andrew Meadows	5a3350950b	check pointer validity before dereference	2018-06-15 11:43:52 -07:00
Simon Walton	2d9a5c62c1	Clean-up for compiler warnings	2018-06-01 10:02:41 -07:00
Simon Walton	c277cc7574	Fix minor error	2018-05-31 18:39:25 -07:00
Simon Walton	7d1d7f7bcd	Closing the open tablet dialog - try harder	2018-05-31 18:31:53 -07:00
Anthony Thibault	eae5215d94	Merge pull request #13206 from ctrlaltdavid/21872-c ... JSDoc fixes	2018-05-24 16:44:55 -07:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
Liv	40ff3f966f	Merge pull request #13165 from ctrlaltdavid/21872-b ... JSDoc stubs for various APIs	2018-05-18 09:11:55 -07:00
David Rowe	33ba559bb4	Show all OverlayWebWindows properties and functions together	2018-05-18 08:02:02 +12:00
Gabriel Calero	8741c5e6a4	Make haptic pulse duration configurable in VirtualPadDevice	2018-05-17 11:37:13 -03:00
David Rowe	6db4dd8673	Merge branch 'master' into 21872-b ... # Conflicts: # interface/src/ui/Snapshot.h	2018-05-17 20:11:14 +12:00
David Rowe	145d73aa76	OverlayWebWindow JSDoc fixes	2018-05-17 19:18:00 +12:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
vladest	5127cb0ea6	Merge branch 'master' into menu-updates	2018-05-16 14:37:00 +02:00
David Rowe	a1de44310f	tabletInterface API JSDoc	2018-05-15 10:02:38 +12:00
David Rowe	c97d7c9d73	Expand and fix ToolbarProxy and ToolbarButtonProxy JSDoc stubs	2018-05-14 10:43:38 +12:00
David Rowe	71355840b9	Expand OverlayWindow and OverlayWebWindow JSDoc stubs	2018-05-14 09:57:35 +12:00
David Rowe	9fdce4df65	OverlayWindow and OverlayWebWindow API JSDoc stubs	2018-05-13 16:38:38 +12:00
David Rowe	46ebb0457e	Toolbars API JSDoc stubs	2018-05-13 10:56:21 +12:00
David Rowe	11f984f05b	OffscreenFlags API JSDoc stubs	2018-05-12 15:08:41 +12:00
Cristian Luis Duarte	f30908fb26	Android - Remove delay starting Home + Change default joystick flag	2018-05-10 18:21:33 -03:00
vladest	1794113f37	Check global switch as well	2018-05-06 12:51:59 +02:00
vladest	ac413c8854	Tablet opening notification sound settings added	2018-05-06 09:41:10 +02:00
Gabriel Calero	1330132a32	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-04 18:35:51 -03:00
Gabriel Calero	868b58e66d	Un-expose Application from javascript. Restore displayplugin deactivation when goes to background	2018-05-04 18:01:01 -03:00
MiladNazeri	8e214d8ee8	Merge pull request #13049 from ctrlaltdavid/21856-d ... List which contexts each namespace and class is available in	2018-05-03 01:29:14 -07:00
Gabriel Calero	c15ef56d90	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 14:38:10 -03:00
Gabriel Calero	3a1bfefc22	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 10:09:56 -03:00
John Conklin II	250aa3ab43	Merge pull request #13027 from jherico/fix/web_crash2 ... Some fixes for QML surfaces	2018-05-01 12:39:46 -07:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
John Conklin II	dd32ca33a5	Merge pull request #12957 from sethalves/quiet-logging ... Quiet logging	2018-04-27 14:59:38 -07:00
Brad Davis	6640313256	Fix memory leak in QML surfaces	2018-04-27 08:10:22 -07:00
Brad Davis	4db83230ce	Fix bad virtual cast on qml surface destruction	2018-04-27 08:09:31 -07:00
Gabriel Calero	8923c16b08	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-04-23 17:04:06 -03:00
David Rowe	6a2b7244eb	Interim JSDoc for Tablet	2018-04-23 11:06:17 +12:00
Seth Alves	6fc02638d7	control verbose logging with a menu-item in developer menu	2018-04-20 16:08:57 -07:00
Seth Alves	bec39369f7	remove some uncatagorized logging, suppress some categories by default	2018-04-20 16:08:57 -07:00
Gabriel Calero	adfbaac18f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-19 19:40:00 -03:00
Zach Fox	3b8e52ea41	Merge pull request #12862 from zfox23/discovery_April2018 ... Discovery: April 2018 (Huge PR; see description)	2018-04-17 15:11:50 -07:00
Gabriel Calero	e3b94b163c	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-16 14:55:16 -03:00
Sam Gateau	3ac4a1db2d	Merge pull request #12850 from SimonWalton-HiFi/early-trace ... Enable Interface tracing from earliest execution point	2018-04-16 10:24:55 -07:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
John Conklin II	008c7be369	Merge pull request #12787 from druiz17/fix-offscreen-windows ... hide desktop windows when switching into HMD mode	2018-04-13 12:17:15 -07:00
Gabriel Calero	aaaa17be7b	Merge branch 'android_goto_splash' of https://github.com/gcalero/hifi into android_goto_splash	2018-04-12 18:00:05 -03:00
Gabriel Calero	476e1cf7ae	Adjust UI with pixel perfect precision. Support devices with on-screen bars.	2018-04-12 17:59:38 -03:00
Cristian Luis Duarte	b031c1c070	Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_goto_splash	2018-04-12 14:32:07 -03:00
Gabriel Calero	865e3a05f1	Move jump button to the right. Adjust position of buttons	2018-04-11 19:33:43 -03:00
John Conklin II	7a905ed420	Merge pull request #12777 from ctrlaltdavid/21813 ... Fix Window API position and size reporting	2018-04-11 13:48:21 -07:00
Zach Fox	b9d0360ea2	Finally fix the grey security pic bug!	2018-04-10 16:00:53 -07:00
Simon Walton	9b6306601a	Merge Clement's PR12700 diffs for early trace start	2018-04-10 13:13:46 -07:00