Brad Hefta-Gaub
|
a3022f538d
|
more windows fixes
|
2014-01-12 23:08:01 -08: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
|
19012e2f6d
|
more windows build fixes isnan
|
2014-01-12 22:05:55 -08:00 |
|
Brad Hefta-Gaub
|
a8fc7f44c0
|
Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build
|
2014-01-12 21:47:19 -08:00 |
|
Brad Hefta-Gaub
|
32792a8e66
|
move windowshacks
|
2014-01-12 21:46:55 -08:00 |
|
Brad Hefta-Gaub
|
57f400f2d2
|
add windowshacks.h
|
2014-01-12 21:45:41 -08:00 |
|
Brad Hefta-Gaub
|
2d8b2b2530
|
clean up windows warnings
|
2014-01-12 21:36:55 -08:00 |
|
Brad Hefta-Gaub
|
a94e371e5c
|
fix more windows warnings
|
2014-01-12 21:27:25 -08:00 |
|
Brad Hefta-Gaub
|
c90c1e4063
|
more LIBVPX workarounds
|
2014-01-12 19:59:17 -08:00 |
|
Brad Hefta-Gaub
|
ff72e25a34
|
more windows build work
|
2014-01-12 15:31:06 -08:00 |
|
Brad Hefta-Gaub
|
08bb783777
|
more windows build work
|
2014-01-12 14:49:15 -08:00 |
|
Brad Hefta-Gaub
|
8d7cb5d0be
|
add HAVE_LIBVPX around webcam implementation
|
2014-01-11 23:00:17 -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
|
c7ec767565
|
near/far apparently don't work as variables in windows
|
2014-01-11 22:38:08 -08:00 |
|
Brad Hefta-Gaub
|
b0e913bfce
|
add Audio back to win32
|
2014-01-11 22:30:55 -08:00 |
|
Brad Hefta-Gaub
|
6de68ce31c
|
remove LIBVPX from webcam
|
2014-01-11 22:08:15 -08:00 |
|
Brad Hefta-Gaub
|
6e363e4aae
|
err fix mac build
|
2014-01-11 21:55:08 -08:00 |
|
Brad Hefta-Gaub
|
776f0e4585
|
fix up avatar.h and floats
|
2014-01-11 21:48:35 -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 |
|
Brad Hefta-Gaub
|
825c1c8876
|
fix windows warnings
|
2014-01-11 00:07:35 -08:00 |
|
Brad Hefta-Gaub
|
73c8dc495b
|
changed all fmin to std::min
|
2014-01-10 21:42:08 -08:00 |
|
Brad Hefta-Gaub
|
26adabf130
|
removed voxel addSphere since it wasn't compiling and was old debug code
|
2014-01-10 21:39:03 -08:00 |
|
Brad Hefta-Gaub
|
731209d8cb
|
remove unused PerfStats class more missing header changes
|
2014-01-10 19:47:23 -08:00 |
|
Brad Hefta-Gaub
|
5725a92cfe
|
get rid of arpa/inet.h and netdb.h
|
2014-01-10 18:13:23 -08:00 |
|
Brad Hefta-Gaub
|
9bc4a3df41
|
switch from pthread mutex to QMutex
|
2014-01-10 18:01:36 -08:00 |
|
Andrew Meadows
|
e18ae78ce1
|
merge pull #1499
|
2014-01-10 16:30:22 -08:00 |
|
Andrew Meadows
|
f2d0d445c2
|
yet another merge after competing pull requests
|
2014-01-10 16:03:48 -08:00 |
|
Andrzej Kapolka
|
415935a594
|
Merge branch 'master' of https://github.com/worklist/hifi into fixery
|
2014-01-10 16:03:40 -08:00 |
|
Andrzej Kapolka
|
de0472cfc1
|
Merge pull request #1498 from birarda/remove-curl
remove curl dependency by removing starfield loading from URL
|
2014-01-10 16:02:17 -08:00 |
|
Andrzej Kapolka
|
355321c8b5
|
Merge branch 'master' of https://github.com/worklist/hifi into fixery
|
2014-01-10 16:01:18 -08:00 |
|
Andrew Meadows
|
8799ad133e
|
merge again after some competing pull requests were processed
|
2014-01-10 16:00:08 -08:00 |
|
Andrew Meadows
|
d28ed70ca9
|
merge pull request 1446
|
2014-01-10 15:55:38 -08:00 |
|
Andrzej Kapolka
|
a7c14f1f17
|
Only register movement if the hand isn't new.
|
2014-01-10 15:53:50 -08:00 |
|
Philip Rosedale
|
ea0f7c1e05
|
Merge pull request #1475 from ZappoMan/local_voxel_cache
Local voxel cache & some bug fixes
|
2014-01-10 15:53:47 -08:00 |
|
Andrzej Kapolka
|
5283e51927
|
Start out disabled.
|
2014-01-10 15:51:12 -08:00 |
|
Andrzej Kapolka
|
a7e9434c96
|
Tweaked constants.
|
2014-01-10 15:50:14 -08:00 |
|
Stephen Birarda
|
1c3259c8cf
|
remove the starfield URL loading code, closes #1497
|
2014-01-10 15:33:43 -08:00 |
|
Andrzej Kapolka
|
515b40ecc3
|
Attempt to disable Hydra hands after five seconds without movement.
|
2014-01-10 15:00:14 -08:00 |
|
Andrzej Kapolka
|
38118fdab0
|
When we start setting the fake coefficients after we set the real ones, make
sure all of the other coefficients are zero.
|
2014-01-10 14:42:05 -08:00 |
|
Andrzej Kapolka
|
4ae5203f38
|
Remove unused constant.
|
2014-01-10 14:10:33 -08:00 |
|
Andrzej Kapolka
|
9fa170494c
|
I believe what we really want to decay is the mouse pitch.
|
2014-01-10 14:04:46 -08:00 |
|
Andrzej Kapolka
|
e97970d961
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-01-10 12:27:04 -08:00 |
|
Andrzej Kapolka
|
131af0cf16
|
I believe this should fix the "Joint/model not in model list" errors.
|
2014-01-10 12:26:11 -08:00 |
|
Philip Rosedale
|
f0460bac5f
|
Merge pull request #1492 from stojce/19466
Code Review for Job #19466
|
2014-01-10 11:19:43 -08:00 |
|
Brad Hefta-Gaub
|
50fa6be829
|
Merge branch 'master' of git://github.com/worklist/hifi into local_voxel_cache
|
2014-01-09 19:41:15 -08:00 |
|
ZappoMan
|
88232f320c
|
Merge pull request #1469 from birarda/kill-leap
remove leap integration
|
2014-01-09 19:40:58 -08:00 |
|
Brad Hefta-Gaub
|
cdb4b8c5f3
|
Merge branch 'master' of git://github.com/worklist/hifi into local_voxel_cache
|
2014-01-09 18:52:34 -08:00 |
|