22463 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ZappoMan	a8d48e592f	removing debug messages	2015-02-23 09:44:18 -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
ZappoMan	e5ef61e27e	simplifying the change	2015-02-23 09:23:15 -08:00
Stephen Birarda	9a069f56ab	indicate in win build guide that nmake should be in path	2015-02-23 09:13:59 -08:00
Stephen Birarda	c3d98b1289	use nmake for install of QXmpp on windows	2015-02-23 09:11:52 -08:00
Stephen Birarda	e53221e297	remove an extra space	2015-02-23 09:11:17 -08:00
Stephen Birarda	9e5fb9532b	clear up BUILD guide for optional external projects	2015-02-23 09:11:06 -08:00
ZappoMan	d32fc645e8	remove some dead code, added a debugging notes comment	2015-02-23 09:10:15 -08:00
Seth Alves	e0263d8843	Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare	2015-02-23 09:06:43 -08:00
Stephen Birarda	1b8d421fb3	add a fatal error if nmake not found	2015-02-23 09:06:39 -08:00
Stephen Birarda	1c707059c5	fix for quoted PLATFORM_BUILD_COMMAND for QXmpp	2015-02-23 08:46:16 -08:00
Stephen Birarda	28bcc0a952	use nmake on win for QXmpp build	2015-02-23 08:43:18 -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
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
ZappoMan	e3de994c4a	more hacking	2015-02-20 18:42:02 -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
Andrew Meadows	d650a092c2	Merge pull request #4321 from ctrlaltdavid/faceshift-readme ... Update Faceshift readme.txt with Windows instructions	2015-02-20 18:02:35 -08:00
Andrew Meadows	d5733f3782	Merge pull request #4318 from PhilipRosedale/master ... Billiard balls are now textured models	2015-02-20 17:59:33 -08:00
ZappoMan	8c4474b2d0	more hacking	2015-02-20 17:55:04 -08:00
Andrew Meadows	27e6f99deb	use strings for shapeType for JS Entity properties	2015-02-20 16:54:58 -08:00
Stephen Birarda	c64f172311	add qxmpp as external project	2015-02-20 16:06:37 -08:00
ZappoMan	b219937902	switch known scripts iterator	2015-02-20 15:46:11 -08:00
Stephen Birarda	fd8e9bad20	fix casing in find modules for gverb and soxr	2015-02-20 15:36:59 -08:00
Stephen Birarda	dc9c4ea43c	add options with default for get of external projects	2015-02-20 15:34:41 -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
Seth Alves	bbb6e048f5	Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare	2015-02-20 14:30:35 -08:00
Brad Hefta-Gaub	70400f7f8c	Merge pull request #4323 from huffman/notifciation-local-only-audio ... Update notifications.js audio to be local-only	2015-02-20 14:29:20 -08:00
Seth Alves	270d509a12	cleanups	2015-02-20 14:29:12 -08:00
Seth Alves	8cee88acb4	network chatter between Monitor and AssignmentClients is expected to be localhost only	2015-02-20 14:25:43 -08:00
Seth Alves	70c96e496f	don't print ^a to qDebug for unassigned node type	2015-02-20 14:25:13 -08:00
Ryan Huffman	cf0b13f869	Update notifications.js audio to be local-only	2015-02-20 14:22:59 -08:00
Stephen Birarda	d6105e2e8c	fix link to external project dependencies section	2015-02-20 14:20:44 -08:00
Stephen Birarda	175966cce8	clarify build guide for external projects	2015-02-20 14:19:08 -08:00
Stephen Birarda	b23dd28b56	don't use static version of GLEW	2015-02-20 14:01:01 -08:00
Stephen Birarda	c242b4e834	set GLEW debug version to NOTFOUND	2015-02-20 13:55:40 -08:00
Stephen Birarda	ef729201d6	fix external name for GLEW	2015-02-20 13:51:12 -08:00
Stephen Birarda	5e264f8241	add GLEW as dependency external project	2015-02-20 13:47:38 -08:00
Seth Alves	4bba4fc387	cleanups	2015-02-20 13:44:37 -08:00
Seth Alves	907be67135	cleanups	2015-02-20 13:34:51 -08:00
Seth Alves	bd3d7124e2	cleanups	2015-02-20 13:31:58 -08:00
Seth Alves	56d237ae8b	cleanups	2015-02-20 13:28:24 -08:00
Seth Alves	feb0e7ac31	AssignmentClientMonitor doesn't keep a list of its children. Instead it knows about active children due to their entries in the NodeList. Every few seconds, if 2 or more children are idle, the Monitor will ask one to exit	2015-02-20 13:26:59 -08:00
Stephen Birarda	32fa2e8d31	add missing docstring to AddPathsToLibPaths	2015-02-20 12:24:17 -08:00
Stephen Birarda	b7cc163ca4	lib paths is actually a string	2015-02-20 12:21:10 -08:00
Stephen Birarda	a85cb2eeaa	don't log glm install so it is shown in log	2015-02-20 12:18:14 -08:00