Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 00:07:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21890 commits 22 branches 28 tags 1.2 GiB
Commit graph

414 commits

Author SHA1 Message Date
Brad Hefta-Gaub
6378009992 Merge pull request #4249 from birarda/master 
don't force requirement of both debug and release versions of bullet
 2015-02-08 12:52:41 -08:00
Stephen Birarda
adbf6de3e6 actually append found libraries to BULLET_LIBRARIES 2015-02-06 17:02:36 -08:00
Stephen Birarda
6c2710354a remove an extra cmake debug line 2015-02-06 16:36:15 -08:00
Stephen Birarda
f0f7bca5db don't force requirement of BOTH debug/release Bullet 2015-02-06 16:35:25 -08:00
Stephen Birarda
d68b0958a7 resolve conflicts on merge with upstream/master 2015-02-06 14:09:20 -08:00
Stephen Birarda
c8fb891158 move fonts to sdff files, load with qrc 2015-02-06 11:48:55 -08:00
Stephen Birarda
951617d40a get PlatformActivity menu working in GVR 2015-02-02 17:01:04 -08:00
Stephen Birarda
30a9f6159b add required files for ndk-gdb 2015-02-02 11:01:35 -08:00
Stephen Birarda
dd4f4f0993 repairs for hifi scheme handling on android 2015-01-29 13:03:39 -08:00
Stephen Birarda
763994da5a handle gverb move to audio-client 2015-01-29 12:44:03 -08:00
Stephen Birarda
d13e3c20c8 force GLM to not be found in path 2015-01-28 15:32:59 -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
ce1e96e034 fix version find for 1.0.2 in OpenSSL 2015-01-28 13:48:28 -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
4c338a9950 handle possibility of HockeyApp inclusion 2015-01-27 17:08:57 -08:00
Stephen Birarda
d420674edd apply orientation change to listening position for audio 2015-01-27 14:50:02 -08:00
Stephen Birarda
893ad0caa7 hack for vr mode, output sensor readings when docked 2015-01-27 14:23:40 -08:00
Stephen Birarda
c0b61e4c38 register GVR receivers with QtActivity 2015-01-27 11:38:38 -08:00
Stephen Birarda
43e907ec83 get QtActivity notifications about GVR changes 2015-01-27 11:37:07 -08:00
Stephen Birarda
976c3b633b remove extra library links for android LibOVR 2015-01-26 13:26:26 -08:00
Stephen Birarda
4679f7f858 cleanup linking of oculus mobile sdk 2015-01-26 13:26:08 -08:00
Stephen Birarda
c269ee6b94 include ovr mobile sdk and test it 2015-01-26 11:32:24 -08:00
Stephen Birarda
a3b92e05da support 44.1 for the note 4 2015-01-23 11:48:23 -08:00
Stephen Birarda
86c0cbe4a8 fix comment in Android manifest, move to Address 2015-01-23 10:24:28 -08:00
Stephen Birarda
102f076412 look for soxr and not redundant libsoxr 2015-01-22 14:09:29 -08:00
Stephen Birarda
c82ac27104 fix a typo in RtMidi find module 2015-01-22 14:06:53 -08:00
Stephen Birarda
aa6e1607e2 add libsoxr for audio resampling 2015-01-22 14:06:05 -08:00
Stephen Birarda
21ecaafea9 don't force system include of GLM 2015-01-22 11:38:34 -08:00
Stephen Birarda
3d12ed95da fix for cmake variable interpolation warning 2015-01-22 11:22:37 -08:00
Stephen Birarda
b25a2a1918 temporary removal of VRLib requirement 2015-01-22 10:23:07 -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
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
Stephen Birarda
246ee41cf3 fix deps of linked target, create QMainWindow 2015-01-20 11:37:20 -08:00
Stephen Birarda
60bdd206eb Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-19 12:35:22 -08:00
Brad Hefta-Gaub
699964ebb9 Merge pull request #4111 from AndrewMeadows/bispinor 
require Bullet
 2015-01-19 12:30:14 -08:00
Stephen Birarda
671734ba44 fix TBB find module for android build 2015-01-19 12:01:24 -08:00
Andrew Meadows
fd9b56fe49 add lib/Release and lib/Debug to lib PATH_SUFFIXES 2015-01-19 10:41:45 -08:00
Stephen Birarda
10be0ee984 resolve conflicts on merge with upstream master 2015-01-19 10:26:56 -08:00
Andrew Meadows
614a7eb0b5 fix for entities rendering as black on linux 2015-01-16 16:49:11 -08:00
Andrew Meadows
117ed9206c add ${BULLET_SEARCH_DIRS}/include, 
remove PATH_SUFFIXES include/bullet
 2015-01-16 16:19:47 -08:00
Andrew Meadows
d5119b3532 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/EntityMotionState.h
	libraries/physics/src/ObjectMotionState.cpp
	libraries/physics/src/PhysicsEngine.cpp
	libraries/physics/src/PhysicsEngine.h
 2015-01-16 14:36:27 -08:00
Andrew Meadows
0a04dc8445 modify PATH_SUFFIXES when hunting for include dir 2015-01-16 13:38:11 -08:00
Andrew Meadows
e5eccbc791 add back BULLET_ROOT_DIR hint 2015-01-16 13:25:43 -08:00
Andrew Meadows
a293c61c05 use hifi_library_search_hints() macro 2015-01-16 13:20:58 -08:00