16738 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Hefta-Gaub	47b061983f	Merge pull request #3426 from birarda/master ... don't prepend relative paths with hifi scheme, use quat for location orientation	2014-09-16 10:29:54 -07:00
Stephen Birarda	866f2005bd	handle case where a location should be faced	2014-09-16 10:08:21 -07:00
Stephen Birarda	0033dfe5af	use quat orientation to store locations and user locations	2014-09-16 09:57:21 -07:00
Philip Rosedale	e5d947422a	Merge pull request #3425 from ZappoMan/butterflyCrash ... fix crash in butterflies.js	2014-09-16 09:34:01 -07:00
Stephen Birarda	4cef21aa4f	don't prepend relative paths with hifi scheme	2014-09-16 09:14:06 -07:00
ZappoMan	ffe1e2db00	fix crash in butterflies.js	2014-09-16 09:07:22 -07:00
Philip Rosedale	d01b73bdaa	Merge pull request #3423 from chansensturm/audio-temp ... Head Penumbra filter changes (feedback from testing with Freddy)	2014-09-15 20:00:11 -07:00
Craig Hansen-Sturm	ea6f89c9f4	head penumbra filter tuning / head penumbra filter now turned on by default	2014-09-15 18:46:10 -07:00
Craig Hansen-Sturm	b6c38b82dc	stray inline keyword	2014-09-15 18:41:41 -07:00
Craig Hansen-Sturm	8de32f1170	out-of-line inline's for performance critical member functions	2014-09-15 18:38:36 -07:00
Craig Hansen-Sturm	d8a4d71b08	out-of-line inline's for performance critical member functions	2014-09-15 18:38:32 -07:00
Brad Hefta-Gaub	cb1c8a9bb2	Merge pull request #3417 from thoys/load-script-from-message-example-js ... load a javascript from a message when the user agrees	2014-09-15 18:33:14 -07:00
Brad Hefta-Gaub	a9206e0e85	Merge pull request #3422 from chansensturm/audio-temp ... Implement Gordon-Smith 2-pole quadrature oscillator	2014-09-15 18:24:11 -07:00
Brad Hefta-Gaub	1ca11c5d75	Merge pull request #3421 from Atlante45/radio_js ... Radio js	2014-09-15 16:19:27 -07:00
Philip Rosedale	bd5cb346d2	Merge pull request #3420 from AndrewMeadows/ragdoll ... Walking avatar tweaks	2014-09-15 16:12:23 -07:00
Atlante45	9bed37c86c	Update position of audio	2014-09-15 16:05:26 -07:00
Atlante45	f3e2507ed3	Merge branch 'master' of https://github.com/highfidelity/hifi into radio_js	2014-09-15 15:54:31 -07:00
Philip Rosedale	8eeebd15da	Merge pull request #3418 from ey6es/master ... Ryan's new blendshape mappings for Mixamo.	2014-09-15 14:17:00 -07:00
Andrew Meadows	0539246089	merge upstream/master into andrew/ragdoll	2014-09-15 13:56:51 -07:00
Andrew Meadows	b2432876ce	More reliable floor detection for avatar movement. ... Also tweaked max walking speed.	2014-09-15 13:53:37 -07:00
Craig Hansen-Sturm	7a9cf193b4	Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise	2014-09-15 13:47:24 -07:00
Craig Hansen-Sturm	dbec48a804	Merge pull request #3419 from birarda/master ... add a missing update of having heard from the audio-mixer	2014-09-15 13:46:21 -07:00
Stephen Birarda	193c125d66	fix scope for switch case	2014-09-15 13:29:13 -07:00
Stephen Birarda	6e9da9747e	add a missing update of having heard from the audio-mixer	2014-09-15 13:25:50 -07:00
Andrzej Kapolka	6a0b3fa202	Ryan's new blendshape mappings for Mixamo.	2014-09-15 13:16:17 -07:00
Thijs Wenker	6feb732467	load a javascript from a message when the user agrees	2014-09-15 21:30:19 +02:00
Craig Hansen-Sturm	1c955384fb	coding standard/typo	2014-09-15 09:56:11 -07:00
Clément Brisset	198b14310f	Merge pull request #3416 from ZappoMan/fixGlitches ... normalize all quats before packing	2014-09-15 09:40:07 -07:00
ZappoMan	fd9f64cb44	normalize all quats before packing	2014-09-15 08:46:28 -07:00
Philip Rosedale	a70e27f442	Merge pull request #3411 from ZappoMan/fixWarnings ... fix warnings and removed some asserts	2014-09-14 20:28:39 -07:00
Philip Rosedale	06b6ceee66	Merge pull request #3412 from ZappoMan/fixStretchedAttachments ... fix bug with attachments being stretched	2014-09-14 20:26:56 -07:00
Craig Hansen-Sturm	0ba952b2f8	cleanup/remove stray static _frameOffset	2014-09-14 12:32:48 -07:00
Craig Hansen-Sturm	089267a937	completely remove new audio objects from playback rendering path when they are unused	2014-09-14 12:26:25 -07:00
Craig Hansen-Sturm	4a63f9f764	implement Gordon-Smith 2-pole quadrature oscillator	2014-09-14 12:22:32 -07:00
Craig Hansen-Sturm	85f68662b0	implement Gordon-Smith 2-pole quadrature oscillator	2014-09-14 12:22:29 -07:00
Craig Hansen-Sturm	2f4ab716f9	Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise	2014-09-14 11:32:00 -07:00
Stephen Birarda	57534ff0bb	Merge pull request #3414 from birarda/master ... fix for domain-server passing back stack manager config	2014-09-14 09:56:25 -07:00
Stephen Birarda	c98b69f24f	don't comment value return, rename domain settings file	2014-09-14 09:52:10 -07:00
Stephen Birarda	d6dca84694	add back commenting out of blind values return	2014-09-14 09:46:01 -07:00
Stephen Birarda	4d80417e3c	don't rename the config file to settings so existing nodes work	2014-09-14 09:45:02 -07:00
Stephen Birarda	cb7a6a7af5	don't blindly return all values if a type is not passed	2014-09-14 09:43:55 -07:00
Andrew Meadows	908f4f3a5e	merge upstream/master into andrew/ragdoll ... Conflicts: interface/src/scripting/GlobalServicesScriptingInterface.cpp	2014-09-13 17:25:35 -07:00
ZappoMan	c32d5db75c	fix bug with attachments being stretched	2014-09-13 15:32:21 -07:00
Craig Hansen-Sturm	6433616703	Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise	2014-09-13 12:11:07 -07:00
ZappoMan	ac27c36c3d	one more shot at these warnings	2014-09-13 09:40:44 -07:00
ZappoMan	d92d2d57a0	one more shot at these warnings	2014-09-13 09:28:28 -07:00
ZappoMan	95a63cf131	fix windows warning and change QByteArray initializer to match documented prototype	2014-09-13 09:14:52 -07:00
ZappoMan	04772f6e5d	fix more signed/unsigned warnings	2014-09-13 09:09:18 -07:00
ZappoMan	9c34aed36d	fix type signed/unsigned warning	2014-09-13 09:02:48 -07:00
ZappoMan	d6ebbd8633	fixed use of uninitialized variable warning	2014-09-13 09:01:27 -07:00