11164 commits

Author	SHA1	Message	Date
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
ZappoMan	a89691fc66	switch GLCanvas back to being owned by Application	2015-02-25 12:11:35 -08:00
ZappoMan	e66f12f958	add shutdown short circuiting to datagram processor	2015-02-25 10:56:08 -08:00
David Rowe	23e172a0a1	Remove attempt at individual eyebrow control	2015-02-25 10:44:57 -08:00
David Rowe	c5fba3e0ce	Improve mouth resting position and smile	2015-02-25 10:44:08 -08:00
Ryan Huffman	c499352ad8	Update billboard and planar overlays to use new findRayRectangleIntersection signature	2015-02-25 10:27:11 -08:00
Clément Brisset	b1e46c1bc8	Merge pull request #4337 from ZappoMan/crashonexit ... Fixes to various Crashes on shutdown	2015-02-25 08:47:36 -08:00
Brad Hefta-Gaub	0f4e098a61	Merge pull request #4334 from huffman/edit-ray-improvement ... Fix BillboardOverlay::findRayIntersection	2015-02-24 20:13:05 -08:00
Brad Hefta-Gaub	8c26be49d7	Merge pull request #4330 from huffman/edit-off-on-domain-change ... Turn editEntities off on domain change	2015-02-24 20:11:39 -08:00
David Rowe	b0ffaaa8b7	Smooth DDE blendshape coefficients a little	2015-02-24 18:53:35 -08:00
David Rowe	7a95ed2baa	Scale and clamp DDE blendshape coefficients	2015-02-24 17:38:20 -08:00
ZappoMan	310654831c	clean up comments remove dead code	2015-02-24 17:34:19 -08:00
ZappoMan	eab09eaf28	removed extra debugging	2015-02-24 17:15:58 -08:00
Ryan Huffman	eb21b74439	Replace Planar3DOverlay::findRayIntersection with GeometryUtil::findRayRectangleIntersection	2015-02-24 17:01:24 -08:00
Ryan Huffman	be7959bbcd	Fix BillboardOverlay findRayIntersection implementation	2015-02-24 17:00:55 -08:00
ZappoMan	89f7f2da2e	don't do idle process and painting if we're shutting down the application	2015-02-24 15:57:34 -08:00
ZappoMan	ca432a415f	Merge branch 'master' of https://github.com/highfidelity/hifi into crashonexit	2015-02-24 15:33:41 -08:00
Ryan Huffman	89c10ca2ec	Fix BillboardOverlay::findRayIntersection	2015-02-24 14:36:24 -08:00
David Rowe	e91a28a0a4	Rework DDE blendshape derivation and remove scaling and smoothing	2015-02-24 14:33:55 -08:00
ZappoMan	fd93b99f03	more hacking on script shutdown behavior	2015-02-24 14:02:46 -08:00
Andrew Meadows	1b669af79d	Merge pull request #4307 from Atlante45/fix_warnings ... Fix warnings	2015-02-24 12:19:32 -08:00
Andrew Meadows	efcac708b6	Merge pull request #4331 from PhilipRosedale/master ... Toyball is a textured baseball, added ability to get controller angular velocity	2015-02-24 12:19:20 -08:00
samcake	5202d2136a	Merge pull request #4319 from huffman/avatar-billboards ... Fix avatar billboards all rendering as the same billboard	2015-02-24 11:22:38 -08:00
Philip Rosedale	d74856e01b	add angularVelocity to controller	2015-02-24 11:21:04 -08:00
Ryan Huffman	4641bd0cd9	Add Window.domainChanged signal for scripting	2015-02-24 10:47:37 -08:00
ZappoMan	6be8f4c0ec	more work on improving shutdown behavior	2015-02-23 17:32:31 -08:00
Sam Gateau	04a39275ef	Trying to setup correctly the projection matrix for all the different cases...	2015-02-23 16:47:43 -08:00
Sam Gateau	687c76a6f8	trying to ge the shadow to render correctly	2015-02-23 13:12:29 -08:00
Stephen Birarda	2ad8ac866d	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
Stephen Birarda	2f4adbc2f7	also use release icon for RelWithDebInfo	2015-02-23 11:40:38 -08:00
Stephen Birarda	9878a93338	add a definition for shared QXmpp on win	2015-02-23 11:13:10 -08:00
Andrew Meadows	0455ccf7be	Merge pull request #4313 from ctrlaltdavid/20355 ... CR for 20355 - Initial Integration with DDE	2015-02-23 09:47:19 -08:00
ZappoMan	85cec79ff5	removing debug messages	2015-02-23 09:44:22 -08:00
Andrew Meadows	2519f66037	Merge pull request #4311 from huffman/application-dpi-scale ... Application dpi scale	2015-02-23 09:43:12 -08:00
Stephen Birarda	437d5c7bdf	repairs to include locations for QXmpp and SDL2	2015-02-23 09:26:35 -08:00
Stephen Birarda	d08f7d6255	check if QXmpp is dynamic or static	2015-02-23 08:24:52 -08:00
Clément Brisset	c6b1375863	Merge pull request #4322 from AndrewMeadows/thermonuclear ... workaround for scratchy audio on Windows	2015-02-23 07:18:30 -08:00
Sam Gateau	e9360a77f2	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-23 07:04:36 -08:00
Sam Gateau	90bff36fd3	trying to ge the shadow to render correctly	2015-02-22 18:48:48 -08:00
David Rowe	f169ab1238	Tidy and document DDE face tracker UDP socket opening and closing	2015-02-21 11:26:48 -08:00
David Rowe	8d9685ee39	Fix Face Tracking menu operation	2015-02-21 11:01:07 -08:00
ZappoMan	2e7a43a7fb	more hacking	2015-02-20 18:47:47 -08:00
Ryan Huffman	e6d9a1b251	Merge branch 'master' of github.com:highfidelity/hifi into application-dpi-scale ... Conflicts: interface/src/ui/LoginDialog.cpp	2015-02-20 18:09:55 -08:00
ZappoMan	8c4474b2d0	more hacking	2015-02-20 17:55:04 -08:00
Stephen Birarda	c64f172311	add qxmpp as external project	2015-02-20 16:06:37 -08:00
ZappoMan	0b607fa390	first cut at shutting down scripts ahead of other cleanup	2015-02-20 15:28:25 -08:00
Stephen Birarda	bc0bd462cb	add an external project for SDL 2	2015-02-20 15:26:16 -08:00
Stephen Birarda	5e264f8241	add GLEW as dependency external project	2015-02-20 13:47:38 -08:00
David Rowe	3a95614ca4	Update Faceshift readme.txt with Windows instructions	2015-02-20 11:29:51 -08:00
Ryan Huffman	5c3cae471b	Fix avatar billboards all rendering as the same billboard	2015-02-20 09:48:04 -08:00
Andrew Meadows	aa667464c0	merge upstream/master into andrew/thermonuclear	2015-02-20 08:26:51 -08:00
Andrew Meadows	599ef68df8	fix for scratchy audio on windows	2015-02-20 08:26:11 -08:00
Stephen Birarda	44f8e599e2	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
Stephen Birarda	c3b9198ec3	cleanup handling of external projects if OS not handled	2015-02-19 15:19:52 -08:00
Ryan Huffman	4dfe725721	Update preferences dialog to use layouts throughout	2015-02-19 14:02:15 -08:00
Stephen Birarda	6b08b2993a	fix for bullet system include to silence warnings	2015-02-19 13:03:16 -08:00
Stephen Birarda	6f055ca0d7	add an external project to handle bullet	2015-02-19 12:01:40 -08:00
Ryan Huffman	4a8e3193a9	Add more comments to UIUtil::scaleWidgetFontSizes	2015-02-19 12:01:27 -08:00
Jason Hawks	d0b47a66ab	removed at symbol and added enter for teleport box	2015-02-19 14:49:00 -05:00
Clément Brisset	d2ed782626	Merge pull request #4308 from Triplelexx/20315 ... CR for Job #20315 - Update contents of the "welcome to Interface" dialog	2015-02-19 10:27:27 -08:00
Andrew Meadows	21405135f9	Merge pull request #4310 from talentraspel/20323 ... CR for Job #20323 - BUG: another crash on exit in interface	2015-02-19 09:52:23 -08:00
Ryan Huffman	a8999964f6	Cleanup dpi scaling comments	2015-02-18 16:21:51 -08:00
Ryan Huffman	4751974c45	Revert "Add scaling for high-dpi Windows/Linux displays" ... This reverts commit 2828b65bea.	2015-02-18 16:16:50 -08:00
Ryan Huffman	03eb1a984f	Revert "Fix dpi scaling in getViewportDimensions" ... This reverts commit 9b719273ab.	2015-02-18 16:15:53 -08:00
Ryan Huffman	22d46e3e6b	Update runningscripts script font to match parent	2015-02-18 15:33:24 -08:00
Ryan Huffman	9b719273ab	Fix dpi scaling in getViewportDimensions	2015-02-18 15:30:39 -08:00
Ryan Huffman	2828b65bea	Add scaling for high-dpi Windows/Linux displays	2015-02-18 15:09:41 -08:00
David Rowe	24d03deb21	Fix typo	2015-02-18 15:02:44 -08:00
Ryan Huffman	51f5719e0f	Update font sizes in running scripts window	2015-02-18 14:59:52 -08:00
Ryan Huffman	b2e1d8a38c	Remove font scaling based on system DPI	2015-02-18 14:37:56 -08:00
Ryan Huffman	7dab39a2f1	Add qDebug message to scaleWidgetFontSizes	2015-02-18 14:16:33 -08:00
Stephen Birarda	b2e587dbbd	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
Ryan Huffman	ff1fb07b2d	Add high-dpi support to scaleWidgetFontSizes	2015-02-18 14:04:02 -08:00
Ryan Huffman	4a383ff177	Update font sizes in running scripts panel	2015-02-18 13:56:41 -08:00
David Rowe	889851f6ea	Fix typo	2015-02-18 13:51:50 -08:00