Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-21 04:03:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87417 commits 25 branches 28 tags 1.2 GiB
Commit graph

2066 commits

Author SHA1 Message Date
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
Sam Gateau
03d8922d59 fix typo 2014-12-23 15:47:39 -08:00
Sam Gateau
3cfe066bcb Add the autoScribeShader cmake 2014-12-23 15:42:14 -08:00
Stephen Birarda
715b3a245e remove GLUT from Cmake files 2014-12-19 10:53:36 -08:00
Thijs Wenker
e913095af5 Merge branch 'master' of https://github.com/worklist/hifi into 20216 
Conflicts:
	interface/CMakeLists.txt
 2014-12-19 13:53:33 +01:00
Andrew Meadows
25b00977be fix cmake config for bullet after c++-11 changes 2014-12-18 17:34:39 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Andrew Meadows
11f01e1859 merge upstream/master into andrew/inertia 2014-12-18 15:01:08 -08:00
Stephen Birarda
d38c78f2c3 remove bubbling of linked libraries, cmake does it 2014-12-18 09:34:04 -08:00
Stephen Birarda
adf51bfeb8 temp disable visage to get to C++11 support 2014-12-17 16:41:28 -08:00
Stephen Birarda
33d50c6eb6 fix dependency qt module linking in LinkSharedDependencies 2014-12-17 10:26:51 -08:00
Stephen Birarda
4216806967 remove extra debugging in LinkSharedDependencies 2014-12-17 10:21:53 -08:00
Stephen Birarda
2ee33cef9f have targets bubble up their Qt modules 2014-12-17 10:21:27 -08:00
Stephen Birarda
f63aa44d01 add lib to lib dirs for win and linux 2014-12-15 14:02:55 -08:00
Stephen Birarda
4d8d6d602a simplify the FindTBB module for set envs 2014-12-15 13:56:21 -08:00
Stephen Birarda
bf5147cd91 fix qt modules to link in LinkSharedDependencies 2014-12-15 12:56:32 -08:00
Thijs Wenker
3f26e1b63a RealSense Initial 2014-12-13 23:04:19 +01:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Andrew Meadows
a21ebe4f6a merge andrew/thermonuclear into andrew/inertia 2014-12-02 15:31:30 -08:00
David Rowe
7f36a11f35 Find Oculus libraries when using Visual Studio 2013 2014-12-01 10:40:37 -08:00
Stephen Birarda
887dc85d92 use vr_dual instead of vr_both for VR mode in GearVR 2014-11-19 14:53:21 -08:00
Stephen Birarda
46ffbb13aa copy the assets folder to the apk build 2014-11-19 10:03:42 -08:00
Stephen Birarda
9094fef8b8 preliminary support for oculus mobile SDK 2014-11-18 16:39:05 -08:00
Stephen Birarda
713beda440 changes to AndroidManifest for Oculus Mobile SDK 2014-11-18 16:11:29 -08:00
Stephen Birarda
86000799ac cleanup indentation in AndroidManifest file 2014-11-18 13:02:55 -08:00
Stephen Birarda
a0c8ccf3a1 use strings.xml to clean application name 2014-11-18 13:02:12 -08:00
Stephen Birarda
2b54300469 add the app icon to gvr-interface 2014-11-18 12:54:19 -08:00
Stephen Birarda
7c38abcde8 actually grab AndroidManifest from apk-build dir 2014-11-18 12:49:10 -08:00
Stephen Birarda
9fd6fe49a4 fix leftover method define, make apk creation a sep target 2014-11-18 12:09:57 -08:00
Stephen Birarda
f5f9513e4e add basic GVRInterface class that creates a NodeList 2014-11-18 11:59:38 -08:00
Stephen Birarda
6e6a3173db copy static libs directly to libs folder of apk 2014-11-18 11:49:47 -08:00
Stephen Birarda
27630e31f9 add back api and app name info to deploy json 2014-11-18 11:24:31 -08:00
Stephen Birarda
a04ee42c0d complete successful apk creation via androiddeployqt 2014-11-18 11:13:24 -08:00
Stephen Birarda
fe0d9cc034 repairs to deployment json file creation 2014-11-18 10:10:12 -08:00
Stephen Birarda
225e326420 being to rebuild gvr-interface deploy with androiddeployqt 2014-11-18 09:39:43 -08:00
Stephen Birarda
2316cfb885 link hifi libs and openssl statically to gvr-interface 2014-11-17 15:19:07 -08:00
Stephen Birarda
473ae10104 shuffle files with QtGui dependency out of shared 2014-11-17 13:33:07 -08:00
Stephen Birarda
c3f57cd07f modify apk.cmake to allow caller to include jar libs 2014-11-17 13:13:54 -08:00
Stephen Birarda
52750f1ec5 use PixelLight's original Apk.cmake for shared library support 2014-11-17 12:42:53 -08:00
Stephen Birarda
05cab9a3ba add a gvr-interface target that uses native glue to make apk 2014-11-17 10:58:12 -08:00
Stephen Birarda
f23b08971c merge with cuckoo branch, fix makefile OS X support 2014-11-14 10:52:12 -08:00
Stephen Birarda
40dc3c517f changes for android to find GLM and OpenSSL 2014-11-13 17:14:53 -08:00
Stephen Birarda
63304210c1 allow sep specification of android Qt location on system 2014-11-13 15:35:19 -08:00
Stephen Birarda
a39ed798ae replace libcuckoo requirement with tbb 2014-11-05 15:45:51 -08:00
Stephen Birarda
35d0d31350 change the NodeHash to a cuckoohash_map with CityHash 2014-11-05 13:54:38 -08:00
Stephen Birarda
b8d0bd5d6b allow a target to bubble up required includes 2014-11-05 13:25:32 -08:00
Stephen Birarda
161b3b83d7 find an installed version of libcuckoo 2014-11-05 11:44:56 -08:00
Stephen Birarda
874ccf0708 add FindLibcuckoo module and instructions for dropping in libcuckoo 2014-11-05 10:57:06 -08:00
Andrew Meadows
92ceb52183 adding macro to find bullet 2014-11-04 16:46:45 -08:00
Brad Hefta-Gaub
4e7e9641f0 Merge pull request #3673 from birarda/lobby 
initial groundwork for lobby interface
 2014-10-28 08:48:33 -07:00
Stephen Birarda
d38dd2c53a repairs for recursive source files, move HF meta events to SE 2014-10-27 14:18:23 -07:00
Sam Gateau
541e528e57 Add NSIGHT Profiliing capability 2014-10-27 11:41:39 -07:00
Stephen Birarda
c172f628fc repairs to FindATL indenting 2014-10-24 11:12:55 -07:00
Stephen Birarda
30aa23e5cd message include dir for ATL when found 2014-10-24 10:45:06 -07:00
Stephen Birarda
fd23fb66ab bubble up ATL_INCLUDE_DIRS from FindATL module 2014-10-24 10:42:29 -07:00
Atlante45
86c965a922 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-22 14:20:22 -07:00
Atlante45
bd4e8a172d typo 2014-10-22 13:40:58 -07:00
Atlante45
fc9010dd6b missing endif 2014-10-22 13:38:49 -07:00
Atlante45
ad2eb08964 Correctly link in cmake 2014-10-22 13:11:45 -07:00
Atlante45
ccc8e0d876 Statically link gverb 2014-10-22 12:56:44 -07:00
Atlante45
e496304f7e Changed include dir 2014-10-22 11:36:23 -07:00
Thijs Wenker
8b8b7f1189 Moved the new hints to HINTS, thanks for the hint @birarda 2014-10-21 13:39:24 +02:00
Thijs Wenker
90a1f141ba removed duplicate hints entries 2014-10-20 22:28:02 +02:00
Thijs Wenker
3cd42b7671 Allows Windows users to put SDL2 folder in %HIFI_LIB_DIR% folder (see BUILD.md for info about %HIFI_LIB_DIR% environment variable) 2014-10-18 19:46:15 +02:00
Atlante45
954be926e1 Fix cmake 2014-10-14 15:48:43 -07:00
NextPrior
a0a5530641 Initial reverb implementation 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Audio.cpp
	interface/src/Audio.h
	libraries/script-engine/src/ScriptEngine.cpp
 2014-10-13 18:13:51 -07:00
Ryan Huffman
762cc71d31 Update to SDL2 2014-10-10 17:03:10 -07:00
Andrzej Kapolka
eecc94f816 Enable high resolution for OS X. 2014-09-05 15:27:55 -07:00
Stephen Birarda
b055e07d72 look for atls not atl in FindATL 2014-08-13 09:29:49 -07:00
Stephen Birarda
c5ee81f99f Merge branch 'master' of https://github.com/highfidelity/hifi into oculus-dk2 2014-08-13 09:28:10 -07:00
Stephen Birarda
da7f3d18e4 require QXMPP_LIBRARY to be found for FindQXMPP to succeed 2014-08-13 09:27:44 -07:00
Stephen Birarda
83952cb85c add the FindATL cmake module 2014-08-13 09:22:07 -07:00
Stephen Birarda
1ee58b7bd0 find the ATL library on windows for LibOVR 2014-08-13 09:19:45 -07:00
Stephen Birarda
acda466c76 add atls as requirement for LibOVR 2014-08-13 09:11:46 -07:00
Stephen Birarda
4dce4c4919 link to ws2_32.lib if LibOVR is being linked to 2014-08-12 15:23:12 -07:00
Stephen Birarda
ac4d20bb43 repairs to FindLibOVR for OS X new structure 2014-08-12 14:49:30 -07:00
Stephen Birarda
a8e17e19a4 resolve conflicts on merge with upstream master 2014-08-12 14:43:30 -07:00
Stephen Birarda
75aedae300 integration of positional tracking with DK2 2014-08-12 14:12:13 -07:00
Stephen Birarda
405e79fe6d allow command line specification that an external be required 2014-08-11 09:51:36 -07:00
Stephen Birarda
b09cc55d6f add QTKit to frameworks required for Visage 2014-08-08 15:01:47 -07:00
Stephen Birarda
36a3bc40d6 add AppKit to required Visage libraries 2014-08-08 14:44:37 -07:00
Stephen Birarda
2f6ff36d22 fix list of args for visage find module 2014-08-08 14:17:36 -07:00
Stephen Birarda
e638bbca3a fix find package standard args call for visage 2014-08-08 14:10:58 -07:00
Stephen Birarda
e74c8f5e56 don't set visage find args list as quoted string 2014-08-08 14:08:18 -07:00
Stephen Birarda
234920b5bc add QuartzCore to FindVisage module 2014-08-08 14:04:22 -07:00
Stephen Birarda
0dfbc8b8ba add the xml library to QXMPP_LIBRARIES 2014-08-08 13:32:34 -07:00
Stephen Birarda
a99b19d28a make Qt5 and ZLIB required finds, add OpenSSL to interface 2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
0449660f66 don't bubble up hifi libraries since they are static 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d tweak setup_hifi_library to bubble up full path of Qt modules 2014-08-08 13:17:54 -07:00
Stephen Birarda
c63e886444 don't look backwards for fbx header from avatars library 2014-08-08 13:17:53 -07:00
Stephen Birarda
1a71d655b9 more cmake cleanup to remove ROOT_DIR passing 2014-08-08 13:17:53 -07:00
Stephen Birarda
93b6f167f5 change more CMakeLists to use simplified hifi library linker 2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 2014-08-08 13:17:53 -07:00
Stephen Birarda
107cbc3f87 more simplification of hifi macros to find libraries 2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
b5c8a4d2c6 fix requirement of networking in audio library 2014-08-08 13:17:52 -07:00
Stephen Birarda
fa26957b23 more CMakeLists cleanup for sub-dependencies 2014-08-08 13:17:52 -07:00
Stephen Birarda
33e5826842 remove animation server, bubble up qt modules 2014-08-08 13:17:52 -07:00
Stephen Birarda
9a50532b1f bubble up sub dependencies to link_hifi_library 2014-08-08 13:17:52 -07:00
Leonardo Murillo
6191db3a7f Fixing bug with visage find_library 2014-08-07 09:59:07 -06:00
Stephen Birarda
b502ee618e Merge branch 'oculus' 2014-07-30 17:05:51 -07:00
Stephen Birarda
5b371cedb9 Revert "remove useless lib prefix in oculus find module" 
This reverts commit ff1ae43474.
 2014-07-30 16:18:04 -07:00
Stephen Birarda
ff1ae43474 remove useless lib prefix in oculus find module 2014-07-30 16:16:50 -07:00
Stephen Birarda
4f6a86fc6c tweak to help windows find oculus libraries 2014-07-30 16:15:28 -07:00
Stephen Birarda
d101d321da add a missing closing bracket 2014-07-30 15:32:45 -07:00
Stephen Birarda
4e27738cb1 don't apply udev and xinerama libraries to APPLE 2014-07-30 15:31:47 -07:00
Stephen Birarda
e702738694 only add udev and xinerama on UNIX 2014-07-30 15:31:05 -07:00
Stephen Birarda
f25e8b0b75 add NAMES to find_library commands 2014-07-30 15:28:45 -07:00
Stephen Birarda
4c59c0ebfe fix reference to INCLUDE_QT variable in SetupHifiProject macro 2014-07-30 15:19:43 -07:00
Stephen Birarda
4f17902c6b fix set of LIBOVR_LIBRARIES in FindLibOVR module 2014-07-30 15:08:31 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
Stephen Birarda
7302af4fec fix bad conditional in LibOVR find module 2014-07-30 14:52:58 -07:00
Stephen Birarda
4be8a92e52 remove explicit requirement of LibOVR source file in OculusManager 2014-07-30 14:15:14 -07:00
Stephen Birarda
4d3aafa5df use path suffixes instead of full path in name 2014-07-30 14:07:40 -07:00
Stephen Birarda
d6c0defd98 check in VS2010 subdir to see oculus 0.4.0 library 2014-07-30 14:05:20 -07:00
Stephen Birarda
c3409c782d remove a lost s 2014-07-24 15:25:34 -07:00
Stephen Birarda
8c3ab2a084 search only in lib for Leapmotion lib 2014-07-24 15:13:00 -07:00
Stephen Birarda
5cbd1492f2 more Cmake cleanup to grab externals 2014-07-24 15:09:41 -07:00
Stephen Birarda
21f4e87c51 cleanup HifiLibrarySearchHints cmake macro 2014-07-24 14:48:28 -07:00
Stephen Birarda
0849981f6a more standardization for external library searches 2014-07-24 14:43:25 -07:00
Stephen Birarda
e182f54180 exclude sixense debug on UNIX only, not APPLE 2014-07-23 17:52:50 -07:00
Stephen Birarda
bc96975700 don't look for debug sixense on UNIX to avoid missing symbol 2014-07-23 17:49:38 -07:00
Stephen Birarda
56efa46812 repair for Visage find module base includes 2014-07-22 15:56:22 -07:00
Stephen Birarda
882d0382bc tweaked FindFaceshift to pass along both debug and release libraries 2014-07-18 11:23:50 -07:00
Stephen Birarda
65a6a17fe3 fix order of path lookup for visage find module 2014-07-18 10:39:57 -07:00
Stephen Birarda
4a2e086912 fix include lookup for visage find module 2014-07-18 10:38:31 -07:00
Stephen Birarda
b5a0117243 cleanup the visage find module 2014-07-18 10:37:45 -07:00
Stephen Birarda
2a74df1dfa GLUT module is not using select_library_configurations 2014-07-18 10:27:28 -07:00
Stephen Birarda
9e83040fb4 more find module standardization and cleanup 2014-07-18 10:20:12 -07:00
Stephen Birarda
2f84e1f236 use mark_as_advanced in find modules to hide vars from advanced view 2014-07-18 10:12:17 -07:00
Stephen Birarda
39230d5dca pluralize GLUT include var in find module 2014-07-18 10:07:00 -07:00
Stephen Birarda
b0864b01de cleanup the FindPrioVR module and fix GLUT include 2014-07-18 10:05:58 -07:00
Stephen Birarda
1bbc042d2b simplify the FindGLUT.cmake module 2014-07-18 10:01:23 -07:00
Stephen Birarda
5ec710ddf6 fix re-set of LIBOVR_LIBRARIES in find module 2014-07-18 09:40:23 -07:00
Stephen Birarda
fa545775a0 tweaks to FindLibOVR for udev and xinerama 2014-07-18 09:26:24 -07:00
Stephen Birarda
498510b42e cleanup GLM find module 2014-07-17 17:30:06 -07:00
Stephen Birarda
c8902fe554 cleanup GLEW find module 2014-07-17 17:26:45 -07:00
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
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
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
fbd2066b0c more apache licensing for cmake files 2014-04-09 09:25:34 -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
636d12510c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 14:45:02 -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
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Stephen Birarda
cade36356d some more string quoting in cmake files 2014-03-03 16:38:39 -08:00
Andrzej Kapolka
3c4d2aa199 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 10:29:57 -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
5b1229e1d0 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-14 15:49:36 -08:00
Andrzej Kapolka
bb56e2847f Global edits, edits use virtual function. 2014-02-12 20:00:07 -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
Andrzej Kapolka
7f20750e80 Working on sending edits. 2014-01-24 16:03:25 -08: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
Brad Hefta-Gaub
7234b9ca4a try to get this to work 2014-01-10 22:58:32 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -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
Stephen Birarda
2ec42a2a5d revise linkage of civetweb for both DS and VS 2013-10-15 14:24:54 -07:00
Stephen Birarda
41e1ec180c add a JSON endpoint for current assignments 2013-10-15 13:45:40 -07:00
Stephen Birarda
17fda717fe move audio and avatar classes into assignment-client target 2013-09-17 11:04:46 -07:00
Stephen Birarda
d412e0611d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-06 11:04:18 -07:00
Stephen Birarda
8dad031c9a add mongoose for demo webserver for DS 2013-09-05 15:27:34 -07:00
Andrzej Kapolka
213a8fcd63 Working on Faceshift integration. 2013-09-03 11:52:32 -07:00
Stephen Birarda
23152abce7 suppress warnings for glm headers that pop up in Xcode 5 2013-08-14 15:34:57 -07:00
Stephen Birarda
9f2b2d09a9 changes to CMakeLists for Qt5 2013-07-24 11:29:12 -07:00
Stephen Birarda
a8afaea542 switch to new qt5 find module setup 2013-07-23 20:49:08 -07:00
Stephen Birarda
e4169665a9 changes to CMakeLists to up to qt5 2013-07-23 20:28:11 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
 2013-07-18 18:09:57 -07:00
Andrzej Kapolka
640ecd7f94 Working on integrating LibVPX for VP8 (9?) encoding. 2013-07-17 11:33:36 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -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
Andrzej Kapolka
7a65ebbba3 Remove Freenect/LibUSB bits. 2013-07-05 22:17:59 -07:00
Andrzej Kapolka
e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Avatar.cpp
 2013-07-03 10:15:11 -07:00
Stephen Birarda
1993601389 don't link a NOTFOUND leap library 2013-07-02 15:27:30 -07:00
Andrzej Kapolka
182f4e70af More work on skeleton tracking. 2013-07-01 15:01:36 -07:00
Andrzej Kapolka
4e9595f794 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-01 09:49:01 -07:00
Andrzej Kapolka
ea9566596a Build OpenNI/NITE into interface if available. 2013-06-28 16:47:08 -07:00
Andrzej Kapolka
884f14dca1 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-06-28 16:06:58 -07:00
Andrzej Kapolka
f83c16e578 Goodbye, skeltrack. You won't be missed. 2013-06-28 12:27:50 -07:00
Stephen Birarda
73a8882a9e resolve conflicts on merge with upstream master 2013-06-27 15:22:21 -07:00
Eric Johnston
b4f5df17ab (re-commit) Added support for Leap finger-sensing device. 
Note that the actual Leap SDK can't be in the repo for IP reasons, so there's a stub-version of the header. When the actual SDK is put into the Leap folder, cake will find it automatically and switch over.
 2013-06-27 10:54:36 -07:00
Stephen Birarda
59a9fc8eff remove the Speex library 2013-06-26 16:08:03 -07:00
Stephen Birarda
8f0478551b add the quazip library and a find module 2013-06-25 16:44:11 -07:00
Andrzej Kapolka
1d578d5b0e Lots of Kinect bits. 2013-06-25 14:27:13 -07:00
tosh
72a29979d0 Merge branch 'master' of git://github.com/worklist/hifi into 19371 
Conflicts:
	interface/CMakeLists.txt
 2013-06-20 03:46:25 +02:00
tosh
7588b7f6bb - separates audio system round trip time determination from echo cancellation 
- changes speex parameters to more humble values
- resolves build issues by removing the speex dylibs - static ones are fine
- tightens build script
 2013-06-20 02:00:12 +02:00
tosh
651dc19427 separates echo cancellation from loopback test (intermediate commit) 2013-06-19 23:55:15 +02:00
Andrzej Kapolka
776145b74c Use a CMake module for UVCCameraControl. 2013-06-19 11:14:32 -07:00
tosh
97fc38313b implements audio echo cancellation based on speex 2013-06-19 16:12:25 +02:00
tosh
682a7c9cdf libspeexdsp-based echo cancellation (untested) 2013-06-18 22:18:27 +02:00
Andrzej Kapolka
4421b21124 Working on reintegrating OpenCV (also, removed lodepng). 2013-06-17 13:24:01 -07:00
Stephen Birarda
188abd8d44 add the STK library for future audio magic 2013-05-30 12:25:29 -07:00
Stephen Birarda
a4bf95f93b don't go looking for GLM twice, check the cache 2013-05-21 15:01:41 -07:00
Stephen Birarda
9a163d2a72 conditional repairs for custom modules 2013-05-14 12:02:54 -07:00
Stephen Birarda
c3bbebee58 don't allow CMake to escape UNIX in path for PortAudio 2013-05-14 11:59:17 -07:00
Stephen Birarda
241c170345 refactor find modules so they complain when things are missing 2013-05-14 11:46:19 -07:00
Stephen Birarda
4c9d1c19ff link PortAudio as a static library instead of compiling as dependency 2013-05-14 11:22:34 -07:00
Stephen Birarda
4c2b729047 assume that oculus will only be from APPLE machines 2013-05-10 15:27:02 -07:00
Stephen Birarda
2309f30762 another typo fix for unix reference to Oculus library 2013-05-10 14:21:24 -07:00
Stephen Birarda
4d7d6aba8b use capital L for lib directory for LibOVR 2013-05-10 14:15:00 -07:00
Stephen Birarda
613066f786 add linking of LibOVR to interface CMakeLists.txt 2013-05-09 15:03:14 -07:00
Stephen Birarda
ed3f308a0e pass ROOT_DIR to IncludeGLM macro instead of MACRO_DIR, include glm for AM 2013-04-15 16:08:35 -07:00
Stephen Birarda
d094c6fc3b refactor LinkHifiLibrary, add SetupHifiLibrary macro 2013-04-15 14:41:59 -07:00
Stephen Birarda
cc2f35ca89 pass a ROOT_DIR to LinkHifiLibrary 2013-04-12 15:59:16 -07:00
Stephen Birarda
b0ff960e37 use MACRO_DIR variable to find glm in root externals dir 2013-04-12 13:20:46 -07:00
Stephen Birarda
3e6b794f11 rename domain target to domain server, use SetupHifiProject 2013-04-12 13:12:56 -07:00
Stephen Birarda
e434b06ed9 rename avatar target to avatar-mixer, add SetupHifiProject macro 2013-04-12 13:08:21 -07:00
Stephen Birarda
67efc12e59 move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
ZappoMan
4364a0e692 moved stuff around to migrate glm to shared 2013-04-11 18:41:12 -07:00
Stephen Birarda
a33a2afcb6 move interface externals to its directory 2013-02-14 15:26:05 -08:00
Stephen Birarda
1ba48cf7fe make LODEPNG_INCLUDE_DIRS should be dir, not file 2013-02-12 11:55:46 -08:00
Stephen Birarda
aaf9b73daf add find modules for Jack and librt, link to interface 2013-02-11 18:42:28 -08:00
Stephen Birarda
99b96ec737 build portaudio library to link with interface 2013-02-08 15:58:12 -08:00
Stephen Birarda
f5cbe7a05a cmake build working for interface project 2013-02-07 17:29:01 -08:00
Stephen Birarda
f9b8d6cde0 don't use find module for glm/portaudio 2013-02-07 12:24:05 -08:00
Stephen Birarda
4860fb086d link glm library to interface target 2013-02-07 11:41:01 -08:00