Andrzej Kapolka
|
8c42a3a848
|
Ray query fix.
|
2014-08-13 11:30:05 -07:00 |
|
Andrzej Kapolka
|
56c6c3c972
|
Working on the height/ray queries.
|
2014-08-13 11:05:48 -07:00 |
|
Andrzej Kapolka
|
d00efe7f6d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-13 10:07:24 -07:00 |
|
Leonardo Murillo
|
ab4cd71028
|
Merge pull request #3275 from birarda/oculus-dk2
integration of Oculus 0.4.1 for DK2 positional tracking
|
2014-08-13 09:36:59 -07:00 |
|
Stephen Birarda
|
b055e07d72
|
look for atls not atl in FindATL
|
2014-08-13 09:29:49 -07:00 |
|
Stephen Birarda
|
c5ee81f99f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into oculus-dk2
|
2014-08-13 09:28:10 -07:00 |
|
Stephen Birarda
|
715aa3b8b9
|
Merge pull request #3276 from birarda/qxmpp-fix
require QXMPP_LIBRARY to be found for FindQXMPP to succeed
|
2014-08-13 09:27:57 -07:00 |
|
Stephen Birarda
|
da7f3d18e4
|
require QXMPP_LIBRARY to be found for FindQXMPP to succeed
|
2014-08-13 09:27:44 -07:00 |
|
Stephen Birarda
|
83952cb85c
|
add the FindATL cmake module
|
2014-08-13 09:22:07 -07:00 |
|
Stephen Birarda
|
1ee58b7bd0
|
find the ATL library on windows for LibOVR
|
2014-08-13 09:19:45 -07:00 |
|
Stephen Birarda
|
acda466c76
|
add atls as requirement for LibOVR
|
2014-08-13 09:11:46 -07:00 |
|
Andrzej Kapolka
|
9c2d4776f9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-12 18:21:23 -07:00 |
|
Andrzej Kapolka
|
21d6c3c48a
|
More work on edge rejiggery.
|
2014-08-12 18:21:04 -07:00 |
|
Stephen Birarda
|
4dce4c4919
|
link to ws2_32.lib if LibOVR is being linked to
|
2014-08-12 15:23:12 -07:00 |
|
Stephen Birarda
|
4bf7bbe0df
|
if enable VR mode is re-checked then attempt to re-connect to Oculus
|
2014-08-12 15:20:04 -07:00 |
|
Stephen Birarda
|
ac4d20bb43
|
repairs to FindLibOVR for OS X new structure
|
2014-08-12 14:49:30 -07:00 |
|
Stephen Birarda
|
00087e81d8
|
remove a line of debug that shouldn't have made its way in
|
2014-08-12 14:44:49 -07:00 |
|
Stephen Birarda
|
a8e17e19a4
|
resolve conflicts on merge with upstream master
|
2014-08-12 14:43:30 -07:00 |
|
Stephen Birarda
|
1b5c229dd6
|
Merge pull request #3273 from PhilipRosedale/master
Fix bug with first person camera being laggy when flying
|
2014-08-12 14:42:07 -07:00 |
|
Philip Rosedale
|
9933c011d7
|
Remove filtered eye position from head
|
2014-08-12 14:31:40 -07:00 |
|
Leonardo Murillo
|
e12cf9015f
|
Merge pull request #3271 from birarda/take-out-the-trash
allow CL specific that an optional external be required
|
2014-08-12 14:30:17 -07:00 |
|
Philip Rosedale
|
a68af15b82
|
DDE Face tracker tweaks to start adding long term averaging
|
2014-08-12 14:26:14 -07:00 |
|
Stephen Birarda
|
75aedae300
|
integration of positional tracking with DK2
|
2014-08-12 14:12:13 -07:00 |
|
Andrzej Kapolka
|
ee01d85b5e
|
Attempting to remove some number magic.
|
2014-08-12 12:01:07 -07:00 |
|
Andrzej Kapolka
|
24cc90c1db
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-12 10:57:51 -07:00 |
|
Andrzej Kapolka
|
2c0f8ff57e
|
Working on rejiggering the heightfield tiles.
|
2014-08-12 10:56:15 -07:00 |
|
Thijs Wenker
|
4ff7ff61e8
|
OSX compatibility with SDK 0.4.1
|
2014-08-12 13:25:22 +02:00 |
|
Thijs Wenker
|
87abc6b66a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-08-12 13:17:32 +02:00 |
|
Philip Rosedale
|
0e72c6a0b6
|
Merge pull request #3269 from ey6es/metavoxels
Script access for heightfield heights, ray intersection against heightfields, basic color and height brush tools.
|
2014-08-12 00:40:14 -07:00 |
|
Philip Rosedale
|
32c4039e53
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-08-12 00:21:47 -07:00 |
|
Andrzej Kapolka
|
10315f15d4
|
Simplify image loading.
|
2014-08-11 15:15:33 -07:00 |
|
Andrzej Kapolka
|
ffe87ad8c6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-11 14:32:24 -07:00 |
|
Andrzej Kapolka
|
8804fa3710
|
Switch to PNG encoding, send only the changed portion of the image for deltas.
|
2014-08-11 14:29:53 -07:00 |
|
AndrewMeadows
|
0650169c25
|
Merge pull request #3270 from chansensturm/audio-filter
Added support for biquad, parametric, and multi-band filter eq
|
2014-08-11 12:22:40 -07:00 |
|
Craig Hansen-Sturm
|
3d95f28fb9
|
added apache licensing/removed implicit double<->float conversions/addressed style guide issues
|
2014-08-11 11:51:49 -07:00 |
|
Stephen Birarda
|
26c0345d1d
|
Merge pull request #3272 from birarda/cf-fix
include CoreFoundation for defaultAudioDeviceForMode
|
2014-08-11 09:58:47 -07:00 |
|
Stephen Birarda
|
cadfaab770
|
fix order now that I know my ABCs
|
2014-08-11 09:58:21 -07:00 |
|
Stephen Birarda
|
2469d958d6
|
include CoreFoundation for Audio.cpp defaultAudioDeviceForMode
|
2014-08-11 09:57:13 -07:00 |
|
Stephen Birarda
|
405e79fe6d
|
allow command line specification that an external be required
|
2014-08-11 09:51:36 -07:00 |
|
AndrewMeadows
|
e5c2a099b8
|
Merge pull request #3268 from birarda/take-out-the-trash
cmake (in)sanity
|
2014-08-11 09:15:38 -07:00 |
|
Craig Hansen-Sturm
|
481108ecd1
|
added support for biquad, parametric, and multi-band filter eq
|
2014-08-10 22:47:27 -07:00 |
|
Stephen Birarda
|
b09cc55d6f
|
add QTKit to frameworks required for Visage
|
2014-08-08 15:01:47 -07:00 |
|
Stephen Birarda
|
36a3bc40d6
|
add AppKit to required Visage libraries
|
2014-08-08 14:44:37 -07:00 |
|
AndrewMeadows
|
9d48522dd9
|
Merge pull request #3267 from birarda/avatar-ghosting
fix for avatar ghosting on parsing of avatar with last session uuid
|
2014-08-08 14:37:17 -07:00 |
|
Andrzej Kapolka
|
18256a657e
|
Removed unused uniform.
|
2014-08-08 14:25:02 -07:00 |
|
Andrzej Kapolka
|
b7910cfe74
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-08 14:20:38 -07:00 |
|
Andrzej Kapolka
|
468a3d4d67
|
Bump up the packet version.
|
2014-08-08 14:18:32 -07:00 |
|
Stephen Birarda
|
2f6ff36d22
|
fix list of args for visage find module
|
2014-08-08 14:17:36 -07:00 |
|
Andrzej Kapolka
|
768410ca0b
|
A couple comments, let right mouse button decrease height.
|
2014-08-08 14:14:35 -07:00 |
|
Stephen Birarda
|
e638bbca3a
|
fix find package standard args call for visage
|
2014-08-08 14:10:58 -07:00 |
|