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 |
|
Andrew Meadows
|
54a6a0a27c
|
use custom config when hunting for bullet include
|
2015-01-16 12:50:50 -08:00 |
|
Andrew Meadows
|
ba31309206
|
also find debug Bullet libs
|
2015-01-16 08:57:35 -08:00 |
|
Andrew Meadows
|
6836f23574
|
add custom FindBullet.cmake module
|
2015-01-15 14:53:55 -08:00 |
|
Andrew Meadows
|
2177a1701a
|
more correct cmake config for Bullet
(copying pattern from IncludeGLM.cmake)
|
2015-01-15 11:38:38 -08:00 |
|
Andrew Meadows
|
51cc9d6d9a
|
alt method for repressing unused var warnings
|
2015-01-15 10:46:09 -08:00 |
|
Andrew Meadows
|
ff171a5782
|
Bullet is now required dependency
|
2015-01-15 10:27:43 -08:00 |
|
Thijs Wenker
|
80a81043ed
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20216
Conflicts:
interface/src/Menu.cpp
|
2015-01-15 02:28:31 +01:00 |
|
Stephen Birarda
|
d30490c760
|
resolve conflicts on merge with upstream master
|
2015-01-12 09:25:37 -08:00 |
|
Thijs Wenker
|
21d8d55be3
|
fix indentation
|
2015-01-07 22:53:44 +01:00 |
|
Thijs Wenker
|
2690241eb6
|
fix to add GLEW debug library
|
2015-01-07 22:08:01 +01:00 |
|
Stephen Birarda
|
35a69ce049
|
remove the faceplus find module
|
2015-01-07 09:48:12 -08:00 |
|
Brad Hefta-Gaub
|
43e6ba77fa
|
Merge pull request #4007 from AndrewMeadows/inertia
Bullet physics part 1
|
2014-12-31 10:33:00 -08:00 |
|
Andrew Meadows
|
adf778fba2
|
Merge pull request #4013 from Atlante45/cmake_fix
Fix for new version of cmake
|
2014-12-30 15:10:14 -08:00 |
|
Atlante45
|
729034dd94
|
Removed unnecessary list(LENGTH ...)
|
2014-12-30 11:13:00 -08:00 |
|
Atlante45
|
4586afc6c5
|
Fix for new version of cmake
|
2014-12-29 17:23:54 -08:00 |
|
Andrew Meadows
|
9b7e50858a
|
merge upstream/master into andrew/inertia
Conflicts:
libraries/avatars/CMakeLists.txt
libraries/entities/CMakeLists.txt
|
2014-12-29 09:15:49 -08:00 |
|
Sam Gateau
|
acad86edf5
|
clean cmake file for autoScribeShader
|
2014-12-25 22:41:14 -08:00 |
|
Sam Gateau
|
c5eb04336f
|
first version of SCribe used for shaders in render-utils
|
2014-12-23 16:27:02 -08:00 |
|