Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 19:36:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
10750 commits 71 branches 56 tags 1.2 GiB
Commit graph

10750 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
853bba27ca Applied Ryan's tweaks to Visage mapping and config file. 2014-03-10 15:13:24 -07:00
Andrzej Kapolka
802cc3eeed Some untested ray intersection bits. 2014-03-10 14:58:31 -07:00
Andrzej Kapolka
7fc55e5596 Better merging for normals. 2014-03-10 13:00:58 -07:00
Andrzej Kapolka
3b63424abd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 12:27:07 -07:00
Andrzej Kapolka
34ddddae1b Basic LRU cache. Closes #2234. 2014-03-10 12:06:07 -07:00
Andrzej Kapolka
9731159b82 Merge branch 'master' of https://github.com/highfidelity/hifi into joints 2014-03-10 10:57:48 -07:00
Andrzej Kapolka
de8165c544 Merge pull request #2253 from ey6es/master 
Initialize scale to unity.  Closes #2232.
 2014-03-10 10:54:07 -07:00
Andrzej Kapolka
c6655382d6 Initialize scale to unity. Closes #2232. 2014-03-10 10:52:46 -07:00
Atlante45
a7415d25b3 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-10 10:50:43 -07:00
Andrzej Kapolka
d2f947aee1 Working on LRU cache for resources. 2014-03-10 10:49:38 -07:00
Stephen Birarda
bd0086892d Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-10 09:36:52 -07:00
Stephen Birarda
f099616aff Merge pull request #2246 from ZappoMan/bugfixes 
temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager
 2014-03-10 09:29:51 -07:00
Stephen Birarda
002738037c only look for the 32-bit oculus lib on windows 2014-03-10 09:28:20 -07:00
Stephen Birarda
4e382099fb have FindGLEW only look for 32-bit static lib 2014-03-10 09:27:32 -07:00
Stephen Birarda
6d5515a41d clarify that Windows builds are 32-bit, fix double GLEW_STATIC 2014-03-10 09:27:01 -07:00
Stephen Birarda
741bf9fe9c remove double definition of GLEW_STATIC 2014-03-10 09:22:51 -07:00
Stephen Birarda
3c7da7496c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-10 09:00:50 -07:00
Philip Rosedale
2a06cfd1bf Merge branch 'master' of https://github.com/worklist/hifi 2014-03-09 18:45:36 -05:00
ZappoMan
e2415642f0 temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager 2014-03-09 00:10:31 -08:00
ZappoMan
f4d487464a more constructor cleanup 2014-03-09 00:01:47 -08:00
ZappoMan
7fb872c1d7 remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStats 2014-03-08 23:53:44 -08:00
ZappoMan
cfa618d694 cleanup constructors 2014-03-08 23:31:23 -08:00
Brad Hefta-Gaub
4fbb4b240e Merge pull request #2244 from ZappoMan/fix_cmake_policy_warning 
windows build fixes - mostly cmake problems
 2014-03-08 20:07:51 -08:00
ZappoMan
9c93149bd7 fix searching for sixense SDK on windows 2014-03-08 18:46:36 -08:00
Brad Hefta-Gaub
fe4b2494b8 Merge branch 'master' of git://github.com/worklist/hifi into fix_cmake_policy_warning 2014-03-08 18:29:43 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Brad Hefta-Gaub
e0cbecc3dd Merge pull request #2243 from ZappoMan/fix_cmake_policy_warning 
fix cmake policy warnings
 2014-03-08 17:57:55 -08:00
ZappoMan
35a1bb8744 fix cmake policy warnings 2014-03-08 17:26:38 -08:00
ZappoMan
b98dfd82c9 Merge pull request #2237 from birarda/master 
remove svo-viewer to place in external repository
 2014-03-08 16:01:04 -08:00
Stephen Birarda
fa9722741e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-07 16:44:32 -08:00
Stephen Birarda
e52bc2c667 remove svo-viewer to place in external repository 2014-03-07 16:31:01 -08:00
ZappoMan
68c3e0e54d Merge pull request #2236 from Atlante45/fst_upload 
FST ploader base
 2014-03-07 15:42:52 -08:00
Leonardo Murillo
7b587a40e4 Merge pull request #2233 from birarda/cleanup-externals 
make freeglut and glew external dependencies
 2014-03-07 17:18:00 -06:00
Stephen Birarda
3eace31dde add a definition so that static GLEW works without DLL 2014-03-07 14:53:13 -08:00
Stephen Birarda
386d0b8c41 add instructions to put Freeglut DLL into path 2014-03-07 14:51:55 -08:00
Philip Rosedale
2582b0007e Merge branch 'master' of https://github.com/worklist/hifi 2014-03-07 16:50:14 -06:00
Stephen Birarda
6f81803a3d don't have GLUT find module look for the DLL 2014-03-07 14:47:24 -08:00
Stephen Birarda
ec450315cd remove an extra apostrophe in the BUILD guide 2014-03-07 14:36:39 -08:00
Atlante45
045f0d5f21 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels 2014-03-07 14:33:37 -08:00
Stephen Birarda
a72cac8c9c default to using Release LibOVR, include instructions for OS X rebuild 2014-03-07 14:31:59 -08:00
Stephen Birarda
e96e88b3b3 remove a warning that no longer needs to be heeded 2014-03-07 14:19:45 -08:00
Stephen Birarda
03a9d6c02d glut dll search is for path, not library 2014-03-07 14:14:15 -08:00
Stephen Birarda
720846fa62 fix FindGLUT to get path to GLUT dll 2014-03-07 14:11:45 -08:00
Stephen Birarda
b8a03cf0f4 glew to be linked statically so dll not required at runtime 2014-03-07 14:08:30 -08:00
Stephen Birarda
1bd3529395 more module fixes and sixense readme change for OS X dylib 2014-03-07 13:59:50 -08:00
Stephen Birarda
569dd694fe cmake styling cleanup in Visage find module and interface CMakeLists 2014-03-07 13:42:13 -08:00
Stephen Birarda
23249866f7 have cmake copy dlls for glut and glew beside executable 2014-03-07 13:41:00 -08:00
Stephen Birarda
5452b81d58 use a path suffix in GLEW finder to get correct dir 2014-03-07 12:24:03 -08:00
Stephen Birarda
e3363dd304 conditionally include the OPENGL_INCLUDE_DIR since it is empty on windows 2014-03-07 12:22:58 -08:00
Stephen Birarda
01f155a103 use a PATH_SUFFIXES command in freeglut path find 2014-03-07 12:21:16 -08:00