Ken Cooke
629ee7b0c1
Completely remove SOXR from cmake
2015-09-24 15:12:10 -07:00
MarcelEdward
c1ddf5fc32
Update Find3DConnexionClient.cmake
2015-09-15 03:22:44 +02:00
MarcelEdward
8a71b31af0
Update Find3DConnexionClient.cmake
2015-09-15 03:06:07 +02:00
MarcelEdward
c3ecbd15f8
Update Find3DConnexionClient.cmake
2015-09-15 00:30:49 +02:00
MarcelEdward
3ab63ba613
Update Find3DConnexionClient.cmake
...
The space navigator stopped working, this hopefully will fix it.
The framework is 3DconnexionClient.framework for osx, not sure why connexion named it that way. It is a library in /Library/Frameworks, the library name is in stone.
for apple, this works in cmake/modules/Find3DConnexionClient.cmake
find_library(3DConnexionClient 3DconnexionClient)
And for windows it has to find the I3dMouseParams.h file in interface/external/3dconnexionclient/includes.
So for windows the line in Find3DConnexionClient.cmake has to be:
hifi_library_search_hints("3dconnexionclient")
2015-08-22 22:48:51 +02:00
Brad Davis
aba7bebf6e
Revert "Updating to the new version of the sixense library"
2015-08-19 09:44:51 -07:00
Brad Davis
eba446e7f6
Updating to the new version of the sixense library
2015-08-18 18:55:59 -07:00
David Rowe
d7b42e264e
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-08-05 16:49:06 -07:00
Stephen Birarda
653e0d29c7
resolve conflicts on merge with upstream/core
2015-08-05 14:37:30 -07:00
Stephen Birarda
6c337b8aeb
repairs for build type of glew external
2015-08-05 14:30:36 -07:00
Brad Davis
754bf5c6f7
Merge pull request #5509 from birarda/core
...
get GLEW for all platforms as external project
2015-08-05 13:41:48 -07:00
Sam Gondelman
513c652ab3
merge from master and attempt to fix connexion conflicts
2015-08-05 12:42:39 -07:00
Stephen Birarda
cc909507f4
get GLEW for all platforms as external project
2015-08-05 12:34:11 -07:00
Bradley Austin Davis
04d579be7a
Removing integrated glew
2015-08-05 11:21:59 -07:00
David Rowe
1201073709
Add DLLs needed for Interface to run without iViewHMD installed
2015-08-04 13:15:26 -07:00
Bradley Austin Davis
ed5f70039f
Merge branch 'master' into core
2015-08-03 22:18:38 -07:00
David Rowe
86ad490bde
Fix to build on build PC without iViewHMD software installed
2015-08-03 20:52:11 -07:00
Sam Gondelman
95232920f1
trying to fix mac linking errors
2015-08-03 16:35:34 -07:00
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
