Stephen Birarda
1ec48b5999
fix a dumb elseif in custom find glut module
2014-03-07 12:16:09 -08:00
Stephen Birarda
dbf8021ccd
include GLUT and OpenGL dirs as system includes
2014-03-07 12:07:19 -08:00
Stephen Birarda
a364655f63
Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals
2014-03-07 09:40:50 -08:00
ZappoMan
92d39b3c47
Merge pull request #2229 from birarda/master
...
make LibOVR (for oculus) an external dependency
2014-03-06 22:43:32 -08:00
Stephen Birarda
b91a55d89d
tweak the GLEW and glut modules to be more hifi specific
2014-03-06 17:53:07 -08:00
Stephen Birarda
594d43db84
add a find module for glew and tweak glm module
2014-03-06 17:41:14 -08:00
Stephen Birarda
cfc55c0435
cleanup interface CMakeLists for freeglut and GLEW finding
2014-03-06 17:23:56 -08:00
Stephen Birarda
d64be26e41
Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals
2014-03-06 17:12:08 -08:00
Stephen Birarda
0f5fbb5fab
pull out glew and freeglut so they can be external dependencies
2014-03-06 17:09:59 -08:00
Stephen Birarda
27d486c0a1
resolve conflicts on merge with upstream master
2014-03-06 14:47:58 -08:00
Stephen Birarda
636d12510c
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-06 14:45:02 -08:00
Stephen Birarda
816a631b05
tweak the oculus find module to take copied-in folders
2014-03-06 14:16:38 -08:00
Stephen Birarda
b705ec560f
cleanup resources directory references by copying beside the executable
2014-03-06 11:46:49 -08:00
Stephen Birarda
94a0db04f9
don't copy resources into OS X bundle
2014-03-06 10:41:44 -08:00
Stephen Birarda
cc554c53f1
use Qt Resource System to compile in resources
2014-03-06 10:25:15 -08:00
Stephen Birarda
ede32b5f1a
resolve conflicts on merge with upstream master
2014-03-05 15:31:00 -08:00
Stephen Birarda
161b8ad50b
remove double inclusion of glm
2014-03-04 15:25:47 -08:00
Stephen Birarda
231dc624ff
replace deprecated qt5 macros in cmake with target_link_libraries
2014-03-04 12:41:24 -08:00
Stephen Birarda
e16a325006
optionally do not reference OPENGL_INCLUDE_DIR for win
2014-03-03 16:36:37 -08:00
Stephen Birarda
628f91cd73
complete quoting of varous Cmake commands, closes #1999
2014-03-03 12:15:05 -08:00
matsukaze
e800c80d61
Merge remote-tracking branch 'upstream/master'
2014-02-20 23:32:06 -05:00
Andrzej Kapolka
bf12cdddf5
We need libc++, not libc++abi.
2014-02-19 12:03:14 -08:00
matsukaze
8aa645b6de
Merge and resolve conflicts of remote-tracking branch 'upstream/master'
2014-02-18 22:45:25 -05:00
Andrzej Kapolka
cc6b663ea6
Use the ABI-compatible library (hopefully).
2014-02-18 15:37:40 -08:00
Andrzej Kapolka
0547fa61b4
Link in the new standard library, which Visage uses.
2014-02-18 15:17:16 -08:00
Andrzej Kapolka
a89959cd47
Get rid of this line.
2014-02-18 15:09:34 -08:00
Andrzej Kapolka
8be17bf02a
Attempting to get Visage building in on OS X.
2014-02-18 14:27:06 -08:00
Andrzej Kapolka
1d7f1afa5b
Merge branch 'master' of https://github.com/highfidelity/hifi into kissage
2014-02-17 21:48:21 -08:00
Andrzej Kapolka
c078012614
Sniffing glue, wrong day, etc.
2014-02-11 17:26:31 -08:00
Andrzej Kapolka
a9b415b0f9
More build settings.
2014-02-11 17:22:40 -08:00
Andrzej Kapolka
25066f8b4f
Starting on Visage integration.
2014-02-11 16:44:25 -08:00
stojce
6e31f16924
fix for Firefox
2014-02-11 19:25:03 +01:00
stojce
7fc66392cc
Interface OS X hifi URL scheme
2014-02-08 12:04:55 +01:00
matsukaze
bbf4f889d8
Completed worklist job #19486
...
Job #19486 Don't render the duplicate triangles between adjacent
voxels.
Added checkable item to "developer" menu to activate/deactivate cull
shared faces.
Cull all shared voxel faces regardless of distribution in the octree.
Includes leaf to leaf, leaf to non-leaf, and non-leaf to non-leaf
comparison of contiguous faces.
Added new GL primitive renderer to manage the transfer of cube faces
from the voxel system to GL.
Added some useful classes for queue and lock management.
Modified statistics collection to report number of completely culled
nodes. Extra debugging info also includes the interior occlusions bit
mask of leaf voxels.
2014-02-03 09:45:12 -05:00
Stephen Birarda
e01f317cba
remove QUiTools include, not needed
2014-01-22 14:20:40 -08:00
Stephen Birarda
d2e02c15d8
repair the UpdateDialog so it is a QDialog with no child QWidget
2014-01-22 14:17:56 -08:00
Leonardo Murillo
a4efe55bbf
changing dev version
2014-01-17 14:02:57 -06:00
Leonardo Murillo
82ecc9cc36
Merge branch 'master' of github.com:/worklist/hifi
2014-01-17 13:06:59 -06:00
Brad Hefta-Gaub
ef98a74ec8
Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build
2014-01-16 14:33:44 -08:00
Brad Hefta-Gaub
87bb4e691c
remove glut and clean up windows build cmake
2014-01-16 14:27:08 -08:00
Stephen Birarda
495d227950
remove Faceshift here report, Quazip find module
2014-01-16 14:18:27 -08:00
Stephen Birarda
323aa18c0e
remove MotionDriver and pthread libraries
2014-01-16 14:16:38 -08:00
Andrzej Kapolka
865b495e6c
Merge branch 'master' of https://github.com/worklist/hifi into debone
...
Conflicts:
interface/src/Audio.cpp
interface/src/Menu.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Webcam.cpp
interface/src/devices/Webcam.h
interface/src/renderer/FBXReader.cpp
2014-01-16 13:35:03 -08:00
Brad Hefta-Gaub
952365a1b7
clean up comments and tab spacing
2014-01-15 12:50:36 -08:00
Brad Hefta-Gaub
0df826bbd8
fix cmake warning
2014-01-15 10:23:51 -08:00
Leonardo Murillo
f9bb98680d
Using Qt Designer .ui file instead of manually coding dialog
2014-01-14 21:57:28 -06:00
Brad Hefta-Gaub
35016c7d69
make faceshift compile sources on windows to address linker error
2014-01-14 10:20:27 -08:00
Brad Hefta-Gaub
73aae6ef02
adding more opencv libraries and fix cmake for opencv and faceshift for windows
2014-01-13 20:12:11 -08:00
Brad Hefta-Gaub
54fa3ba17c
link to faceshift for windows
2014-01-13 16:14:02 -08:00
Brad Hefta-Gaub
e60446a632
more windows build work
2014-01-13 15:57:31 -08:00
