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

469 commits

Author SHA1 Message Date
Sam Gondelman
c9780338ae merge from master 2015-08-03 16:27:45 -07:00
David Rowe
7749b912ea Merge branch 'master' into 20639 2015-08-03 09:55:35 -07:00
David Rowe
e300eb27c0 Fix libs directory path 2015-08-03 09:55:14 -07:00
Bradley Austin Davis
f19653f3e2 Integrate glew 2015-08-01 20:08:19 -07:00
Sam Gondelman
647bb2b9ce removing unnecessary weak link 2015-08-01 11:41:29 -07:00
Sam Gondelman
8d77afaa94 more work on cleaning up connexion 2015-08-01 11:41:29 -07:00
Sam Gondelman
01c4e17236 trying to fix connexion linker errors, general style fixes, renamed some files 2015-08-01 11:41:29 -07:00
SamGondelman
e8daee013e windows finds framework 2015-07-31 16:27:10 -07:00
SamGondelman
25e75bcc79 WIP: trying to fix windows not finding framework 2015-07-30 18:11:24 -07:00
Sam Gondelman
a01a4f929f removing unnecessary weak link 2015-07-30 15:14:51 -07:00
Sam Gondelman
b8f7d4b8c8 more work on cleaning up connexion 2015-07-30 13:19:05 -07:00
Sam Gondelman
b19376ef6e trying to fix connexion linker errors, general style fixes, renamed some files 2015-07-30 12:17:36 -07:00
David Rowe
02ae008c9c Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
 2015-07-29 16:24:30 -07:00
Sam Gateau
8c96096a67 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-29 14:04:20 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
David Rowe
70d155048f Add SMI iViewHMD eye tracking as an optional library 2015-07-27 14:43:32 -07:00
Marcel Verhagen
32d0513962 The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351 
For now without a merge conflict.

Updated the menu name.

Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
 2015-07-27 19:04:49 +02:00
Seth Alves
fd84893c61 build separate debug and release versions of polyvox library 2015-07-15 09:42:26 -07:00
Seth Alves
316c322118 build separate debug and release versions of polyvox library 2015-07-15 09:36:51 -07:00
Brad Davis
d65e5882aa Working on 64 bit builds 2015-06-18 21:44:12 -07:00
Brad Davis
8bad80324f Merge branch 'master' into plugins_pt3 2015-05-29 09:05:01 -07:00
Brad Davis
09085f1cd9 Working towards display plugins 2015-05-26 18:42:38 -07:00
Seth Alves
8e76887101 working on windows build of polyvox 2015-05-21 11:55:13 -07:00
Seth Alves
4166c3224f link polyvox library in with entities 2015-05-19 16:24:13 -07:00
Bradley Austin Davis
03bd17ed49 Rebasing onto scale changes 2015-05-08 15:09:46 -07:00
Seth Alves
34e64e5007 Merge pull request #4650 from birarda/vhacd-external 
add v-hacd as an external project
 2015-04-21 09:44:52 -07:00
Stephen Birarda
cfac4fe9c1 remove the Visage find module 2015-04-17 14:28:41 -07:00
Stephen Birarda
b25d22aa53 use debug/release for IDE handling of V-HACD 2015-04-15 14:38:24 -07:00
Stephen Birarda
03129f98d4 make VHACD an external project 2015-04-15 13:51:51 -07:00
Brad Davis
1e65324a7b Updating cmake config to build from pre-compiled Oculus SDK distribution 2015-03-09 14:46:43 -07:00
Brad Davis
c1c97fc8b6 Updating cmake files after merging from master 2015-03-04 23:32:27 -08:00
Brad Davis
d838b78df9 Merging from upstream 2015-03-04 21:53:31 -08:00
Stephen Birarda
8f2dc7e38b resolve conflicts on merge with upstream master 2015-03-03 12:22:25 -08:00
Stephen Birarda
e43da00537 remove xmpp chat support 2015-03-03 10:13:41 -08:00
Stephen Birarda
5a601f3676 resolve conflicts on merge with upstream/master 2015-03-03 10:01:24 -08:00
Stephen Birarda
38f77190eb remove PrioVR from build files 2015-02-26 17:20:45 -08:00
Virendra Singh
b3fdb19cad Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 
Conflicts:
	BUILD.md
	BUILD_WIN.md
 2015-02-26 22:16:35 +05:30
Virendra Singh
ed09b619d1 OS check 
check OS for different filenames
 2015-02-25 09:12:19 +05:30
Kodey
a5aeb3b980 cmake changes for building on linux 2015-02-25 08:45:00 +05:30
Stephen Birarda
8be707f63f rename add paths macro for fixup_bundle 2015-02-23 13:24:21 -08:00
Stephen Birarda
bae5d987f9 add OpenSSL lib path to paths for fixup 2015-02-23 13:21:45 -08:00
Stephen Birarda
437d5c7bdf repairs to include locations for QXmpp and SDL2 2015-02-23 09:26:35 -08:00
Brad Davis
1cd4dc4746 Adding win32 libs, need to fix for cross platform 2015-02-23 09:15:18 -08:00
Stephen Birarda
d08f7d6255 check if QXmpp is dynamic or static 2015-02-23 08:24:52 -08:00
Virendra Singh
b9befc208b Cmake module to find VHACD library 
FindVHACD will look for VHACD_ROOT_DIR env variable or
HIFI_LIB_DIR/vhacd folder
 2015-02-21 15:38:16 +05:30
Stephen Birarda
fd8e9bad20 fix casing in find modules for gverb and soxr 2015-02-20 15:36:59 -08:00
Stephen Birarda
bc0bd462cb add an external project for SDL 2 2015-02-20 15:26:16 -08:00
Stephen Birarda
b23dd28b56 don't use static version of GLEW 2015-02-20 14:01:01 -08:00
Stephen Birarda
5e264f8241 add GLEW as dependency external project 2015-02-20 13:47:38 -08:00
Brad Davis
16feaceab5 Working on oculus build 2015-02-20 09:32:25 -08:00
Stephen Birarda
dab524fb0f remove zlib modules and mentions in build guides 2015-02-19 15:35:40 -08:00
Stephen Birarda
63d4538b76 fix ZLIB dll find, bullet check 2015-02-19 15:22:37 -08:00
Stephen Birarda
c3b9198ec3 cleanup handling of external projects if OS not handled 2015-02-19 15:19:52 -08:00
Stephen Birarda
71b273ceec fix order for found result in bullet find module 2015-02-19 12:42:28 -08:00
Stephen Birarda
48d2684209 add path to DeviceDLL for sixense 2015-02-17 17:51:54 -08:00
Stephen Birarda
0ff382e68a correct typo in sixense dll path 2015-02-17 16:54:59 -08:00
Stephen Birarda
d0d4eaec86 fix AddPathsToLibPaths foreach, soxr requirements 2015-02-17 15:44:03 -08:00
Stephen Birarda
10cdbc4fa0 fix dynamic requirements in find modules 2015-02-17 15:33:26 -08:00
Stephen Birarda
ecbbb481d0 ensure dll path is found for sdl2 2015-02-17 15:27:12 -08:00
Stephen Birarda
e582709185 ensure leapmotion dll path is found 2015-02-17 15:22:22 -08:00
Stephen Birarda
b727c910d1 handle multiple dll paths, add sixense 2015-02-17 15:19:17 -08:00
Stephen Birarda
e7b4746c16 add TBB dll path to lib paths 2015-02-17 15:12:13 -08:00
Stephen Birarda
c233dc7b57 get sdl2 dll path for win32 fixup_bundle 2015-02-17 15:08:41 -08:00
Stephen Birarda
b682cd03f3 cleanup leap dll path for win 2015-02-17 15:08:30 -08:00
Stephen Birarda
34cf7bb1f1 add leap motion dll path for fixup_bundle 2015-02-17 15:04:57 -08:00
Stephen Birarda
801ab0e2b9 windows unhelpfully puts soxr dll in bin, not lib 2015-02-17 14:30:20 -08:00
Stephen Birarda
767601de4f use a cache variable to pass around lib paths 2015-02-17 14:09:26 -08:00
Stephen Birarda
9683ed92e3 use proper lib path on WIN32 for gverb 2015-02-13 16:40:48 -08:00
Stephen Birarda
4300836810 make gverb a cmake external project 2015-02-13 15:47:35 -08:00
Stephen Birarda
6e63c1c1ad set the GLM_INCLUDE_DIRS var in cache so find hits it 2015-02-13 14:50:12 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Stephen Birarda
2f875cc08e remove the glm find module 2015-02-13 10:38:13 -08:00
Stephen Birarda
adbf6de3e6 actually append found libraries to BULLET_LIBRARIES 2015-02-06 17:02:36 -08:00
Stephen Birarda
6c2710354a remove an extra cmake debug line 2015-02-06 16:36:15 -08:00
Stephen Birarda
f0f7bca5db don't force requirement of BOTH debug/release Bullet 2015-02-06 16:35:25 -08:00
Stephen Birarda
951617d40a get PlatformActivity menu working in GVR 2015-02-02 17:01:04 -08:00
Stephen Birarda
d13e3c20c8 force GLM to not be found in path 2015-01-28 15:32:59 -08:00
Stephen Birarda
ad0ae76b00 use shared soxr to avoid openmp link 2015-01-28 14:59:23 -08:00
Stephen Birarda
c06ba0307e make sure we grab openmp for soxr on Android 2015-01-28 14:46:01 -08:00
Stephen Birarda
ce1e96e034 fix version find for 1.0.2 in OpenSSL 2015-01-28 13:48:28 -08:00
Stephen Birarda
43e907ec83 get QtActivity notifications about GVR changes 2015-01-27 11:37:07 -08:00
Stephen Birarda
976c3b633b remove extra library links for android LibOVR 2015-01-26 13:26:26 -08:00
Stephen Birarda
4679f7f858 cleanup linking of oculus mobile sdk 2015-01-26 13:26:08 -08:00
Stephen Birarda
102f076412 look for soxr and not redundant libsoxr 2015-01-22 14:09:29 -08:00
Stephen Birarda
c82ac27104 fix a typo in RtMidi find module 2015-01-22 14:06:53 -08:00
Stephen Birarda
aa6e1607e2 add libsoxr for audio resampling 2015-01-22 14:06:05 -08:00
Stephen Birarda
eebb21656e fix so Gverb is found on android 2015-01-21 13:20:21 -08:00
Stephen Birarda
3ea699d31b remove user CMakeLists, fix path in FindGverb 2015-01-21 13:00:15 -08:00
Stephen Birarda
60bdd206eb Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-19 12:35:22 -08:00
Stephen Birarda
671734ba44 fix TBB find module for android build 2015-01-19 12:01:24 -08:00
Andrew Meadows
fd9b56fe49 add lib/Release and lib/Debug to lib PATH_SUFFIXES 2015-01-19 10:41:45 -08:00
Stephen Birarda
10be0ee984 resolve conflicts on merge with upstream master 2015-01-19 10:26:56 -08:00
Andrew Meadows
117ed9206c add ${BULLET_SEARCH_DIRS}/include, 
remove PATH_SUFFIXES include/bullet
 2015-01-16 16:19:47 -08:00
Andrew Meadows
d5119b3532 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/EntityMotionState.h
	libraries/physics/src/ObjectMotionState.cpp
	libraries/physics/src/PhysicsEngine.cpp
	libraries/physics/src/PhysicsEngine.h
 2015-01-16 14:36:27 -08:00
Andrew Meadows
0a04dc8445 modify PATH_SUFFIXES when hunting for include dir 2015-01-16 13:38:11 -08:00
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
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
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
Stephen Birarda
adf51bfeb8 temp disable visage to get to C++11 support 2014-12-17 16:41:28 -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
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
David Rowe
7f36a11f35 Find Oculus libraries when using Visual Studio 2013 2014-12-01 10:40:37 -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
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
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
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