21197 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	d13e3c20c8	force GLM to not be found in path	2015-01-28 15:32:59 -08:00
Stephen Birarda	8c1007f131	remove extra debug line in InterfaceView	2015-01-28 15:26:51 -08:00
Stephen Birarda	3dd0b85ca4	use a QOpenGLWidget subclass for InterfaceView	2015-01-28 15:26:03 -08:00
Stephen Birarda	6e7dc0a44c	remove an unecessary capitalization	2015-01-28 15:03:01 -08:00
Stephen Birarda	441bb99d7c	add min requirement for cmake for android	2015-01-28 15:02:36 -08:00
Stephen Birarda	ad0ae76b00	use shared soxr to avoid openmp link	2015-01-28 14:59:23 -08:00
Stephen Birarda	c06ba0307e	make sure we grab openmp for soxr on Android	2015-01-28 14:46:01 -08:00
Stephen Birarda	bfc82524f7	remove an extra D in cmake flag	2015-01-28 14:28:31 -08:00
Stephen Birarda	a9eaaaaac7	request static lib build of libsoxr	2015-01-28 14:26:56 -08:00
Stephen Birarda	95f8347ead	add ant to requirements for android	2015-01-28 13:59:57 -08:00
Stephen Birarda	f75031c688	capitalize VRLib in libovr instructions	2015-01-28 13:51:14 -08:00
Stephen Birarda	ce1e96e034	fix version find for 1.0.2 in OpenSSL	2015-01-28 13:48:28 -08:00
Stephen Birarda	2b0796eb7d	simplify cmake call for android build	2015-01-28 13:40:47 -08:00
Stephen Birarda	f58462845a	make sure CMAKE_INSTALL_PREFIX is visible in soxr command	2015-01-28 13:36:20 -08:00
Stephen Birarda	418551ddc5	clarify that ANDROID_NDK must be set for soxr	2015-01-28 13:31:39 -08:00
Stephen Birarda	6ba7bd817c	use code style for ndk-build for libovr	2015-01-28 13:26:20 -08:00
Stephen Birarda	ddd9851f17	remove the AR step for OpenSSL, not required	2015-01-28 13:19:09 -08:00
Stephen Birarda	f2caa7e278	add change for OpenSSL version	2015-01-28 13:17:40 -08:00
Stephen Birarda	688480ed4f	clarify Qt and OpenSSL steps in build guide	2015-01-28 13:12:50 -08:00
Stephen Birarda	8abbac6bb2	fix system image explanation in build guide	2015-01-28 13:00:05 -08:00
Stephen Birarda	31e46cf70d	bullet out android-sdk requirements	2015-01-28 12:57:41 -08:00
Stephen Birarda	dae9246c87	updates to build guide for SDK requirements	2015-01-28 12:56:40 -08:00
Stephen Birarda	f1c6d26ed1	don't explicitly require LibOVR for android build	2015-01-28 11:20:25 -08:00
Stephen Birarda	067ffad122	add instructions for hybrid GVR testing	2015-01-28 11:04:21 -08:00
Stephen Birarda	42d064a613	add a comment to push build count	2015-01-28 10:29:12 -08:00
Stephen Birarda	0c1babe6f9	allow APK rename, fix hockey app update	2015-01-28 10:25:11 -08:00
Stephen Birarda	3a69e394b6	use the git commit count for version code	2015-01-28 10:04:27 -08:00
Stephen Birarda	161b49a819	don't install the HockeyApp build	2015-01-27 18:03:27 -08:00
Stephen Birarda	62a8483e3c	use an InterfaceActivity subclass to setup HockeyApp	2015-01-27 17:27:16 -08:00
Stephen Birarda	4c338a9950	handle possibility of HockeyApp inclusion	2015-01-27 17:08:57 -08:00
Stephen Birarda	bf454f3b57	add the oculus mobile sdk as an Android requirement	2015-01-27 16:02:01 -08:00
Stephen Birarda	730be964fe	add instructions for Oculus Mobile SDK	2015-01-27 16:00:58 -08:00
Stephen Birarda	d09b8f8c2e	remove enter VR mode and leave VR mode	2015-01-27 14:52:28 -08:00
Stephen Birarda	d420674edd	apply orientation change to listening position for audio	2015-01-27 14:50:02 -08:00
Stephen Birarda	54660dd1a2	resolve conflicts on merge with upstream master	2015-01-27 14:24:48 -08:00
Stephen Birarda	893ad0caa7	hack for vr mode, output sensor readings when docked	2015-01-27 14:23:40 -08:00
Brad Hefta-Gaub	2403533e0e	Merge pull request #4178 from huffman/fix-mesh-textures ... Fix failing QMetaObject::invokeMethod call	2015-01-27 14:00:58 -08:00
Ryan Huffman	7ececd793a	Fix failing QMetaObject::invokeMethod call	2015-01-27 13:59:46 -08:00
Grayson Stebbins	e290fa2e7f	Small changes, removed VS section ... Removed the Visual Studio section -- now that we have a better Visual Studio 2013 section it was unnecessary.	2015-01-27 13:42:24 -08:00
Grayson Stebbins	acb1494e3e	Small edits to links	2015-01-27 13:38:58 -08:00
Grayson Stebbins	36e9f6b9e0	Reminder about all dependencies	2015-01-27 13:33:29 -08:00
Andrew Meadows	e2ffe00c38	Merge pull request #4172 from huffman/fix-image-overlay-rescale ... Fix image overlay rescale	2015-01-27 13:07:15 -08:00
Brad Hefta-Gaub	0c4dc4100d	Merge pull request #4176 from huffman/fix-inspect ... Fix inspect + editEntities cameras from clashing	2015-01-27 13:05:33 -08:00
Brad Hefta-Gaub	0c53193e79	Merge pull request #4175 from cozza13/20283 ... CR for Job #20283 - Clean up scripts that have recently been added.	2015-01-27 13:05:17 -08:00
Brad Hefta-Gaub	a46fda3749	Merge pull request #4174 from huffman/delete-entity ... Update deleteEntity to obey entity locked property	2015-01-27 13:05:05 -08:00
Brad Hefta-Gaub	064f49db3d	Merge pull request #4173 from thoys/patch-2 ... Update README.md	2015-01-27 13:04:53 -08:00
Andrew Meadows	6b6e846378	Merge pull request #4177 from ZappoMan/fixGlitches ... Some physics improvements	2015-01-27 13:02:11 -08:00
Andrew Meadows	f2f054f689	Merge pull request #4161 from ey6es/master ... Partial implementation of "granularity" setting for metavoxel tools.	2015-01-27 12:52:32 -08:00
Stephen Birarda	a4a06751da	attempt to enter VR mode when docked, get sensor data	2015-01-27 12:43:44 -08:00
Stephen Birarda	5aa49e4e8d	check in idle timer for headset dock	2015-01-27 11:47:06 -08:00