22600 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	954a298dc4	correct QXmpp DLL path for windows	2015-02-23 13:04:12 -08:00
Stephen Birarda	2ad8ac866d	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
Stephen Birarda	b32fa0f33d	pass correct configuration to bullet install target	2015-02-23 12:27:30 -08:00
Stephen Birarda	88130feb11	force release build of bullet on win32	2015-02-23 12:19:54 -08:00
Stephen Birarda	8d97107acf	use ALL_BUILD for bullet msbuild	2015-02-23 12:12:36 -08:00
Stephen Birarda	9e1a890ff2	fix for msbuild target command	2015-02-23 12:09:00 -08:00
Stephen Birarda	ded0b1461b	help cmake find msbuild	2015-02-23 12:04:35 -08:00
Thijs Wenker	793116b90c	ability to mute all notifications or just certain types	2015-02-23 21:00:26 +01:00
Stephen Birarda	e60d91e4ce	fix for bullet debug or release build on windows	2015-02-23 12:00:19 -08:00
Andrew Meadows	f2fc781523	change shapeType to use strings in billiards.js	2015-02-23 11:42:36 -08:00
Andrew Meadows	456acd8833	merge upstream/master into andrew/bispinor	2015-02-23 11:41:40 -08:00
Stephen Birarda	2f4adbc2f7	also use release icon for RelWithDebInfo	2015-02-23 11:40:38 -08:00
ZappoMan	7e2d355b56	first cut at properly shutting down timers while shutting down scripts	2015-02-23 11:40:30 -08:00
Andrew Meadows	2e1c122915	moved ShapeType boilerplate stuff macos	2015-02-23 11:38:56 -08:00
Stephen Birarda	5983a94c7f	force bullet cmake build to be RelWithDebInfo	2015-02-23 11:29:42 -08:00
Stephen Birarda	6803aa8d91	fix copy paste typos	2015-02-23 11:22:21 -08:00
Stephen Birarda	1372436e63	handle possibility that bullet builds debug libraries	2015-02-23 11:20:50 -08:00
Stephen Birarda	9878a93338	add a definition for shared QXmpp on win	2015-02-23 11:13:10 -08:00
Seth Alves	0b9b7f06cc	address various comments from code review	2015-02-23 11:12:19 -08:00
Stephen Birarda	80da0a1702	use empty string for not present debug libraries	2015-02-23 11:11:35 -08:00
Stephen Birarda	353f7e2f96	set qxmpp debug library to empty string	2015-02-23 10:59:54 -08:00
Stephen Birarda	0990910ed2	add a missing period for apple qxmpp ext	2015-02-23 10:41:48 -08:00
Stephen Birarda	6042ba6cf2	fix for qxmpp name on win and lib location	2015-02-23 10:36:20 -08:00
Stephen Birarda	16c557a9c7	copy over /tmp/hifi.dst dir for xcode qxmpp install	2015-02-23 10:32:06 -08:00
Andrew Meadows	0fc4c732f7	use macro for copying shapeType string to script	2015-02-23 10:13:47 -08:00
ZappoMan	1efa7b28b0	removed dead code	2015-02-23 10:04:14 -08:00
Stephen Birarda	2463292339	link SDL2 as a downloaded framework on OS X	2015-02-23 10:00:44 -08:00
Stephen Birarda	e71a8258d6	fix SDL2 framework link on OS X	2015-02-23 09:52:35 -08:00
Stephen Birarda	82a798ef15	use SDL2 framework on OS X	2015-02-23 09:47:35 -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
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
Virendra Singh	8212f86bfb	Minor grammar corrections ... Corrected line breaks.	2015-02-23 12:19:45 +05:30
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
Virendra Singh	5949d01bbd	Merge branch 'master' of https://github.com/highfidelity/hifi into 20305	2015-02-21 15:45:42 +05:30