30529 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	07b241c778	code review	2015-09-03 11:05:44 -07:00
Seth Alves	bb96ad1346	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-03 09:38:58 -07:00
Brad Hefta-Gaub	25673831c2	Merge pull request #5689 from jherico/lisa ... Adding 'web3d' overlay type	2015-09-02 21:31:38 -07:00
Brad Hefta-Gaub	01b6bbe40f	Merge pull request #5697 from jherico/maggie ... Fix oculus crash on switching display plugin to something else	2015-09-02 21:23:38 -07:00
Brad Hefta-Gaub	e6f43d3dd7	Merge pull request #5702 from ericrius1/newGrab ... update hydra grab to grab near and far objects, and removed grabbing…	2015-09-02 18:43:41 -07:00
Brad Davis	2901155a7b	Fix Oculus mirroring to window	2015-09-02 18:28:44 -07:00
Brad Davis	1f83d04423	Fix oculus crash on switching display plugin to something else	2015-09-02 18:28:43 -07:00
Brad Davis	b6ef2e314f	Adding 'web3d' overlay type	2015-09-02 18:25:49 -07:00
Brad Hefta-Gaub	0b12812ea4	Merge pull request #5705 from jherico/apu ... OmniTool first pass	2015-09-02 18:16:03 -07:00
Brad Davis	5717b77837	Updating magballs to omnitool	2015-09-02 18:14:21 -07:00
Brad Davis	ea415071b4	OmniTool first pass	2015-09-02 18:14:13 -07:00
Brad Hefta-Gaub	b199e9e593	Merge pull request #5703 from jherico/marge ... Support HTML colors in overlays	2015-09-02 17:58:44 -07:00
ericrius1	d303c7e119	only add actions to physical objects	2015-09-02 16:45:50 -07:00
Seth Alves	f20ce12091	Merge branch 'test-5685' of github.com:sethalves/hifi into polyvox-again	2015-09-02 16:30:55 -07:00
Seth Alves	f1bb7fb67f	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-02 16:30:48 -07:00
Seth Alves	2fe6e9c317	use AABox's ray intersection code rather than the goofed-up version that was here	2015-09-02 16:30:11 -07:00
Eric Levin	d55c92780c	Merge pull request #5704 from AndrewMeadows/erbium ... fix for Controller.getSpatialControlNormal()	2015-09-02 16:30:01 -07:00
Seth Alves	2e880e9aab	change how pick-ray direction is calculated	2015-09-02 16:29:15 -07:00
Howard Stearns	389e752b6e	Merge pull request #5695 from AndrewMeadows/dysprosium ... avoid bad joints when computing avatar bounding capsule	2015-09-02 15:58:42 -07:00
Brad Davis	849249d7fe	Fixing colors ... Conflicts: examples/toys/magBalls/handController.js	2015-09-02 15:56:38 -07:00
Brad Davis	54b7a063e2	Support HTML colors in overlays	2015-09-02 15:56:37 -07:00
Andrew Meadows	c61bc190de	fix finger and palm-normal directions for JS	2015-09-02 14:16:02 -07:00
Andrew Meadows	817c4147d6	Merge pull request #5683 from nivardus/qt5.5-domainserver-qdatastream ... QT 5.5 - NodeConnectionData QDataStream #include	2015-09-02 13:08:48 -07:00
Brad Davis	ea86c324ff	Merge pull request #5701 from AndrewMeadows/einsteinium ... fix sixense and vive rotation readings for palms	2015-09-02 12:20:18 -07:00
Andrew Meadows	992bd5c9d2	fix sixense and vive rotation readings for palms	2015-09-02 11:37:36 -07:00
Andrew Meadows	eb78b39bea	fix typo that broke build and remove warning	2015-09-02 11:31:05 -07:00
ericrius1	1e6198cf59	update dhydra grab to grab near and far objects, and removed grabbing logic from toybox.js	2015-09-02 11:29:37 -07:00
Seth Alves	3e11852845	Merge pull request #5685 from howard-stearns/standing-hmd-animations ... Standing hmd animations	2015-09-02 10:57:45 -07:00
Seth Alves	849477ac12	Merge branch 'standing-hmd-animations' of github.com:howard-stearns/hifi into test-5685	2015-09-02 10:52:30 -07:00
Seth Alves	16ee5199e8	change how polyvox neighbors are notified of updates	2015-09-02 09:30:32 -07:00
Seth Alves	f54d924f4a	make sure intersected entity is in the list of possible polyvoxes to adjust	2015-09-02 09:29:51 -07:00
Seth Alves	3963035599	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-01 21:08:23 -07:00
Andrew Meadows	b7d892cfcd	Merge pull request #5691 from ctrlaltdavid/display-names-in-front ... Only render display names if in front of camera	2015-09-01 19:59:06 -07:00
Andrew Meadows	dd2f94bc88	Merge pull request #5696 from birarda/sixense-fix ... fix for sixense compile when not present	2015-09-01 19:56:03 -07:00
Seth Alves	8608e4f2b0	small bug-fixes	2015-09-01 16:51:55 -07:00
Seth Alves	9256917f15	rebake mesh when a neighbor changes	2015-09-01 16:21:12 -07:00
Howard Stearns	0f227577b7	Merge pull request #5692 from sethalves/joint-bandwidth ... WARNING: protocol change - reduce joint-data bandwidth	2015-09-01 15:58:16 -07:00
Brad Davis	4e0bcf5395	Merge pull request #5699 from highfidelity/revert-5678-addressbar ... Revert "Address bar now closes when you click outside of it"	2015-09-01 15:36:49 -07:00
Leonardo Murillo	232fd72e53	Revert "Address bar now closes when you click outside of it"	2015-09-01 16:32:29 -06:00
Seth Alves	4ab8ac29b9	make terrain a doubly linked list	2015-09-01 15:23:47 -07:00
Seth Alves	264d39aa9b	have knitted polyvoxes keep track of low-axis neighbors as well as high	2015-09-01 14:49:17 -07:00
Ryan Downe Karpf	710f7c002e	Merge pull request #5678 from SeijiEmery/addressbar ... Address bar now closes when you click outside of it	2015-09-01 14:42:19 -07:00
Ryan Downe Karpf	f0d69b1cdd	Merge pull request #5665 from ctrlaltdavid/20664 ... Add search radius field to entities list	2015-09-01 14:39:53 -07:00
Stephen Birarda	9a4d666b0c	no consts if HAVE_SIXENSE not set	2015-09-01 15:33:54 -06:00
Stephen Birarda	2ce225d76c	fix for sixense not present on OS X	2015-09-01 15:33:46 -06:00
Andrew Meadows	a7d57d7c60	cleanup whitespace	2015-09-01 14:31:47 -07:00
Andrew Meadows	4a7a384c65	avoid bad joints when computing bounding capsule	2015-09-01 14:12:14 -07:00
Seth Alves	7194700c0b	pull from upstream	2015-09-01 13:39:33 -07:00
Seth Alves	e32b9191f5	bump AvatarData protocol version	2015-09-01 13:35:58 -07:00
Seth Alves	6f80c484b4	cleanups	2015-09-01 13:33:19 -07:00