285 commits

Author	SHA1	Message	Date
vladest	638eeede43	Merge conflict	2017-08-02 20:07:06 +02:00
Dante Ruiz	05f1caab01	better solution to help and blank tablet issues	2017-08-02 16:35:58 +01:00
vladest	2d4396ac8e	Merge branch 'master' into fix_toolbar_apps_switch	2017-08-02 16:34:49 +02:00
vladest	4330e31212	Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create	2017-08-02 16:32:09 +02:00
Dante Ruiz	cca29e849b	fix issue of tablet begin blank when switching between HMD and Desktop mode	2017-08-01 23:18:42 +01:00
vladest	0333849aa8	Merge branch 'master' into fix_menu_landscape	2017-07-29 11:44:58 +02:00
Stephen Birarda	17dd028ec7	make Paths available to desktop and tablet QML context	2017-07-28 14:23:18 -07:00
Brad Davis	3d0c13915a	Fix tablet button crash	2017-07-28 11:20:57 -07:00
vladest	45934cb53e	Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode	2017-07-28 18:04:29 +02:00
Brad Hefta-Gaub	9b3be6d164	Merge pull request #10808 from humbletim/21400 ... WL 21400 -- Setting that lets you switch from cursor to reticle	2017-07-27 13:16:58 -07:00
Dante Ruiz	fdfeab77eb	made requested changes	2017-07-19 16:28:16 +01:00
Dante Ruiz	06a69c8bd7	fixed another tablet stuck on help screen	2017-07-18 20:27:55 +01:00
Andrew Meadows	99aad77e53	Merge pull request #10954 from jherico/qml_crashes_again ... Still trying to address QML crashes	2017-07-17 10:21:23 -07:00
druiz17	3b112450f0	Merge pull request #10959 from druiz17/bug/wrong-tablet-state ... Fix tablet scripting interface setting its internal state to home when switching between toolbar and tablet mode	2017-07-14 14:31:04 -07:00
Dante Ruiz	e07b067d7b	fixed tablet getting in the wrong state	2017-07-12 21:09:54 +01:00
Brad Davis	0e9f8cc103	Still trying to address QML crashes	2017-07-12 11:04:33 -07:00
Seth Alves	3670a04d8e	switch bare pointers to AudioInjector objects to be QSharedPointers	2017-07-11 14:24:58 -07:00
Dante Ruiz	75e1b265d5	comment out code that causes a crash on launch from fresh install	2017-07-10 17:48:53 +01:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	9c37b28ba0	Remove tool window logic	2017-06-30 10:58:19 -07:00
Brad Davis	8372d73fec	Additional thread safety	2017-06-30 09:15:06 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Seth Alves	2f3109e4be	move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it	2017-06-28 11:00:05 -07:00
Brad Davis	08784ff30c	Fix toolbar button mouse click when they were added via the tablet scripting interface	2017-06-25 02:34:58 -07:00
humbletim	c10475186c	add support for switching cursor from arrow to reticle	2017-06-23 18:48:29 -04:00
Brad Davis	341646c780	Fix bad invocation, cleanup signatures	2017-06-23 09:58:27 -07:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
NeetBhagat	ead0d42cf3	Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h	2017-06-07 15:47:19 +05:30
NeetBhagat	904e25c9e3	intial commit #21369 Working on clear method of console	2017-06-07 14:37:18 +05:30
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Brad Davis	fb995bebf1	Prevent crash on switching to 3D display twice	2017-05-04 12:04:21 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
Dante Ruiz	8c020a0ec2	saving work	2017-04-25 18:01:19 +01:00
Dante Ruiz	50ed4a61f7	Merge branch 'master' of github.com:highfidelity/hifi into tablet-crash	2017-04-21 18:26:37 +01:00
Dante Ruiz	8cfa03fa56	tablet cpp ownership	2017-04-21 18:26:26 +01:00
David Rowe	daedb94b04	Merge branch 'master' into 21249	2017-04-21 14:50:28 +12:00
Zach Fox	50456f71ed	Merge pull request #10142 from Triplelexx/21258 ... 21258 - Don't render (or heavily use GPU) when window in minimized	2017-04-19 16:26:49 -07:00
David Rowe	00b6b2a2c0	Implement desktop recordings browser dialog	2017-04-19 12:34:59 +12:00
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
Triplelexx	27a404d0ea	remove extra lines	2017-04-07 07:09:18 +01:00
Triplelexx	279997d905	change display plugin to deactivate when window minimized	2017-04-07 06:49:28 +01:00
Vladyslav Stelmakhovskyi	aa487faad1	Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings	2017-04-04 16:59:09 +02:00
Seth Alves	6df4dda746	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -07:00
Andrew Meadows	f6d6c62fab	move variable closer to context where it is used	2017-03-27 14:40:31 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00