2925 commits

Author	SHA1	Message	Date
Andrew Meadows	ccdf383151	Merge hifi/master into hifi/out-of-body-experience	2016-11-07 08:24:26 -08:00
Brad Hefta-Gaub	2684aed523	Merge pull request #8995 from AndrewMeadows/avoid-zero-quaternion ... normalize quaternions submitted to C++ from JS	2016-11-04 14:34:42 -07:00
Andrew Meadows	4b623f72c3	compute correct volume for ellipsoid	2016-11-03 18:05:50 -07:00
Andrew Meadows	0d2cec290d	use convexHull for ellipsoidal "spheres"	2016-11-03 17:56:38 -07:00
Andrew Meadows	3ed3a74b7d	oops, don't forget to remove the sqrt	2016-11-03 17:08:42 -07:00
Andrew Meadows	c9c0b9ebc4	tighten rejection of zero-length quaternions	2016-11-03 17:01:09 -07:00
Andrew Meadows	757ec5fff4	normalize quaternions submitted from scriptland	2016-11-03 16:02:39 -07:00
samcake	3c777bb079	Clenaing up the detection phase to get all the iformation from DXGI	2016-11-02 12:29:51 -07:00
samcake	49f1590e01	Start detecting all the gpus	2016-11-01 16:51:57 -07:00
samcake	861944ba71	Try uing DXGI on windows instead of com	2016-11-01 11:12:47 -07:00
samcake	a23bbd1e4e	Trying to extend the memory counter	2016-10-31 16:40:15 -07:00
Seth Alves	f47aeae2a7	stop passing bare pointers to EntityTreeRenderer all around	2016-10-27 10:10:22 -07:00
Andrew Meadows	38e4ac0ae9	Merge master into out-of-body-experience	2016-10-26 16:59:31 -07:00
Seth Alves	3903a51062	fix a couple of crash-on-exits	2016-10-25 13:58:48 -07:00
Brad Hefta-Gaub	da0d1f1f13	Merge pull request #8896 from ZappoMan/i5SandboxHeartbeat ... actually make the RunningMarker run on a different thread	2016-10-25 08:47:06 -07:00
Brad Hefta-Gaub	4cb693315f	CR feedback	2016-10-25 08:31:23 -07:00
Chris Collins	9846614468	Merge pull request #8879 from AndrewMeadows/show-physics-stats ... add Bullet profile info to PerformanceTimer stats	2016-10-25 06:29:27 -07:00
Brad Hefta-Gaub	ae6022c498	actually make the RunningMarker run on a different thread	2016-10-24 18:55:25 -07:00
Andrew Meadows	51a9a99381	Merge hifi/master into hifi/out-of-body-experience	2016-10-24 08:13:42 -07:00
Andrew Meadows	e44672180a	add Bullet profile info to PerformanceTimer stats	2016-10-21 13:22:22 -07:00
Seth Alves	8ac799ddaf	Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1	2016-10-20 10:02:58 -07:00
Chris Collins	98e7d6d0eb	Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0 ... Fix some audio mixer data races	2016-10-20 10:01:26 -07:00
Brad Hefta-Gaub	9008de72e0	Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments ... Adjustment to position and visibility of grab sphere.	2016-10-19 21:51:02 -07:00
Anthony J. Thibault	bcd31e3d99	Adjust size and offset of grab balls to better align with hand controllers. ... (cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)	2016-10-19 15:59:26 -07:00
Seth Alves	2e73330e8e	quiet warnings in Linux build	2016-10-18 17:47:47 -07:00
Seth Alves	a801f27c7c	Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-1	2016-10-18 17:34:22 -07:00
Seth Alves	72998b190c	Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-0	2016-10-18 17:33:57 -07:00
Seth Alves	af5be8d1d9	reduce data-races in logging	2016-10-18 15:59:00 -07:00
Atlante45	f143e9bf3f	Register SequenceNumber and time_point	2016-10-18 15:54:25 -07:00
Seth Alves	0c6dedff45	avoid various data-races related to stats collection and delivery	2016-10-18 13:05:53 -07:00
Brad Hefta-Gaub	d5c87a0db6	CR feedback	2016-10-17 12:02:23 -07:00
Brad Hefta-Gaub	d46170bec0	auto shutdown of sandbox when interface quits	2016-10-17 07:55:24 -07:00
Andrew Meadows	d54c07ed14	Merge 'master' into 'out-of-body-experience'	2016-10-12 13:35:27 -07:00
Andrew Meadows	55c90e7bca	Merge branch 'master' into out-of-body-experience	2016-10-07 15:18:08 -07:00
Ryan Huffman	e24a01d1fe	Add path parameter to goToSandbox	2016-10-07 10:30:18 -07:00
Seth Alves	7b5106afd8	Merge branch 'possible-fix-for-domain-server-crash' of github.com:sethalves/hifi into ac-client	2016-10-05 19:36:59 -07:00
Anthony J. Thibault	cc7a6ada38	Merge branch 'master' into out-of-body-experience	2016-10-05 17:16:39 -07:00
Clément Brisset	476ccadb38	Merge pull request #8732 from huffman/feat/category-in-logs ... Add category to log lines	2016-10-05 13:29:41 -07:00
Clément Brisset	d18394f249	Merge pull request #8596 from huffman/feat/my-avatar-self-id ... Add ability to parent overlays to MyAvatar for use across servers	2016-10-05 12:03:01 -07:00
Ryan Huffman	2bb2aca2be	Remove commented line in LogHandler	2016-10-04 16:54:37 -07:00
Ryan Huffman	a52e2d8bc5	Add category to log lines	2016-10-04 16:49:24 -07:00
Seth Alves	7261fcae4a	possible fix for domain-server crash-on-exit	2016-10-04 14:35:23 -07:00
Anthony J. Thibault	aab974e6ae	Merge branch 'master' into out-of-body-experience	2016-10-04 11:17:52 -07:00
Ryan Huffman	0b2def6013	Fix style error	2016-10-03 15:23:39 -07:00
Ryan Huffman	e213a47814	Fix incorrect return values in getProcessorInfo	2016-10-03 15:19:03 -07:00
Ryan Huffman	dafb5c5bab	Add processor information to launch user activity event	2016-10-03 15:11:56 -07:00
Anthony J. Thibault	eccd01e88f	Merge remote-tracking branch 'upstream/master' into out-of-body-experience	2016-09-29 16:36:25 -07:00
Anthony Thibault	10c5da5728	Smooth transition of hands from in-body to out-of-body modes.	2016-09-24 14:28:56 -07:00
Anthony J. Thibault	f4c4b3474b	capsule projection and distance tests now work for non-vertical capsules	2016-09-23 16:55:38 -07:00
Zach Pomerantz	a9318d052b	Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config	2016-09-23 13:11:52 -07:00