11005 commits

Author	SHA1	Message	Date
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
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
Stephen Birarda	c64f172311	add qxmpp as external project	2015-02-20 16:06:37 -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
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
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
Stephen Birarda	b2e587dbbd	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
Stephen Birarda	1f7c3a0eb2	Merge branch 'master' of https://github.com/highfidelity/hifi into dependencies	2015-02-18 09:40:10 -08:00
Clément Brisset	6e5c3593b6	Merge pull request #4298 from talentraspel/20339 ... removed id "g3322" in start-script.svg because it is no longer used and ...	2015-02-18 06:13:35 -08:00
Clément Brisset	3f117ce322	Merge pull request #4293 from AndrewMeadows/thermonuclear ... fix crash in AudioScope for bad memory access	2015-02-18 06:03:03 -08:00
Stephen Birarda	c110fcbfad	merge with upstream/master	2015-02-17 17:34:48 -08:00
Stephen Birarda	6fc74eb830	fix cmake build type check for interface icon	2015-02-17 14:56:34 -08:00
Stephen Birarda	97fa1412e2	copy dlls beside windows executable for all executables	2015-02-17 14:45:26 -08:00
Stephen Birarda	767601de4f	use a cache variable to pass around lib paths	2015-02-17 14:09:26 -08:00
Stephen Birarda	250b25154c	test for recursive dll dir search	2015-02-17 13:41:37 -08:00
Stephen Birarda	bc899eaa58	add fixup_bundle step for WIN32 interface	2015-02-17 13:17:23 -08:00
Seth Alves	dd64eeb282	fix uninitialized geometry cache id in Line3DOverlay	2015-02-17 11:47:29 -08:00
Stephen Birarda	e99012efbb	updates to build guides to remove soxr	2015-02-17 10:33:12 -08:00
Andrew Meadows	9895df6e7e	merge upstream/master into andrew/thermonuclear	2015-02-17 10:05:36 -08:00
Andrew Meadows	53855c89e9	Merge pull request #4289 from birarda/dependencies ... add gverb and glm as cmake external projects	2015-02-17 10:00:29 -08:00
Kai Ludwig	0de598586c	removed id "g3322" in start-script.svg because it is no longer used and causes a "link rect899 hasn't been detected!" message on script editor open.	2015-02-17 18:37:23 +01:00
Andrew Meadows	bc664435e7	Merge pull request #4296 from thoys/20318 ... CR for Job #20318 - BUG: Login menu item not popping up	2015-02-17 09:28:53 -08:00
Andrew Meadows	dba206337b	Merge pull request #4294 from thoys/20348 ... CR for Job #20348 - Change audio meter background back to white	2015-02-17 09:24:05 -08:00
Andrew Meadows	d896f3a811	Merge pull request #4252 from thoys/20224 ... CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads	2015-02-17 09:03:17 -08:00
Thijs Wenker	4a3550ce0e	toggleQAction(); in constructor to make the right initial button connection	2015-02-17 02:27:07 +01:00
Thijs Wenker	42e4eee15e	audio meter background "back in black" / "paint it black"	2015-02-16 23:14:27 +01:00
Andrew Meadows	57797329d1	do sample size arithmetic before scaling by sizeof	2015-02-16 12:14:03 -08:00
Stephen Birarda	8acaa062a2	Merge pull request #4281 from Atlante45/fix_mute_environnement ... Fix mute environnement	2015-02-16 09:11:47 -08:00
Brad Hefta-Gaub	9b6049489b	Merge pull request #4280 from AndrewMeadows/inertia ... remove a couple crash modes on shutdown	2015-02-13 17:11:56 -08:00
Brad Hefta-Gaub	2f492082c1	Merge pull request #4287 from sethalves/fix-Rectangle3d-drawing-problem ... fix Rectangle3d drawing problem	2015-02-13 16:30:46 -08:00
Andrew Meadows	9122364c3b	merge upstream/master into andrew/inertia	2015-02-13 16:20:09 -08:00
Andrew Meadows	cfbf8fdca7	explicit cleanup of loaded model animations ... in Application dtor	2015-02-13 16:19:10 -08:00
ZappoMan	1fc0225939	change ScriptCache and SoundCache to derive from Dependency	2015-02-13 15:33:41 -08:00
Seth Alves	42511f3b7f	M-x mangle buffer	2015-02-13 15:23:22 -08:00
Seth Alves	98b445b22f	the geometryCacheID for Rectangle3DOverlay wasn't being initialized (so was randomish). if they overlapped, some would be drawn looking like others	2015-02-13 15:21:03 -08:00
Andrew Meadows	589077bce6	try again: move stuff around in ~Application	2015-02-13 14:01:56 -08:00
Stephen Birarda	8c998a65ee	use the glm find_package and check externals	2015-02-13 12:50:32 -08:00
Andrew Meadows	37be7251fe	merge upstream/master into andrew/inertia ... Conflicts: interface/src/Application.cpp	2015-02-13 11:10:13 -08:00
Andrew Meadows	5113258d72	Merge pull request #4279 from birarda/android ... fix cleanup of AudioClient, avoid gvr-interface crash on OS X	2015-02-13 10:58:50 -08:00
Brad Hefta-Gaub	1827d9f3cd	Merge pull request #4256 from samcake/temp1 ... Getting rid of glLIghts and replacing by the model::Light	2015-02-13 10:49:53 -08:00
Stephen Birarda	df8e51f835	use external project glm in more targets	2015-02-13 10:21:21 -08:00
Stephen Birarda	e3475d4d7f	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-02-13 10:19:00 -08:00
Andrew Meadows	d69efa03d8	Merge pull request #4276 from birarda/master ... repairs to memory management for AudioInjectors	2015-02-13 10:15:07 -08:00
Stephen Birarda	2c7e225ef7	use cmake ExternalProject for glm in Interface	2015-02-13 10:14:47 -08:00