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
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