Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 00:43:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14879 commits 76 branches 59 tags 1.2 GiB
Commit graph

188 commits

Author SHA1 Message Date
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
Stephen Birarda
31382b7e12 add a message for Win32 users to generate the MSVC GnuTLS import library 2014-04-09 17:41:18 -07:00
Stephen Birarda
17d2e14f0f find correct parent include folder for gnutls 2014-04-09 17:33:41 -07:00
Stephen Birarda
8b23addc47 prepend the gnutls library with lib for windows find 2014-04-09 17:31:11 -07:00
Stephen Birarda
35519e07dc quote dashed library name to potentially fix find on windows 2014-04-09 17:27:37 -07:00
Stephen Birarda
d54c21cdf1 fix path suffixes for gnutls headers 2014-04-09 17:23:13 -07:00
Stephen Birarda
03bb2573d1 look in bin folder to find GnuTLS on windows 2014-04-09 17:18:34 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Andrzej Kapolka
f707719f4e Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus 2014-04-09 15:34:29 -07:00
Andrzej Kapolka
ef8eb00778 Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus 2014-04-09 15:23:11 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Stephen Birarda
3f84f36d60 add proper boilerplate to GnuTLS find module 2014-04-09 15:00:57 -07:00
Stephen Birarda
d4f2c9e631 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-09 14:40:14 -07:00
Stephen Birarda
6ce5a24460 missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00
Stephen Birarda
ff9fd2d8e9 tweak headers in cmake find modules 2014-04-08 17:49:30 -07:00
Andrzej Kapolka
98011da1ef Starting on Faceplus integration. 2014-04-08 17:07:45 -07:00
Jeroen Baert
d2800ccd55 For some GLEW distributions, it's just lib 2014-04-03 11:52:13 +01:00
Stephen Birarda
6c08e2a407 add option for domain-server to enforce DTLS 2014-03-31 15:06:58 -07:00
Stephen Birarda
dc38b27485 using GnuTLS read self-signed key and cert on DS load 2014-03-31 12:31:34 -07:00
Stephen Birarda
9ae06913a0 remove QCA which only supports DTLS v1 2014-03-31 09:45:19 -07:00
Stephen Birarda
89aeb034d1 add find module for QCA and link to interface and DS 2014-03-28 15:22:44 -07:00
Dimitar Dobrev
f427f524bf Patched the Qt CMake function for auto-translations so that *.ts files 
are not deleted on clean.
 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
e10dacdbfe Changed the searcning for qxmpp to include debug libraries as well. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
86643803cf Moved the connection and configuration of XMPP to the log-in process. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
1c2e752f3c Integrated QXmpp in the build system. 2014-03-12 01:16:10 +02:00
Stephen Birarda
002738037c only look for the 32-bit oculus lib on windows 2014-03-10 09:28:20 -07:00
Stephen Birarda
4e382099fb have FindGLEW only look for 32-bit static lib 2014-03-10 09:27:32 -07:00
Stephen Birarda
6d5515a41d clarify that Windows builds are 32-bit, fix double GLEW_STATIC 2014-03-10 09:27:01 -07:00
ZappoMan
9c93149bd7 fix searching for sixense SDK on windows 2014-03-08 18:46:36 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Stephen Birarda
6f81803a3d don't have GLUT find module look for the DLL 2014-03-07 14:47:24 -08:00
Stephen Birarda
a72cac8c9c default to using Release LibOVR, include instructions for OS X rebuild 2014-03-07 14:31:59 -08:00
Stephen Birarda
03a9d6c02d glut dll search is for path, not library 2014-03-07 14:14:15 -08:00
Stephen Birarda
720846fa62 fix FindGLUT to get path to GLUT dll 2014-03-07 14:11:45 -08:00
Stephen Birarda
b8a03cf0f4 glew to be linked statically so dll not required at runtime 2014-03-07 14:08:30 -08:00
Stephen Birarda
1bd3529395 more module fixes and sixense readme change for OS X dylib 2014-03-07 13:59:50 -08:00
Stephen Birarda
569dd694fe cmake styling cleanup in Visage find module and interface CMakeLists 2014-03-07 13:42:13 -08:00
Stephen Birarda
23249866f7 have cmake copy dlls for glut and glew beside executable 2014-03-07 13:41:00 -08:00
Stephen Birarda
5452b81d58 use a path suffix in GLEW finder to get correct dir 2014-03-07 12:24:03 -08:00
Stephen Birarda
e3363dd304 conditionally include the OPENGL_INCLUDE_DIR since it is empty on windows 2014-03-07 12:22:58 -08:00
Stephen Birarda
01f155a103 use a PATH_SUFFIXES command in freeglut path find 2014-03-07 12:21:16 -08:00
Stephen Birarda
9db4b803c6 print out the GLUT include dir from GLUT find module 2014-03-07 12:18:39 -08:00
Stephen Birarda
1ec48b5999 fix a dumb elseif in custom find glut module 2014-03-07 12:16:09 -08:00
Stephen Birarda
a9c277312c don't mark useful variables as advanced 2014-03-07 12:11:46 -08:00
Stephen Birarda
dbf8021ccd include GLUT and OpenGL dirs as system includes 2014-03-07 12:07:19 -08:00
Stephen Birarda
20dd5d6e8d cmake file standardization in Sixense find module 2014-03-07 11:58:51 -08:00
Stephen Birarda
0ec0a87849 tweaks to GLEW and freeglut find modules 2014-03-07 11:57:20 -08:00
Stephen Birarda
bcaaa56b3d cleanup in GLUT find module 2014-03-07 11:51:35 -08:00
Stephen Birarda
3b9ae75162 make FindGLUT error if it is not found 2014-03-07 11:50:09 -08:00
Stephen Birarda
638d079c0c more module cleanup and simplification 2014-03-07 11:47:46 -08:00
Stephen Birarda
46e575838b simplify GLEW find module for Win32 2014-03-07 11:45:05 -08:00
Stephen Birarda
af18840c4e simplify GLUT find module for Win32 2014-03-07 11:41:40 -08:00
Stephen Birarda
30e0cbe639 fix arch dir for Win32 in GLEW module 2014-03-07 11:36:33 -08:00
Stephen Birarda
42addd4ed4 more GLUT module cleanup 2014-03-07 11:33:47 -08:00
Stephen Birarda
45ff1e4055 more cmake styling and module cleanup 2014-03-07 11:31:46 -08:00
Stephen Birarda
40bd46c782 cmake styling cleanup and glew module fixes 2014-03-07 11:21:36 -08:00
Stephen Birarda
8ba82649df pick the correct arch for GLEW on windows 2014-03-07 10:57:11 -08:00
Stephen Birarda
c3ebd83ae7 repair the glut find module to check include for header 2014-03-07 10:45:18 -08:00
Stephen Birarda
b56d995cf2 have the FindGLM module check HIFI_LIB_DIR 2014-03-07 10:42:21 -08:00
Stephen Birarda
3dc41bc19b fix the Sixense and LibOVR find modules 2014-03-07 10:20:19 -08:00
Stephen Birarda
aef15b86bf also look in HIFI_LIB_DIR for oculus lib 2014-03-07 10:03:16 -08:00
Stephen Birarda
3b06bbd88d move sixense directory to lowercase, have find module look in env dir 2014-03-07 09:59:24 -08:00
Stephen Birarda
a364655f63 Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals 2014-03-07 09:40:50 -08:00
Stephen Birarda
0bf0edc0f0 look in {HIFI_LIB_DIR}/glm for glm on windows 2014-03-06 17:53:51 -08:00
Stephen Birarda
b91a55d89d tweak the GLEW and glut modules to be more hifi specific 2014-03-06 17:53:07 -08:00
Stephen Birarda
594d43db84 add a find module for glew and tweak glm module 2014-03-06 17:41:14 -08:00
Stephen Birarda
031c553a8d find LibOVR depending on architecure and build type on Linux and Win 2014-03-06 14:31:26 -08:00
Stephen Birarda
816a631b05 tweak the oculus find module to take copied-in folders 2014-03-06 14:16:38 -08:00
Andrzej Kapolka
1d7f1afa5b Merge branch 'master' of https://github.com/highfidelity/hifi into kissage 2014-02-17 21:48:21 -08:00
Andrzej Kapolka
8206f8d2b3 Fixes for Windows. Compiles, but the license doesn't work yet. 2014-02-11 19:00:41 -08:00
Andrzej Kapolka
87f7e2465f Missed a spot. 2014-02-11 17:25:25 -08:00
Andrzej Kapolka
a9b415b0f9 More build settings. 2014-02-11 17:22:40 -08:00
Andrzej Kapolka
b3fba320fc We need the dependencies, too. 2014-02-11 17:03:24 -08:00
Andrzej Kapolka
25066f8b4f Starting on Visage integration. 2014-02-11 16:44:25 -08:00
Andrzej Kapolka
78e15e0212 Starting on Visage support. 2014-02-11 16:03:23 -08:00
stojce
7fc66392cc Interface OS X hifi URL scheme 2014-02-08 12:04:55 +01:00
Stephen Birarda
495d227950 remove Faceshift here report, Quazip find module 2014-01-16 14:18:27 -08:00
Stephen Birarda
323aa18c0e remove MotionDriver and pthread libraries 2014-01-16 14:16:38 -08:00
Andrzej Kapolka
865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
 2014-01-16 13:35:03 -08:00
Brad Hefta-Gaub
35016c7d69 make faceshift compile sources on windows to address linker error 2014-01-14 10:20:27 -08:00
Brad Hefta-Gaub
b3e3bcbe1b adding more opencv libraries and fix cmake for opencv and faceshift for windows 2014-01-13 20:12:31 -08:00
Stephen Birarda
133ba3a230 remove Leap integration from CMakeLists 2014-01-06 11:13:19 -08:00
Andrzej Kapolka
0a56f54675 Tiny fix for CMake caching on Linux/LibOVR. 2013-12-11 10:48:17 -08:00
Stephen Birarda
146d5294a0 more PortAudio cleanup in cmake 2013-12-05 16:51:04 -08:00
Stephen Birarda
40a1517108 remove PortAudio entirely 2013-12-03 12:38:26 -08:00
Andrzej Kapolka
0e0685af04 New Oculus software with Linux support. 2013-11-25 17:30:51 -08:00
Andrzej Kapolka
0231ed133c Optional compilation for Sixense. 2013-11-18 12:09:52 -08:00
Andrzej Kapolka
9c401607b1 Missed the actual files. 2013-11-15 18:47:25 -08:00
Stephen Birarda
cb2cb05688 remove the STK library as it is no longer needed 2013-10-21 16:32:32 -07:00
Andrzej Kapolka
213a8fcd63 Working on Faceshift integration. 2013-09-03 11:52:32 -07:00
Andrzej Kapolka
640ecd7f94 Working on integrating LibVPX for VP8 (9?) encoding. 2013-07-17 11:33:36 -07:00
Andrzej Kapolka
a116f5a636 Use InvenSense code to handle the rather complicated business of talking the 
sensor into giving us the compass reading.  We're getting it now, but I still
have to figure out how to incorporate it.
 2013-07-09 17:28:23 -07:00