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
Brad Hefta-Gaub
392ff94ebe
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
...
Conflicts:
interface/src/DataServerClient.cpp
interface/src/avatar/MyAvatar.cpp
libraries/avatars/src/AvatarData.h
2014-01-13 15:06:26 -08:00
Brad Hefta-Gaub
8e8e6fcb30
added latest version of freeglut for windows
2014-01-13 14:46:03 -08:00
Brad Hefta-Gaub
483ac66518
more windows build tweaks, warnings and linking
2014-01-13 11:48:16 -08:00
Leonardo Murillo
0e25c85eef
Trivial change - testing deploy changes
2014-01-13 11:46:27 -06:00
Leonardo Murillo
4373cc1718
Trivial commit - triggering github merge for testing
2014-01-13 11:05:58 -06:00
Brad Hefta-Gaub
d92d043e8f
more windows build fixes
2014-01-12 22:52:06 -08:00
Brad Hefta-Gaub
2017f850c4
more windows float warning and error fixes
2014-01-12 22:07:37 -08:00
Brad Hefta-Gaub
680f611968
add define to make sure constants like M_PI are included on windows
2014-01-11 22:47:45 -08:00
Brad Hefta-Gaub
6e363e4aae
err fix mac build
2014-01-11 21:55:08 -08:00
Brad Hefta-Gaub
a34d4acb71
more windows build, first cut at getting opengl working, more disabling VPX
2014-01-11 21:39:45 -08:00
Brad Hefta-Gaub
cded9a1558
attempt to make LIBVPX optional since we don't yet have it on windows
2014-01-11 11:47:17 -08:00
Brad Hefta-Gaub
91da3264eb
remove more -isystem from windows build
2014-01-11 11:26:04 -08:00
Leonardo Murillo
1c2b27f0f4
Checkpoint
2014-01-10 15:18:24 -06:00
Leonardo Murillo
da2f814b7a
Merge branch 'master' of github.com:/worklist/hifi
2014-01-10 14:08:22 -06:00
Leonardo Murillo
d44126ac33
Get version XML and store latest version as application property
2014-01-08 08:30:50 -06:00
Stephen Birarda
133ba3a230
remove Leap integration from CMakeLists
2014-01-06 11:13:19 -08:00
Andrzej Kapolka
6cffce5b31
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
2013-12-17 16:57:25 -08:00
ZappoMan
f469553b8c
CR feedback
2013-12-17 14:27:54 -08:00
Andrzej Kapolka
a5c8531aa1
Merge branch 'master' of https://github.com/worklist/hifi into metavoxels
...
Conflicts:
interface/src/Application.cpp
2013-12-17 13:46:44 -08:00
Andrzej Kapolka
6385a73379
Working on scripty bits.
2013-12-16 17:53:53 -08:00
