Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 04:36:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14867 commits 69 branches 56 tags 1.2 GiB
Commit graph

207 commits

Author SHA1 Message Date
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
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
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
e9ab8899b2 some updates to the BUILD guide for OpenSSL 2014-07-17 11:49:37 -07:00
Stephen Birarda
0c8c4a2cf9 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-17 11:08:35 -07:00
Stephen Birarda
29504325d0 add a tweaked FindOpenSSL module and link and include it in interface 2014-07-16 10:52:53 -07:00
Andrew Meadows
8ffc3aa73d merge upstream/master into andrew/thermonuclear (AKA samcake/19734) 
Conflicts:
	interface/src/Application.cpp
 2014-07-14 09:10:27 -07:00
samcake
d6104e5d48 Final cleaning, ready to publish 
- Removed the LEapmotion sdk from the external folder and validated that
it can be installed in the "HIFI_LIB_DIRS", fixed the
FIndLeapmotion.cmake for that

- Cleared the HandTracker class not needed

Ready for publish !
 2014-07-09 01:02:56 -07:00
samcake
3ecaaa5a85 After HIfi visit, Fix skinning from javascript 
- Understood the skinning mechanism from an absolute transform in model
space that need to use a call to
//JointState::setRotationFromBindFrame(rotation, priority);

- This is not available from the javascript MyAvatar interface yet

- now require LeapMOtion SDK2.0.3 to support arms
 2014-07-08 23:57:37 -07:00
Stephen Birarda
d1afe127c3 updates to RtMidi find module to look for static or dynamic lib 2014-07-08 12:06:43 -07:00
samcake
f5c690cc8d Add Leapmotion support for Apple build 
- Add LEapmotion support in the CMake files
- fix a template syntax in DeviceHEader not compiling on mac
- add a missing #ifdef protection in Leapmotion
 2014-07-07 09:32:46 -07:00
samcake
abacefa723 Merge remote-tracking branch 'upstream/master' into 19734 
Conflicts:
	interface/CMakeLists.txt
	interface/src/avatar/SkeletonModel.cpp
 2014-07-05 19:25:46 -07:00
samcake
fca3a6aa13 Merge branch 'master' of https://github.com/highfidelity/hifi into 19734 2014-07-05 18:10:59 -07:00
Stephen Birarda
f389e3a6da resolve conflicts on merge with upstream master 2014-07-01 11:02:25 -07:00
Stephen Birarda
5ba4a4dbb5 initial pass of MIDI implementation that bubbles events to JS 2014-07-01 09:53:18 -07:00
samcake
a8b875d32e Merge remote-tracking branch 'origin/LeapMotion' into 19734 2014-07-01 03:20:26 -07:00
samcake
fe03743163 Revert "Revert "Add LeapMotion SDK support"" 
This reverts commit 8ce145085b3783782fafd051becbb0e339d5dfa1.
 2014-07-01 03:15:23 -07:00
samcake
6b549a5269 Revert "Add LeapMotion SDK support" 
This reverts commit 291c446c28.
 2014-07-01 03:15:21 -07:00
barnold1953
67c5281205 Fixed CMake for oculus. Gave Oculus its own camera for minimum latency. 2014-06-26 17:10:53 -07:00
Andrzej Kapolka
7931173671 Working on tools to convert bitstreams to/from json. 2014-06-17 12:33:31 -07:00
samcake
291c446c28 Add LeapMotion SDK support 
- Add the leapmotion folder in interface/external
- Add the "FindLeapMotion.cmake" file in cmake
- Add the first iteration of the class LeapMotionManager.h and .cpp in
the interface/devices folder
- Tested only on windows  7 so far
 2014-06-10 16:40:04 -07:00
Stephen Birarda
0e7615391c don't look for GnuTLS from cmake 2014-05-20 10:35:04 -07:00
Leonardo Murillo
ee8722bc9f CMake find LibOVR 2014-05-18 20:59:41 -06:00
Leonardo Murillo
5a7a876697 CMake find LibOVR 2014-05-18 18:43:16 -06:00
Andrzej Kapolka
f2ba2a48f2 Merge branch 'master' of https://github.com/highfidelity/hifi into priority 2014-05-13 11:38:51 -07:00
Leonardo Murillo
c7e103e989 Not working with path_suffixes, testing something else 2014-05-12 19:43:56 -06:00
Andrzej Kapolka
52a3c70bf5 Updates to PrioVR interface. 2014-05-12 17:11:02 -07:00
Leonardo Murillo
1869248351 Moving stuff around 2014-05-12 16:46:24 -06:00
Leonardo Murillo
415bc64ce9 Moving stuff around 2014-05-12 16:44:15 -06:00
Leonardo Murillo
8b15873488 Change to Oculus find path in Windows 2014-05-12 16:37:52 -06:00
Andrzej Kapolka
e0486b2654 Starting on PrioVR integration. 2014-05-12 15:25:25 -07:00
Stephen Birarda
5904d19603 Merge pull request #2637 from birarda/authentication 
add optional DTLS option for domain-server to node communication
 2014-04-14 10:24:17 -07:00
Stephen Birarda
9fcb656027 add a newline to FindGnuTLS and fix filename in header 2014-04-11 09:26:45 -07:00
Stephen Birarda
f51b7a78c6 look only in lib for GnuTLS library 2014-04-10 09:32:44 -07:00