25581 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	ab9d6a948c	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-21 18:22:09 -07:00
Seth Alves	1100c832eb	clean up diff	2015-05-21 18:18:04 -07:00
Seth Alves	f85cc89946	clean up diff	2015-05-21 18:17:07 -07:00
Philip Rosedale	05a73d8a79	Merge pull request #4933 from ericrius1/inspectFix ... added oldMode as global vairable	2015-05-21 18:14:40 -07:00
Eric Levin	ce1ccf1c40	added oldMode as global vairable	2015-05-21 18:08:04 -07:00
Seth Alves	90a5dd6dd1	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-21 18:07:52 -07:00
Seth Alves	a882fc7fb1	pull out common parts of the two sphere-in-volumes	2015-05-21 18:07:46 -07:00
Philip Rosedale	e0e1744d2e	Merge pull request #4931 from ericrius1/inspect ... inspect now uses accurate picking and camera slerps to looks at targe…	2015-05-21 17:15:30 -07:00
Seth Alves	8b2d570f3f	clearSphereInVolume	2015-05-21 17:04:57 -07:00
Seth Alves	478cb40135	draws in the right place, now	2015-05-21 16:46:27 -07:00
Seth Alves	2cb73b5430	added a volex-volume size member variable. drawing transform still isn't quite right	2015-05-21 16:31:01 -07:00
Seth Alves	85171f033e	fallout from no-swap-id merge	2015-05-21 16:30:16 -07:00
Eric Levin	8a0c1cab1e	inspect now uses accurate picking and camera slerps to looks at target. pointer does not show u when user is inspecting	2015-05-21 15:31:30 -07:00
Seth Alves	bbb61a77d9	dodge stride bug in mesh code	2015-05-21 14:47:23 -07:00
Seth Alves	fd19c63449	fix bug in mesh	2015-05-21 14:26:40 -07:00
Stephen Birarda	986eea7c86	Merge pull request #4930 from birarda/domain-wizard ... fix for domain-server settings account disconnect	2015-05-21 16:46:10 -04:00
Stephen Birarda	33545a0c3f	fix for domain-server settings account disconnect	2015-05-21 13:45:50 -07:00
Seth Alves	6a3203475a	Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox	2015-05-21 11:57:54 -07:00
Seth Alves	0c1ad258f3	update polyvox	2015-05-21 11:57:37 -07:00
Seth Alves	bd94d28075	Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox	2015-05-21 11:55:17 -07:00
Seth Alves	8e76887101	working on windows build of polyvox	2015-05-21 11:55:13 -07:00
Seth Alves	b74262f2ce	update polyvox	2015-05-21 11:53:56 -07:00
Seth Alves	c02b87ad1c	update polyvox	2015-05-21 11:09:44 -07:00
Seth Alves	b922976524	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-21 10:43:03 -07:00
Seth Alves	fe188f9a43	something draws, now	2015-05-21 10:42:14 -07:00
Stephen Birarda	f4f4be7917	Merge pull request #4926 from birarda/domain-toggle ... reload the DS merged config after making version required changes	2015-05-21 13:27:51 -04:00
Stephen Birarda	5d9f62066a	reload the merged config after making versioned changes	2015-05-21 10:27:24 -07:00
Seth Alves	72e227eefe	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-21 09:55:14 -07:00
Brad Hefta-Gaub	a503deb3ca	Merge pull request #4920 from sethalves/no-id-swap-redux ... No id swap redux	2015-05-21 09:51:11 -07:00
Seth Alves	52ce26d80d	Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux	2015-05-21 09:20:56 -07:00
Philip Rosedale	1b0ef406ed	Merge pull request #4921 from birarda/domain-toggle ... add a global toggle for restricted users	2015-05-20 21:27:10 -07:00
Seth Alves	de6422683a	cleanups, trying to figure out why this doesn't draw	2015-05-20 21:21:39 -07:00
Seth Alves	7ee2ff6777	Merge pull request #4922 from birarda/ac-ice-connect ... handle AC started before local assignment server	2015-05-20 19:40:24 -07:00
Seth Alves	38edc27cbb	Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux	2015-05-20 18:24:40 -07:00
Seth Alves	c3b26b78a0	Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox	2015-05-20 18:22:16 -07:00
Seth Alves	138077ede9	hook up mesh renderer	2015-05-20 18:22:07 -07:00
Seth Alves	a69518801f	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-20 18:21:04 -07:00
Brad Hefta-Gaub	3edf2af5ec	Merge pull request #4923 from jherico/matrix_assert ... Fix assert caused by calling glm::perspective with nonsensical values	2015-05-20 18:20:28 -07:00
Brad Davis	079a7f2600	Fix assert caused by calling glm::perspective with nonsensical values	2015-05-20 18:11:14 -07:00
Seth Alves	d7ccd23b07	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-20 18:08:29 -07:00
Stephen Birarda	427e2e7dbf	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-toggle	2015-05-20 18:00:40 -07:00
Stephen Birarda	b6f458eaf1	Merge branch 'master' of https://github.com/highfidelity/hifi into ac-ice-connect	2015-05-20 17:59:40 -07:00
Seth Alves	a935b923c8	Merge pull request #4919 from birarda/master ... repairs to domain-server settings for hashes	2015-05-20 17:59:12 -07:00
Seth Alves	aa1d3eb82a	respond to code review	2015-05-20 17:31:57 -07:00
Stephen Birarda	45daabc86f	remove unused AssignmentClient shared mem var	2015-05-20 17:14:27 -07:00
Stephen Birarda	bea387af7d	extra debug for failed local AS port read	2015-05-20 17:13:18 -07:00
Stephen Birarda	7373bb6817	contain QSharedMemory for local server port to reader	2015-05-20 17:11:08 -07:00
samcake	496898273c	Merge pull request #4846 from jherico/dk1 ... Second attempt at fixing the HMD eye projections, without breaking the camera this time.	2015-05-20 17:02:28 -07:00
Stephen Birarda	27db69207d	Merge branch 'master' of https://github.com/highfidelity/hifi into ac-ice-connect	2015-05-20 16:50:15 -07:00
Stephen Birarda	4475ca4643	use new restricting access toggle for DS connection	2015-05-20 16:47:10 -07:00