16116 commits

Author	SHA1	Message	Date
Anthony J. Thibault	5f1b8805cf	Removed unnecessary include	2016-03-09 17:37:51 -08:00
Anthony J. Thibault	886457939d	Merge branch 'master' into tony/wrong-way-overlay	2016-03-09 16:50:18 -08:00
Chris Collins	ddb09ec222	Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements ... Hand controller mouse improvements	2016-03-09 16:34:35 -08:00
Anthony Thibault	5df616be37	OpenVR: More usable UI Sphere overlay location ... Also, added a debug option to display SensorToWorld matrix in Developer > Avatar menu.	2016-03-09 16:24:08 -08:00
Anthony J. Thibault	4af3766804	Don't reset sensors when initializing or changing display plugins. ... This should fix the issue with the Oculus starting up with the UI aligned to the HMD on your desk, rather then the configured default sitting pose.	2016-03-09 14:28:26 -08:00
Zach Pomerantz	21719b3980	Wait 10m for DEBUG deadlocks	2016-03-09 14:07:36 -08:00
Brad Hefta-Gaub	e038c8a43c	Merge branch 'master' of https://github.com/highfidelity/hifi into bugfixes	2016-03-09 11:47:55 -08:00
Brad Davis	80fdef4348	Ensure the heartbeat has a valid value before the thread starts	2016-03-09 10:53:01 -08:00
Anthony J. Thibault	4691ca1716	Merge branch 'master' into tony/hand-controller-move-improvements	2016-03-09 10:06:28 -08:00
Brad Hefta-Gaub	1c07276501	fix a couple bugs	2016-03-09 09:45:55 -08:00
Brad Hefta-Gaub	5862181e70	Merge pull request #7288 from jherico/watchdog ... Add a watchdog thread to trigger a crash on detecting a deadlock	2016-03-09 09:18:48 -08:00
Seth Alves	efdef52081	Merge pull request #7269 from ctrlaltdavid/20822 ... Restyle bookmark dialogs	2016-03-09 07:31:15 -08:00
Brad Davis	95f5d82d37	Add a watchdog thread to trigger a crash on detecting a deadlock	2016-03-09 00:32:46 -08:00
Chris Collins	d1401796d8	Merge pull request #7284 from ctrlaltdavid/fix-raleway-semibold ... Fix case of RalewaySemiBold font name	2016-03-08 21:24:15 -08:00
Brad Hefta-Gaub	cb70c398cd	Merge pull request #7233 from jherico/vive_menu ... Fix the Vive controllers to support menus	2016-03-08 18:03:32 -08:00
samcake	bfed0304c3	Merge pull request #7218 from zzmp/fix/resort-in-octree ... Fix item key lookup on updated items in scene	2016-03-08 17:48:51 -08:00
Anthony J. Thibault	deb17e1f93	Merge branch 'master' into tony/hand-controller-move-improvements	2016-03-08 17:45:50 -08:00
David Rowe	973fa28d3f	Fix case of RalewaySemiBold font name	2016-03-09 13:32:37 +13:00
David Rowe	155a084eaa	Temporarily rename file a part of changing case of filename	2016-03-09 13:08:44 +13:00
David Rowe	269936f3ac	Fix typo	2016-03-09 12:20:09 +13:00
Brad Davis	f651adbd24	Correcting vive button naming	2016-03-08 15:12:54 -08:00
Brad Davis	1312901f06	Removing thumb mappings, using start/back for camera and menu	2016-03-08 15:09:45 -08:00
Brad Davis	ac1ab4b5b7	Map the primary thumbs to menu/camera as well as the secondary thumb	2016-03-08 15:09:44 -08:00
David Rowe	edc50f102d	Fix "duplicate bookmark" dialog	2016-03-09 11:55:09 +13:00
Brad Hefta-Gaub	35d6afbe77	Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable	2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub	6d211dd4e5	first cut at fixing the scene not stable bug	2016-03-08 14:52:21 -08:00
David Rowe	10e4e5e3a7	Use OffscreenUI icon enum instead of QMessageBox icon enum	2016-03-09 11:33:55 +13:00
David Rowe	03fb6b1444	Add ability to have icons in query dialogs ... Add icon to bookmark dialogs' titles.	2016-03-09 10:45:14 +13:00
Anthony J. Thibault	e046ba64dd	Properly marshal fakeMouseEvent data from script thread to main thread	2016-03-08 10:58:54 -08:00
Seth Alves	b780fad83f	Merge pull request #7270 from birarda/local-socket-check ... add a secondary method for local socket check	2016-03-08 10:48:08 -08:00
Brad Hefta-Gaub	19ad4314ca	Merge pull request #7276 from jherico/bookmarks ... Don't trigger modal dialog from menu handler	2016-03-08 10:29:29 -08:00
Zach Pomerantz	d1324b2e7a	Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree	2016-03-08 10:22:25 -08:00
Brad Hefta-Gaub	50eb07d465	Merge pull request #7221 from jherico/threaded_compositing2 ... Migrate composition of the overlay and pointer to the present thread	2016-03-08 10:22:02 -08:00
Brad Hefta-Gaub	ed67ef8f14	Merge pull request #7247 from jherico/qml_script_messaging ... Allow message passing from a script to a QML window	2016-03-08 10:21:09 -08:00
Brad Davis	f08f54fd22	Don't trigger modal dialog from menu handler	2016-03-07 21:48:07 -08:00
James B. Pollack	2e9ebfb178	remove avatar head and body from pacakage model selections	2016-03-07 21:03:11 -08:00
David Rowe	2aaf9ff0d0	Update message dialogs to use HiFi-Glyphs icons	2016-03-08 17:13:05 +13:00
Anthony J. Thibault	3d71226f72	Crash fix for moving reticle via script. ... sendMessage is not thread-safe, use invokeMethod to call into application thread instead.	2016-03-07 18:33:09 -08:00
David Rowe	e5188108a1	Fix width of delete bookmark drop-down	2016-03-08 15:21:15 +13:00
Stephen Birarda	ed9faf4189	add a secondary check for local IP address	2016-03-07 18:00:09 -08:00
Brad Davis	8988dd9771	Fix mouse drag turning	2016-03-07 17:14:44 -08:00
Brad Davis	634f8fbc83	Fix texture leak	2016-03-07 17:14:43 -08:00
Brad Davis	28103cf5ef	Migrate composition of the overlay and pointer to the present thread	2016-03-07 17:14:41 -08:00
David Rowe	2f91b29c06	Set default focus	2016-03-08 14:03:54 +13:00
David Rowe	09390ffffd	Remove colon from dialog label	2016-03-08 14:00:49 +13:00
David Rowe	b71a512a6f	Reorder OK and Cancel buttons	2016-03-08 13:58:20 +13:00
David Rowe	7f2938c53f	Tidy message dialog code	2016-03-08 13:56:25 +13:00
David Rowe	b7fd5467ba	Restyle query dialogs	2016-03-08 13:53:05 +13:00
David Rowe	d893b2e3b1	Handle no icon in modal dialogs	2016-03-08 13:52:24 +13:00
Anthony J. Thibault	0d62b10a8f	Added Mat4 support to script ... Also, hooked up MyAvatar.sensorToWorldMatrix access to script.	2016-03-07 16:16:14 -08:00