Commit graph

21360 commits

Author SHA1 Message Date
Stephen Birarda
2657af8d4b use proper flags for ANDROID, pass url to C++ 2015-01-29 14:13:10 -08:00
Stephen Birarda
dc866b62e4 repairs to hifi url handling 2015-01-29 13:50:11 -08:00
Stephen Birarda
dd4f4f0993 repairs for hifi scheme handling on android 2015-01-29 13:03:39 -08:00
Stephen Birarda
b696f46d25 add the url scheme handler for hifi 2015-01-29 12:49:37 -08:00
Stephen Birarda
763994da5a handle gverb move to audio-client 2015-01-29 12:44:03 -08:00
Stephen Birarda
2af54dcf95 update Qt requirement to 5.4 in BUILD 2015-01-29 11:52:34 -08:00
Stephen Birarda
d3828c7d89 remove gverb from externals 2015-01-29 11:05:16 -08:00
Stephen Birarda
e4321a8f18 add audio-client externals to gitignore 2015-01-29 11:04:27 -08:00
Atlante45
ff88b7d4e6 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-29 10:59:54 -08:00
Stephen Birarda
fa166f012f set size of GVRMainWindow to note 4 size 2015-01-29 10:11:46 -08:00
Stephen Birarda
c6b7353a17 remove an extra space 2015-01-28 16:57:30 -08:00
Stephen Birarda
1dd74c9831 allow gvr-interface target to be compiled for desktop 2015-01-28 16:57:16 -08:00
Stephen Birarda
8460557135 clarify requirement to seperately download GLM 2015-01-28 16:04:17 -08:00
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
Atlante45
5d67b9d384 Request AvatarMixer 2015-01-28 15:20:48 -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
Atlante45
8847338297 Added avatars dependency to GVRInterface 2015-01-28 14:59:20 -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
Atlante45
5bc98f5258 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-28 13:14:08 -08:00
Atlante45
d68b59d4c7 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-28 13:13:58 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
2015-01-28 13:13:32 -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
Andrew Meadows
7a849e97ec Merge pull request #4184 from samcake/temp0
Fix windows crash on start
2015-01-28 10:25:20 -08:00
Stephen Birarda
0c1babe6f9 allow APK rename, fix hockey app update 2015-01-28 10:25:11 -08:00
Sam Gateau
dc01611f26 Initiailize the jont indices to -1 in FBXGemoetry to avoid problems until the skeleton data is actually loaded 2015-01-28 10:22:37 -08:00
Stephen Birarda
3a69e394b6 use the git commit count for version code 2015-01-28 10:04:27 -08:00
Atlante45
df96e023e3 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-27 20:36:48 -08:00
Brad Hefta-Gaub
347c74ebae Merge pull request #4181 from ctrlaltdavid/20276
CR for Job #20276 - Add Scripting Support for changes in Audio Devices
2015-01-27 19:36:17 -08:00
David Rowe
7286a9c5fb Merge branch 'master' into 20276 2015-01-27 19:08:40 -08:00