30186 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Howard Stearns	4dae01a69c	Provide a consistent avatar default for the empty string.	2015-08-13 12:54:16 -07:00
Howard Stearns	62941c0914	Remove dead code.	2015-08-13 12:39:30 -07:00
Thijs Wenker	aed0688d17	Merge branch 'master' of https://github.com/worklist/hifi into 20638	2015-08-13 21:02:39 +02:00
Howard Stearns	ea834609c2	Kill the AvatarAppearanceDialog and rewire necessary parts of PreferencesDialog.	2015-08-13 10:33:31 -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
Thijs Wenker	7c77e0e941	initial WebSocketServer	2015-08-13 18:21:50 +02:00
Thijs Wenker	1664792e00	Merge branch 'master' of https://github.com/worklist/hifi into 20638	2015-08-13 14:28:20 +02: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
bwent	c585f24e27	Refining UI, introduce tween functionality for zooming into planets	2015-08-12 20:28:32 -07:00
bwent	e61ba997e5	Fix trail functionality with new classes	2015-08-12 20:28:32 -07:00
bwent	861c9f0ca0	more refactoring	2015-08-12 20:28:32 -07:00
bwent	e27335fc5e	Refactoring to use Planet class, set up framework for UI	2015-08-12 20:28:32 -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
Thijs Wenker	a97524f954	Merge branch 'master' of https://github.com/worklist/hifi into 20638	2015-08-12 15:26:53 +02:00
Seiji Emery	f45afe050b	Added drag actions	2015-08-12 00:19:11 -07:00
ZappoMan	85603dab29	bump entity packet version	2015-08-11 23:51:07 -07:00
ZappoMan	4fe8f49d4c	move origin to center of domain	2015-08-11 23:47:40 -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
Seiji Emery	8c47c7b989	Added attachment	2015-08-11 20:12:21 -07:00
David Rowe	0f56285283	Fix HMD look-at positions and lines	2015-08-11 18:54:55 -07:00
ZappoMan	0990229c64	cache calculation of aabox and aacubes	2015-08-11 18:05:22 -07:00
Howard Stearns	a5d8125aa7	Remove obsolete AvatarMixer wire data. (Was duplicated in joint states that are also sent.)	2015-08-11 17:53:49 -07:00
Seiji Emery	bb205294b9	uiwidgets.js	2015-08-11 16:33:30 -07:00