21197 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	3d12ed95da	fix for cmake variable interpolation warning	2015-01-22 11:22:37 -08:00
Stephen Birarda	e5accde70d	set the qmake excutable path to tell Qt modules where to look	2015-01-22 11:11:22 -08:00
Stephen Birarda	64aa203825	add output of QT_CMAKE_PREFIX_PATH	2015-01-22 11:05:48 -08:00
Stephen Birarda	316bbce83c	allow ANDROID_QT_CMAKE_PREFIX_PATH to designate Qt location	2015-01-22 11:04:04 -08:00
Brad Hefta-Gaub	ad209ee731	Merge pull request #4150 from AndrewMeadows/bispinor ... remove ground collision hack for physics testing	2015-01-22 10:56:36 -08:00
Stephen Birarda	0af9a3ca36	remove an extra underscore	2015-01-22 10:36:40 -08:00
Stephen Birarda	b25a2a1918	temporary removal of VRLib requirement	2015-01-22 10:23:07 -08:00
Stephen Birarda	01ca47b68f	more updates to android build instructions	2015-01-22 10:20:42 -08:00
Stephen Birarda	9ed98c1d97	update to build guide for OpenSSL changes	2015-01-22 10:16:07 -08:00
Andrew Meadows	b2f2a3ad27	Merge pull request #4149 from huffman/improve-loading ... Update ImageOverlay to use TextureCache	2015-01-22 09:26:10 -08:00
Andrew Meadows	3997b916c1	remove ground collision hack for physics testing	2015-01-22 09:17:51 -08:00
Ryan Huffman	0e9e77f166	Fix broken support for color-only ImageOverlay	2015-01-22 08:58:55 -08:00
Ryan Huffman	52193fce38	Remove qDebug	2015-01-22 08:35:38 -08:00
Brad Hefta-Gaub	d8d0972cb6	Merge pull request #4148 from AndrewMeadows/isentropic ... reduce flood of collision events	2015-01-21 19:37:04 -08:00
Brad Hefta-Gaub	7d7411ceee	Merge pull request #4146 from PhilipRosedale/master ... Improved Billiards, Gun	2015-01-21 19:36:20 -08:00
Andrew Meadows	77c4362991	fix typo	2015-01-21 18:14:24 -08:00
Andrew Meadows	b2e79a0157	don't process results when no simulation	2015-01-21 18:06:19 -08:00
Andrew Meadows	2751fab2c3	don't send collision events for inactive pairs ... also throttle collision events to 30/sec	2015-01-21 18:02:13 -08:00
Andrzej Kapolka	cc9bbc3490	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-01-21 17:47:40 -08:00
Andrzej Kapolka	0d8380a288	Put the indices for our extra triangles into the spatial hash.	2015-01-21 17:47:13 -08:00
Brad Hefta-Gaub	5a7912de17	Merge pull request #4144 from AndrewMeadows/isentropic ... Bullet collisions trigger collision events in scripts.	2015-01-21 16:21:57 -08:00
Philip Rosedale	6567fcfe0b	Added shootable blocks on platform, grenade, buttons for making grid of targets	2015-01-21 16:17:25 -08:00
Andrzej Kapolka	8bd944e32e	Incremental improvement to stitching.	2015-01-21 16:10:00 -08:00
Ryan Huffman	ba2f7d88ce	Update ImageOverlay to use TextureCache	2015-01-21 15:09:09 -08:00
Ryan Huffman	53a70c43e1	Add width and height to NetworkTexture	2015-01-21 15:08:38 -08:00
Andrew Meadows	1b7074e52a	purge EntityCollisionSystem	2015-01-21 14:16:34 -08:00
Stephen Birarda	25016ef157	have RenderingClient handle returned audio frames	2015-01-21 14:10:29 -08:00
Philip Rosedale	78f157d6b0	Merge pull request #4145 from huffman/fix-dpi ... Update style.css to use pt instead of px for proper rendering on hidpi s...	2015-01-21 14:09:41 -08:00
Andrew Meadows	1c38b08e8f	remane emitEntityCollision... to entityCollision...	2015-01-21 14:07:23 -08:00
Philip Rosedale	e02e0088af	Improvements to gun to add shootable targets on a platform	2015-01-21 13:58:48 -08:00
Stephen Birarda	5716f576b7	output archive to current binary dir	2015-01-21 13:30:28 -08:00
Stephen Birarda	e7ba900cda	add debug for dependency links	2015-01-21 13:29:04 -08:00
Stephen Birarda	a3529e745b	fix warning and compile with Multimedia	2015-01-21 13:28:18 -08:00
Stephen Birarda	343b09c855	remove AudioClient dependency on Recorder	2015-01-21 13:21:37 -08:00
Stephen Birarda	eebb21656e	fix so Gverb is found on android	2015-01-21 13:20:21 -08:00
Stephen Birarda	3ea699d31b	remove user CMakeLists, fix path in FindGverb	2015-01-21 13:00:15 -08:00
Andrzej Kapolka	8636f0c48e	Simplification.	2015-01-21 12:57:24 -08:00
Stephen Birarda	e34fb66be7	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-01-21 12:41:20 -08:00
Stephen Birarda	693c52da55	hand off audio bandwidth to BandwidthManager	2015-01-21 12:39:04 -08:00
Stephen Birarda	1a87fa93f4	output signals from AudioClient for I/O bytes	2015-01-21 12:33:20 -08:00
Stephen Birarda	f885dc229b	final fixes for Audio includes in Interface	2015-01-21 12:31:10 -08:00
Ryan Huffman	2171427bbd	Update style.css to use pt instead of px for proper rendering on hidpi screens	2015-01-21 12:31:06 -08:00
Andrzej Kapolka	87e3339791	Fix for normal selection with degenerate triangles.	2015-01-21 12:28:05 -08:00
Andrew Meadows	cb536c5d4e	Merge pull request #4143 from murillodigital/windows-bullet ... Windows bullet	2015-01-21 12:13:04 -08:00
Stephen Birarda	707973f1e5	solve collision in PositionGetter with AddressManager	2015-01-21 12:05:12 -08:00
Stephen Birarda	b2a9cdde8b	migrate Audio header in AudioToolBox	2015-01-21 12:04:33 -08:00
Stephen Birarda	429d660dd6	migrate Audio includes to AudioClient	2015-01-21 12:04:06 -08:00
Stephen Birarda	d2af9a2911	have Application pass audio pos/orientation to AudioClient	2015-01-21 12:03:11 -08:00
Andrew Meadows	6840daa0b5	removing tabs from formatting	2015-01-21 11:55:28 -08:00
Stephen Birarda	e28ca27ccd	add a position and orientation getter for AudioClient	2015-01-21 11:55:12 -08:00