29978 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	9706a44ca1	Merge pull request #5571 from ZappoMan/hmdToolsRedux ... remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd	2015-08-14 20:11:27 -07:00
Brad Hefta-Gaub	a0e92e71a5	Merge pull request #5562 from AlexanderOtavka/overlay-docs ... Documentation for overlay changes.	2015-08-14 18:53:34 -07:00
Brad Hefta-Gaub	27f2a628a8	Merge pull request #5568 from huffman/fix-edit-click ... Update edit.js mouse click code to be more lenient to micro movements	2015-08-14 18:47:48 -07:00
Brad Hefta-Gaub	f76c663bb5	Merge pull request #5558 from AndrewMeadows/chromium ... coalesce scattered unit-test helper functions	2015-08-14 18:12:03 -07:00
Brad Hefta-Gaub	65b9c7bed8	Merge pull request #5522 from huffman/fix-billboard-url ... Fix BillboardOverlay breaking when changing url	2015-08-14 18:10:22 -07:00
Brad Hefta-Gaub	fe8fef4242	Merge pull request #5570 from jherico/homer ... WebEntity keyboard input with mouse hover	2015-08-14 17:32:47 -07:00
Brad Davis	dc2ddd0303	switch statement spacing	2015-08-14 17:12:00 -07:00
Brad Davis	db95657455	PR comments	2015-08-14 16:40:53 -07:00
ZappoMan	6a802560f2	remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd	2015-08-14 16:27:50 -07:00
Brad Davis	208e41efd1	WebEntity keyboard input with mouse hover	2015-08-14 16:18:38 -07:00
Ryan Huffman	fec460886b	Merge branch 'master' of github.com:highfidelity/hifi into fix-billboard-url	2015-08-14 15:18:40 -07:00
Brad Hefta-Gaub	ea685f4587	Merge pull request #5563 from huffman/fix-image3d-rotation ... Fix rotation of image3d overlays	2015-08-14 11:14:18 -07:00
Brad Hefta-Gaub	31a49a551a	Merge pull request #5556 from jherico/bart ... QML framerate improvments	2015-08-14 11:11:14 -07:00
Ryan Huffman	ee11b74c8b	Update click move distance threshold	2015-08-14 10:13:05 -07:00
Ryan Huffman	56501490a1	Update edit.js mouse click code to be more lenient to micro movements	2015-08-14 10:09:16 -07:00
Philip Rosedale	74f695cc9c	Merge pull request #5567 from howard-stearns/fix-gaze ... fix-gaze debugging aid	2015-08-14 08:03:35 -07:00
Howard Stearns	6b27f854b2	Eyelid position is on sender side and should use lookAt spot, not the receiver side.	2015-08-14 07:51:04 -07:00
Howard Stearns	1133e053d1	Developer->Avatar->Fix Gaze menu option to not move the eyes around while we're debugging.	2015-08-14 07:33:36 -07:00
Howard Stearns	9308e9df4f	Merge pull request #5458 from ctrlaltdavid/20639 ... CR for 20639 - Add SMI Rift eye tracker support	2015-08-13 10:06:15 -07:00
Ryan Huffman	0daa9d4871	Remove extra rotation in image3d	2015-08-13 09:38:21 -07:00
Zander Otavka	b84b8b6119	Restructure overlayManager.js to be more readable.	2015-08-12 23:30:07 -07:00
Zander Otavka	dc68e12963	Improve documentation for overlay changes.	2015-08-12 22:04:06 -07:00
Andrew Meadows	f64ab8e6b0	add QCOMPARE_QUATS macro for easier tests	2015-08-12 17:52:54 -07:00
Seth Alves	8cbb0c2ac3	Merge pull request #5560 from howard-stearns/no-version-constants ... No symbolic names for non-entity contants.	2015-08-12 16:57:00 -07:00
Howard Stearns	daae750d68	No symbolic names for non-entity contants.	2015-08-12 16:40:00 -07:00
Ryan Huffman	1000033f53	Merge pull request #5559 from SeijiEmery/js-widgets ... Js widgets	2015-08-12 16:39:11 -07:00
David Rowe	c0439f123b	Merge branch 'master' into 20639	2015-08-12 16:34:53 -07:00
Seiji Emery	fdacb894a5	tabs to spaces	2015-08-12 16:28:06 -07:00
Seiji Emery	81588f7db0	renamed Icon to Image	2015-08-12 16:26:47 -07:00
Brad Davis	0fa3044231	QML framerate improvments	2015-08-12 16:24:34 -07:00
Seth Alves	2dbbc5c184	Merge pull request #5553 from howard-stearns/remove-obsolete-avatar-mixer-data ... Warning: protocol change - Remove obsolete AvatarMixer wire data	2015-08-12 16:01:42 -07:00
Seiji Emery	778100e075	Merge branch 'master' of https://github.com/highfidelity/hifi into js-widgets	2015-08-12 15:57:04 -07:00
Seiji Emery	c175fe9e04	moved example code to widgets-example.js	2015-08-12 15:48:21 -07:00
Seiji Emery	10ca3f7a8f	fixes	2015-08-12 15:39:34 -07:00
David Rowe	6a0a08eafb	Consolidate identical code paths	2015-08-12 15:25:34 -07:00
David Rowe	7298fa7e2c	Log successful start of eye tracker streaming	2015-08-12 15:22:24 -07:00
David Rowe	9fe1aaf182	Disable saving / loading eye tracker calibrations so can use old SDK	2015-08-12 15:21:06 -07:00
Andrew Meadows	f4e77b8200	remove another dupe unit-test util	2015-08-12 14:15:49 -07:00
Andrew Meadows	6dfbf7f70a	coalesce scattered dupes of unit-test utilities	2015-08-12 14:13:28 -07:00
Andrew Meadows	cae77cfd76	move GLMTestUtils.h where all tests can find it	2015-08-12 13:51:40 -07:00
Andrew Meadows	ba5346aee7	move GlmTestUtils.h to GLMTestUtils.h	2015-08-12 13:37:59 -07:00
Andrew Meadows	488f6aa7d8	fix bug in ElbowConstraint::apply()	2015-08-12 13:34:23 -07:00
Brad Hefta-Gaub	acf9933925	Merge pull request #5557 from jherico/marge ... Fixing crash in vive controllers	2015-08-12 12:45:57 -07:00
Brad Davis	0ff283d09e	Fixing crash in vive controllers	2015-08-12 12:24:53 -07:00
Howard Stearns	2fbcede9b2	Merge pull request #5554 from ZappoMan/aaboxOptimization ... cache calculation of aabox and aacubes	2015-08-12 12:09:33 -07:00
Seiji Emery	293f146cfc	added debug ui, fixed non-targetable ui boxes/labels	2015-08-12 10:44:46 -07:00
Seiji Emery	f45afe050b	Added drag actions	2015-08-12 00:19:11 -07:00
Seiji Emery	986a821c91	cleanup	2015-08-11 22:00:53 -07:00
Seiji Emery	f247f0390c	Cleanup + refactoring	2015-08-11 21:56:00 -07:00
David Rowe	8f376247f0	Fix calculation of corrected look-at position in HMD view	2015-08-11 20:25:02 -07:00