15871 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Hefta-Gaub	9b35dc784d	Merge pull request #3320 from chansensturm/master ... added high-shelf and low-shelf filters, positional audio now uses high-shelf filter	2014-08-26 13:13:10 -07:00
Craig Hansen-Sturm	47bc183439	SQUARE_ROOT_OF_TWO renamed SQUARE_ROOT_OF_TWO_OVER_TWO	2014-08-26 11:32:05 -07:00
Craig Hansen-Sturm	5f695664a6	add explicit constants inline for documebntation purposes	2014-08-26 11:26:39 -07:00
Clément Brisset	ee5765c0a4	Merge pull request #3321 from ZappoMan/fixReferentialsBug ... fix bug in referentials	2014-08-26 10:16:08 -07:00
ZappoMan	74585bc593	fix bug in referentials	2014-08-26 10:14:28 -07:00
Brad Hefta-Gaub	a51cace167	Merge pull request #3319 from Atlante45/sitting_points_not_disappearing_when_switching_to_fake_domain ... fix sitting points on domain switch	2014-08-25 18:42:19 -07:00
Craig Hansen-Sturm	2abaa387d2	Merge remote-tracking branch 'upstream/master'	2014-08-25 18:18:01 -07:00
Craig Hansen-Sturm	950862839e	added high-shelf and low-shelf filters, positional audio now uses high-shelf filter, significant reformatting/renaming of AudioFilter.h for coding standard	2014-08-25 18:17:32 -07:00
Atlante45	1acce5c725	fix sitting points on domain switch	2014-08-25 18:02:30 -07:00
Clément Brisset	91946e048f	Merge pull request #3318 from ctrlaltdavid/19915 ... Code Review for Job #19915	2014-08-25 16:49:02 -07:00
Andrzej Kapolka	e29a4e7683	Merge pull request #3312 from AndrewMeadows/ragdoll ... use dispatchTable for shape-vs-shape collision queries	2014-08-25 15:43:48 -07:00
Andrzej Kapolka	12d641ddba	Merge pull request #3317 from AndrewMeadows/inertia ... fix for crash when computing average image color	2014-08-25 15:43:32 -07:00
Andrew Meadows	7a5c4fdb16	remove commented out #includes	2014-08-25 15:25:46 -07:00
Andrew Meadows	8057071c12	put averageColor init closer to where it is used	2014-08-25 15:18:57 -07:00
Andrew Meadows	3ad9797607	fix crash: divide by zero when computing avg color	2014-08-25 15:15:27 -07:00
Brad Hefta-Gaub	fe1a333ede	Merge pull request #3316 from chansensturm/master ... add support for head-shadow/penumbra filter for positional audio streams	2014-08-25 13:19:53 -07:00
Craig Hansen-Sturm	4f346bfe62	addresses more coding-standard spacing issues	2014-08-25 13:07:52 -07:00
Craig Hansen-Sturm	bf6d34b6f3	windows/linux build break + addresses zappoman review comments	2014-08-25 11:43:49 -07:00
Brad Hefta-Gaub	63df2b2372	Merge pull request #3315 from AndrewMeadows/inertia ... quick fix for clearJointData() in JS scripts	2014-08-25 11:15:03 -07:00
Craig Hansen-Sturm	fd5e3d61dc	minor cleanup of playSoundOrbit.js + playSound.js	2014-08-25 10:55:11 -07:00
Andrew Meadows	6cdee21a50	fix for clearJointData() in JS scripts ... let the JointState class verify animation priority	2014-08-25 10:40:28 -07:00
Craig Hansen-Sturm	848144d98c	Merge remote-tracking branch 'upstream/master'	2014-08-24 22:17:30 -07:00
Craig Hansen-Sturm	4cd1f4afef	add support for head-shadow/penumbra filter for positional audio streams	2014-08-24 22:17:07 -07:00
Andrew Meadows	1bd7734ec1	sometimes swap order of shapes for simpler code	2014-08-22 18:07:11 -07:00
Andrew Meadows	de0ebf2f57	make sure all test errors have newline at end	2014-08-22 17:33:31 -07:00
Andrew Meadows	5d39efea82	make sure each test error has a newline at end	2014-08-22 17:26:19 -07:00
Philip Rosedale	3fbbeecb8c	Merge pull request #3314 from ey6es/metavoxels ... Support for scaling splat textures in S and T, use mipmaps for them.	2014-08-22 17:18:10 -07:00
Andrzej Kapolka	2dfabdfe64	Support for scaling splat textures in S and T, use mipmaps for them.	2014-08-22 16:43:09 -07:00
Andrew Meadows	1be922f986	add shapeVsList etc to dispatch table ... renamed some functions for more readability	2014-08-22 11:20:53 -07:00
David Rowe	761387854d	Extrude per mouse movement in voxel space instead of screen space	2014-08-22 10:09:10 -07:00
David Rowe	c8ac5f584a	Convert to vector maths	2014-08-22 09:29:08 -07:00
AndrewMeadows	4f3f0989f5	Merge pull request #3313 from ctrlaltdavid/libovr_readme ... Bring libovr build instructions up to date	2014-08-22 09:27:04 -07:00
Philip Rosedale	6a340a1494	Merge pull request #3310 from ey6es/metavoxels ... First cut at splatted terrain textures.	2014-08-22 08:27:16 -07:00
David Rowe	cd81d6fc07	Bring libovr build instructions up to date	2014-08-21 19:24:09 -07:00
Andrzej Kapolka	e9e3671710	Increment the version number.	2014-08-21 18:14:10 -07:00
Andrzej Kapolka	5c77317cfd	Fix for flashing when painting textures.	2014-08-21 18:07:30 -07:00
Andrew Meadows	3ebd8c1969	use dispatchTable for shape-vs-shape collisions	2014-08-21 16:40:25 -07:00
Andrzej Kapolka	6e06b63709	For splat textures, use transparent white as a default.	2014-08-21 16:33:09 -07:00
Andrzej Kapolka	530f5b0df8	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-08-21 16:00:30 -07:00
Andrzej Kapolka	e152e0c2be	Detachment fix.	2014-08-21 15:22:34 -07:00
Andrzej Kapolka	74b39773d6	Don't merge after expansion; it breaks stuff.	2014-08-21 14:50:58 -07:00
Clément Brisset	6a6670a962	Merge pull request #3307 from AndrewMeadows/inertia ... JS scripts can set spine rotation	2014-08-21 11:07:39 -07:00
Andrew Meadows	1bc88a0224	merge upstream/master into andrew/ragdoll	2014-08-21 09:58:58 -07:00
AndrewMeadows	ff9f079704	Merge pull request #3308 from Atlante45/record_feature ... Record feature Scripted UI	2014-08-21 09:56:02 -07:00
Andrew Meadows	9ada8435be	Merge branch 'huffman-19908' into upstream/master	2014-08-21 09:22:38 -07:00
Andrew Meadows	328167464f	Merge branch '19908' of github.com:huffman/hifi into huffman-19908 ... Conflicts: interface/src/Menu.cpp	2014-08-21 09:21:24 -07:00
Andrew Meadows	bc1276944c	merge upstream/master into andrew/ragdoll	2014-08-21 08:21:36 -07:00
Andrew Meadows	080c191727	namechange updateConstraint() -> buildConstraint()	2014-08-21 08:20:31 -07:00
Atlante45	022109a249	Added timestamps to the scripted UI	2014-08-20 19:36:56 -07:00
Andrzej Kapolka	72500630b0	Basic splatting.	2014-08-20 19:26:06 -07:00