Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 00:07:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20966 commits 22 branches 28 tags 1.2 GiB
Commit graph

348 commits

Author SHA1 Message Date
Brad Hefta-Gaub
699964ebb9 Merge pull request #4111 from AndrewMeadows/bispinor 
require Bullet
 2015-01-19 12:30:14 -08:00
Andrew Meadows
fd9b56fe49 add lib/Release and lib/Debug to lib PATH_SUFFIXES 2015-01-19 10:41:45 -08:00
Andrew Meadows
614a7eb0b5 fix for entities rendering as black on linux 2015-01-16 16:49:11 -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
Andrew Meadows
2177a1701a more correct cmake config for Bullet 
(copying pattern from IncludeGLM.cmake)
 2015-01-15 11:38:38 -08:00
Andrew Meadows
51cc9d6d9a alt method for repressing unused var warnings 2015-01-15 10:46:09 -08:00
Andrew Meadows
ff171a5782 Bullet is now required dependency 2015-01-15 10:27:43 -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
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
Brad Hefta-Gaub
43e6ba77fa Merge pull request #4007 from AndrewMeadows/inertia 
Bullet physics part 1
 2014-12-31 10:33:00 -08:00
Andrew Meadows
adf778fba2 Merge pull request #4013 from Atlante45/cmake_fix 
Fix for new version of cmake
 2014-12-30 15:10:14 -08:00
Atlante45
729034dd94 Removed unnecessary list(LENGTH ...) 2014-12-30 11:13:00 -08:00
Atlante45
4586afc6c5 Fix for new version of cmake 2014-12-29 17:23:54 -08:00
Andrew Meadows
9b7e50858a merge upstream/master into andrew/inertia 
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
 2014-12-29 09:15:49 -08:00
Sam Gateau
acad86edf5 clean cmake file for autoScribeShader 2014-12-25 22:41:14 -08:00
Sam Gateau
c5eb04336f first version of SCribe used for shaders in render-utils 2014-12-23 16:27:02 -08:00
Sam Gateau
03d8922d59 fix typo 2014-12-23 15:47:39 -08:00
Sam Gateau
3cfe066bcb Add the autoScribeShader cmake 2014-12-23 15:42:14 -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
Andrew Meadows
25b00977be fix cmake config for bullet after c++-11 changes 2014-12-18 17:34:39 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Andrew Meadows
11f01e1859 merge upstream/master into andrew/inertia 2014-12-18 15:01:08 -08:00
Stephen Birarda
d38c78f2c3 remove bubbling of linked libraries, cmake does it 2014-12-18 09:34:04 -08:00
Stephen Birarda
adf51bfeb8 temp disable visage to get to C++11 support 2014-12-17 16:41:28 -08:00
Stephen Birarda
33d50c6eb6 fix dependency qt module linking in LinkSharedDependencies 2014-12-17 10:26:51 -08:00
Stephen Birarda
4216806967 remove extra debugging in LinkSharedDependencies 2014-12-17 10:21:53 -08:00
Stephen Birarda
2ee33cef9f have targets bubble up their Qt modules 2014-12-17 10:21:27 -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
Stephen Birarda
bf5147cd91 fix qt modules to link in LinkSharedDependencies 2014-12-15 12:56:32 -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
Andrew Meadows
a21ebe4f6a merge andrew/thermonuclear into andrew/inertia 2014-12-02 15:31:30 -08:00
David Rowe
7f36a11f35 Find Oculus libraries when using Visual Studio 2013 2014-12-01 10:40:37 -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
b8d0bd5d6b allow a target to bubble up required includes 2014-11-05 13:25:32 -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
Andrew Meadows
92ceb52183 adding macro to find bullet 2014-11-04 16:46:45 -08:00