Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 18:47:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21845 commits 25 branches 0 tags 1.1 GiB
Commit graph

297 commits

Author SHA1 Message Date
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
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Leonardo Murillo
6191db3a7f Fixing bug with visage find_library 2014-08-07 09:59:07 -06: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
4f17902c6b fix set of LIBOVR_LIBRARIES in FindLibOVR module 2014-07-30 15:08:31 -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