11138 commits

Author	SHA1	Message	Date
Seth Alves	8eec66c066	merge upstream, avatar can now fall onto a cube	2015-03-03 18:37:16 -08:00
Seth Alves	7e4b597ca3	keep physics specific code in PhysicsEngine	2015-03-03 15:45:10 -08:00
Seth Alves	5d4ef8d5b8	initial flailing	2015-03-03 14:30:26 -08:00
Stephen Birarda	8f2dc7e38b	resolve conflicts on merge with upstream master	2015-03-03 12:22:25 -08:00
Stephen Birarda	a961cd8ff3	show link to IRC in place of Qxmpp removal	2015-03-03 12:17:35 -08:00
Brad Hefta-Gaub	b118912708	Merge pull request #4361 from samcake/temp0 ... evolve the Transform stack away from the legacy GL to the brand new shader way	2015-03-03 11:43:01 -08:00
Brad Hefta-Gaub	29340b6586	Merge pull request #4369 from ctrlaltdavid/20370 ... CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361	2015-03-03 11:17:31 -08:00
Brad Hefta-Gaub	b88d52a310	Merge pull request #4363 from huffman/block-restricted-users ... Add permission-checking to edit entities	2015-03-03 11:04:46 -08:00
Sam Gateau	4619ba1f5b	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-03 10:56:04 -08:00
Stephen Birarda	27b9b345ca	remove ChatWindow includes from DialogsManager	2015-03-03 10:15:34 -08:00
Stephen Birarda	b270297406	remove a missed XmppClient include	2015-03-03 10:14:35 -08:00
Stephen Birarda	e43da00537	remove xmpp chat support	2015-03-03 10:13:41 -08:00
Stephen Birarda	5a601f3676	resolve conflicts on merge with upstream/master	2015-03-03 10:01:24 -08:00
Ryan Huffman	b370e025c9	Move EntityScriptingInterface instance to DependencyManager	2015-03-02 15:05:31 -08:00
ZappoMan	a338d96b9d	only render the overlay if we're actually rendering the overlay	2015-02-27 18:00:51 -08:00
ZappoMan	9cc66f3da7	cleanup stats display behavior, reset default settings for timing details	2015-02-27 17:57:42 -08:00
Sam Gateau	5652852d1a	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-27 17:35:59 -08:00
Sam Gateau	f92efa13c8	fix typo	2015-02-27 17:35:08 -08:00
Sam Gateau	5ab3cbb7ec	Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated	2015-02-27 17:11:16 -08:00
Philip Rosedale	af9108c79f	Merge pull request #4338 from ctrlaltdavid/20368 ... DO NOT MERGE - QA for 20368	2015-02-27 14:16:55 -08:00
Philip Rosedale	9eee213bce	Merge pull request #4353 from Atlante45/relax_face_tracker ... Relax blendshapes	2015-02-27 13:36:22 -08:00
Sam Gateau	ea88cbd75f	Merge with upstream master	2015-02-27 13:19:50 -08:00
David Rowe	797b1649a6	Merge branch 'master' into 20368 ... Conflicts: interface/src/devices/DdeFaceTracker.cpp	2015-02-27 12:48:21 -08:00
Brad Hefta-Gaub	08dc883b0e	Merge pull request #4351 from huffman/update-light-properties ... Update light properties (primarily for editEntities.js)	2015-02-27 10:54:19 -08:00
Philip Rosedale	35205fbbf3	Merge pull request #4347 from samcake/temp1 ... Introducing the SunSkyStage	2015-02-27 10:37:02 -08:00
Atlante45	fa8e1549f6	Relax blendshapes	2015-02-27 19:33:01 +01:00
Atlante45	db90fcdb62	Simplify expression	2015-02-27 16:09:15 +01:00
Atlante45	8615bb7cff	Make relaxation go to EPSILON within TIME	2015-02-27 15:58:28 +01:00
Atlante45	9849efe013	Exponential relaxation	2015-02-27 15:33:24 +01:00
Stephen Birarda	fc2f6d47bb	remove references to PrioVR in interface code	2015-02-26 17:28:00 -08:00
Stephen Birarda	38f77190eb	remove PrioVR from build files	2015-02-26 17:20:45 -08:00
Sam Gateau	d8ebb0c5b9	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -08:00
David Rowe	21f12c1d6c	Use cache ID when rendering talk bubble sphere	2015-02-26 13:50:43 -08:00
Atlante45	fdf9fdd877	Relax head/lean when not tracking	2015-02-26 20:05:47 +01:00
Ryan Huffman	e42b708b56	Update deferredLightingEffect::add*Light methods	2015-02-26 11:03:47 -08:00
Sam Gateau	fcb293d0b2	CLean up before pr	2015-02-26 10:45:00 -08:00
Atlante45	e37ef226fc	Simplify lookForward compute	2015-02-26 19:21:14 +01:00
Atlante45	682b3f5e61	Remove unused angular velocity	2015-02-26 19:18:52 +01:00
Atlante45	f560f97c6b	Only update active FaceTracker	2015-02-26 19:18:05 +01:00
Atlante45	b6968a6b15	Update Facetrackers	2015-02-26 19:15:49 +01:00
Atlante45	8eb4abc49c	Rework FaceTracker	2015-02-26 19:14:09 +01:00
Sam Gateau	a757229c0e	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-25 19:18:01 -08:00
Sam Gateau	6b29e314c2	Adding the Stage of the Scene and exposing control of the sun light from javascript	2015-02-25 19:05:27 -08:00
Andrew Meadows	7b68916010	Merge pull request #4343 from ZappoMan/hangOnExit ... BUG FIX: Hang on exit	2015-02-25 17:02:26 -08:00
ZappoMan	b03928cec7	some cleanup	2015-02-25 16:31:43 -08:00
ZappoMan	af43ba3444	used a registered quad for the audio box since its color constantly changes	2015-02-25 15:21:24 -08:00
Leonardo Murillo	006b3ed0ac	Merge pull request #4300 from birarda/dependencies ... NOT MERGEABLE - add some externals as cmake external projects	2015-02-25 13:22:49 -08:00
ZappoMan	912b851eb7	remove crufty references to QGLWidget	2015-02-25 12:54:34 -08:00
ZappoMan	d1e648b392	remove unused references to QGLWidget* parent in Overlay and Overlays	2015-02-25 12:34:38 -08:00
Brad Hefta-Gaub	6d237f3f79	Merge pull request #4339 from huffman/fix-plane-pick ... Fix plane pick	2015-02-25 12:23:45 -08:00