Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 16:59:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
36600 commits 75 branches 59 tags 1.2 GiB
Commit graph

403 commits

Author SHA1 Message Date
Leonardo Murillo
baf095f4af Lots and lots of changes to installer 2015-12-23 14:16:49 -06:00
Andrew Meadows
cb65a6f640 fix cmake to build bullet-2.83 2015-12-11 09:40:15 -08:00
Leonardo Murillo
dda99bfea6 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-08 14:07:50 -08:00
Brad Davis
2cea593fbd Remove RealSense & MIDI 2015-12-03 11:00:01 -08:00
Brad Davis
55799403c9 64 bit support for Leap Motion on windows 2015-12-02 21:52:06 -08:00
Leonardo Murillo
c786789c4c Changes for SSL and icons 2015-12-02 12:43:25 -06:00
Leonardo Murillo
ca8cd13c48 Checkpoint 2015-12-01 12:32:31 -06:00
Leonardo Murillo
e17d0b2af3 Bundling and consolidating deployment package 2015-11-20 15:10:56 -06:00
Leonardo Murillo
c56a3b6d22 Checkpoint - turning quazip into external 2015-11-20 09:56:10 -06:00
Leonardo Murillo
f981fb9f46 Initial stack manager commit 2015-11-19 18:27:58 -06:00
Brad Davis
ec918a1cf5 Fix OpenSSL 64 bit search logic 2015-11-17 19:10:16 -08:00
Brad Davis
7fa6fb1308 Remove GLEW spam in cmake 2015-11-01 01:36:12 -07:00
Bradley Austin Davis
9b9e35d396 Limit sixense to mavericks and below 2015-10-30 22:02:20 -07:00
Brad Davis
2518ada26f Merge pull request #6220 from sethalves/new-smi-runtime 
update cmake to work with newer smi runtime
 2015-10-30 10:40:04 -07:00
Brad Davis
fcfab0fc51 Moving SDL2, Sixense and Faceshift to external projects 2015-10-30 00:57:51 -07:00
Seth Alves
f01b4dcd90 update cmake to work with newer smi runtime 2015-10-29 09:23:19 -07:00
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