Stephen Birarda
cb384ac01b
final repairs to LibOVR for multiple include folders
2014-07-17 17:24:47 -07:00
Stephen Birarda
a9df8b050e
another attempt at fixing double include for LibOVR
2014-07-17 17:04:18 -07:00
Stephen Birarda
3fad0e6ac8
cleanup qxmpp find module, use select_library_confgurations
2014-07-17 16:49:17 -07:00
Stephen Birarda
7f136247b8
more patches to LibOVR module to fix stitched include path
2014-07-17 16:44:35 -07:00
Stephen Birarda
68f9334628
cleanup Faceplus and Faceshift find modules, fix for OVR stitched include
2014-07-17 16:37:10 -07:00
Stephen Birarda
5f8b6de153
cleanup the Faceplus find module
2014-07-17 16:28:15 -07:00
Stephen Birarda
7447379e50
cleanup the OpenSSL find module
2014-07-17 16:23:22 -07:00
Stephen Birarda
04c237bb66
fix stitched-together LibOVR include
2014-07-17 16:21:32 -07:00
Stephen Birarda
ffb0ea30f8
Merge branch 'master' of https://github.com/highfidelity/hifi into select-library
2014-07-17 16:12:24 -07:00
Stephen Birarda
8e65645e4a
cleanup RtMidi find module
2014-07-17 16:12:12 -07:00
Philip Rosedale
e8539d0006
Merge pull request #3181 from birarda/master
...
foundation of support for signed transactions from interface
2014-07-17 16:03:28 -07:00
Philip Rosedale
1b265f3adb
Merge pull request #3180 from AndrewMeadows/ragdoll
...
Ragdoll Part4: ragdoll shapes follow target joints, visible joints follow ragdoll shapes
2014-07-17 16:00:02 -07:00
Stephen Birarda
1f0611ab09
cleanup the LibOVR and LeapMotion find modules by removing checks
2014-07-17 15:58:29 -07:00
Stephen Birarda
1cfa4d7990
simplify the sixense find module removing unecessary checks
2014-07-17 15:57:29 -07:00
Stephen Birarda
45f4e033f3
fix the LibOVR find module to grab a util header
2014-07-17 15:55:10 -07:00
Stephen Birarda
e7269e809e
allow use of debug/release leapmotion library with select_library_configurations
2014-07-17 15:41:47 -07:00
Stephen Birarda
03a052d89c
add debug/release linking to sixense via select_library_configurations
2014-07-17 15:27:55 -07:00
Stephen Birarda
074d7f40bb
add dynamic selection of debug or release for oculus libraries
2014-07-17 15:10:32 -07:00
Stephen Birarda
cebd379b68
don't pass OpenSSL libraries as string
2014-07-17 14:47:45 -07:00
Stephen Birarda
b88761a8a3
add a debug to catch optimized lib
2014-07-17 14:42:12 -07:00
Andrew Meadows
58e31abf60
improved collision shapes for fingers
2014-07-17 14:31:16 -07:00
Stephen Birarda
d5baab278a
add hifi_lib_dir hint to win32 section of FindOpenSSL
2014-07-17 14:28:09 -07:00
Stephen Birarda
05defb7c28
fix for select_library_configurations in OpenSSL find module
2014-07-17 14:27:01 -07:00
Stephen Birarda
5cad6edb38
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-17 14:06:11 -07:00
Andrew Meadows
53ee5f2340
minor cleanup around measurements of joint radius
2014-07-17 12:42:18 -07:00
Stephen Birarda
3c2ed95219
more cleanup to dependencies section of cmake
2014-07-17 11:56:23 -07:00
Stephen Birarda
c1987b6372
more tweaks to sections in BUILD guide
2014-07-17 11:54:01 -07:00
Stephen Birarda
aba4dcc5a8
fix min required OpenSSL version
2014-07-17 11:50:22 -07:00
Stephen Birarda
e9ab8899b2
some updates to the BUILD guide for OpenSSL
2014-07-17 11:49:37 -07:00
Brad Hefta-Gaub
437e3efbc2
Merge pull request #3179 from wangyix/quick_audio_PR
...
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
2014-07-17 11:44:05 -07:00
Stephen Birarda
45ae9f614d
add dialog to Menu to insert wallet private key
2014-07-17 11:43:30 -07:00
Stephen Birarda
0c8c4a2cf9
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-17 11:08:35 -07:00
Andrew Meadows
b22652f441
merge upstream/master into andrew/ragdoll
2014-07-17 10:52:27 -07:00
Andrew Meadows
783cde7376
minor tweak to rate at which ragdoll shapes follow joints
2014-07-17 10:51:17 -07:00
Andrew Meadows
25840cad49
fix bug in mixVisibleRotationDelta()
...
was using a non-visible rotation
2014-07-17 10:33:11 -07:00
wangyix
cd8d52c6f8
case statement style fix
2014-07-17 09:24:54 -07:00
Andrew Meadows
66158cb8a2
fix capsule-vs-capule collision test
2014-07-17 09:19:17 -07:00
Brad Hefta-Gaub
87ff6b9012
Merge pull request #3178 from Atlante45/activity_logger_on_off_option
...
Activity logger on off option
2014-07-17 08:53:47 -07:00
Brad Hefta-Gaub
d8d6d08958
Merge pull request #3145 from samcake/19734
...
19734 - Leapmotion support
2014-07-17 08:45:55 -07:00
wangyix
e557ba8052
removed space
2014-07-16 18:06:55 -07:00
Atlante45
6cb5483c21
Added send data option to prefs
2014-07-16 17:56:29 -07:00
samcake
dd9327018b
Merge branch '19734' of https://github.com/samcake/hifi into 19734
2014-07-16 17:55:42 -07:00
samcake
e0e7b03841
Merge pull request #1 from AndrewMeadows/thermonuclear
...
merge and warnings cleanup
Thanks Andrew !
2014-07-16 17:46:30 -07:00
wangyix
8775d22765
re-added calculated desired frames to domain page stats
2014-07-16 17:44:49 -07:00
wangyix
397e6c8b13
renamed a function
2014-07-16 17:34:48 -07:00
wangyix
8763b39393
changed format label string a bit
2014-07-16 17:30:18 -07:00
samcake
d668f259f9
Merge branch 'gh-pages', commit 'refs/pull/1/head' of https://github.com/samcake/hifi ; branch 'thermonuclear' of https://github.com/AndrewMeadows/hifi into 19734
2014-07-16 16:03:43 -07:00
Stephen Birarda
61beb130a1
Merge branch 'master' of github.com:birarda/hifi
...
Conflicts:
interface/CMakeLists.txt
2014-07-16 15:45:59 -07:00
Stephen Birarda
cb9a2c615e
use OpenSSL to create signed wallet transaction using hard-code key
2014-07-16 15:44:49 -07:00
wangyix
6764ace8eb
droppable silent packets are added for dropped packets;
...
_currentJitterBufferFrames replaced with moving average of frames
available. Downstream framesAvailable stat now includes the frames in
QAudioOutput as well as the ringbuffer.
2014-07-16 14:41:24 -07:00
