Stephen Birarda
c3bbebee58
don't allow CMake to escape UNIX in path for PortAudio
2013-05-14 11:59:17 -07:00
Stephen Birarda
c117d62532
fix old reference to LODEPNG_LIBRARY
2013-05-14 11:54:35 -07:00
Stephen Birarda
241c170345
refactor find modules so they complain when things are missing
2013-05-14 11:46:19 -07:00
Stephen Birarda
4c9d1c19ff
link PortAudio as a static library instead of compiling as dependency
2013-05-14 11:22:34 -07:00
birarda
669336a5a5
Merge pull request #303 from birarda/master
...
include stdio for broken unix build
2013-05-13 18:23:53 -07:00
Stephen Birarda
a3a91984d2
include stdio for sprintf
2013-05-13 18:22:55 -07:00
birarda
58d649de24
Merge pull request #302 from birarda/master
...
include string for broken build on unix
2013-05-13 18:20:05 -07:00
Stephen Birarda
2c66ec8520
include string for methods in PairingHandler
2013-05-13 18:19:19 -07:00
ZappoMan
46a9715dcb
Merge pull request #300 from birarda/master
...
add a PairingHandler to send pair requests from the Qt menu
2013-05-13 18:17:28 -07:00
Stephen Birarda
a01b35f041
remove extra debugging
2013-05-13 18:16:59 -07:00
Stephen Birarda
b6925edbe8
add a PairingHandler to send pair requests to the pairing server
2013-05-13 17:34:34 -07:00
ZappoMan
8689a3f352
Merge pull request #299 from birarda/master
...
refactor pairing-server to keep one device and one interface client
2013-05-13 16:37:23 -07:00
Stephen Birarda
0b9b8a14d1
couple of type squishes
2013-05-13 16:36:55 -07:00
Stephen Birarda
cc4492bad8
fix memory breakages after previous change
2013-05-13 16:29:43 -07:00
Stephen Birarda
0f9d72e2c1
keep one last PairableDevice and one last RequestingClient
2013-05-13 16:14:17 -07:00
Philip Rosedale
3c58972cfc
Merge pull request #298 from ZappoMan/render_voxels_optimization
...
Added Monochrome and "res-in" toggle support
2013-05-13 15:33:28 -07:00
ZappoMan
12a5ab6ea2
fixed comment
2013-05-13 15:06:39 -07:00
ZappoMan
b196227385
Added wantResIn and wantColor feature between client and server
...
- Updated Voxel Server to support non-res-in version of voxel distribution
- Updated agent data to allow client to send desired res-in and color state
- added menu items to client debug menu to toggle wantResIn and wantColor
2013-05-13 15:02:46 -07:00
ZappoMan
121a819bda
Merge pull request #296 from birarda/master
...
refactoring for available devices in pairing server
2013-05-13 13:20:39 -07:00
Stephen Birarda
3fdd9c5a39
some refactoring for device parsing in pairing server
2013-05-13 13:17:14 -07:00
ZappoMan
dd4303800d
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-13 13:15:02 -07:00
ZappoMan
bf37222d79
Merge pull request #295 from ey6es/master
...
Voxel deletion, bugfixes for voxel code.
2013-05-13 13:14:52 -07:00
Andrzej Kapolka
7a653741de
Don't set the renderFullVBOs flag; that's not the problem.
2013-05-13 12:30:56 -07:00
Andrzej Kapolka
57af5b11dd
Start out with voxel editing disabled; let the add/delete/color buttons toggle
...
the mode.
2013-05-13 11:27:55 -07:00
ZappoMan
0b0a46f698
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-13 10:26:50 -07:00
ZappoMan
777dd6dc53
Added PointerStack class, and implemented support for monochrome in VoxelTree
2013-05-13 09:57:36 -07:00
Andrzej Kapolka
4bbd3e2e07
Better way of coming up with a contrasting color.
2013-05-13 09:41:50 -07:00
Andrzej Kapolka
eb77f5ff83
Removed debug code, more tests for staged-for-deletion.
2013-05-12 20:36:10 -07:00
Andrzej Kapolka
be88fec7d3
Fixed the major bug, which is that non-leaves were being collapsed. Update
...
full VBO on deletion, since otherwise we don't see the update.
2013-05-12 20:08:01 -07:00
Andrzej Kapolka
4289921b7e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-11 15:39:18 -07:00
Andrzej Kapolka
9802403749
Let's do some locking to prevent simultaneous access from different threads.
2013-05-11 15:38:49 -07:00
Andrzej Kapolka
f4565b329a
lengthOfVoxelData already includes the length of the color data.
2013-05-11 15:37:06 -07:00
Jeffrey Ventrella
442632f467
fixed merge conflict
2013-05-11 11:50:19 -07:00
Jeffrey Ventrella
5c10ca5677
Merge remote-tracking branch 'upstream/master'
2013-05-11 11:48:34 -07:00
Jeffrey Ventrella
08aba4decb
fixed problem of camera shifting when application starts (made camera jump to ideal position/rotation when initialized)
2013-05-11 11:48:00 -07:00
ZappoMan
5509215f15
Merge pull request #291 from PhilipRosedale/master
...
First Person mode in render menu and 'p'
2013-05-11 11:05:49 -07:00
Philip Rosedale
f115f2a991
fixes to repair merge
2013-05-11 10:55:20 -07:00
Philip Rosedale
dec7e5921c
Merge remote-tracking branch 'upstream/master'
2013-05-11 10:49:23 -07:00
Philip Rosedale
a89b011ddf
Spacing fixes
2013-05-11 10:47:02 -07:00
Philip Rosedale
a1e9235db5
fixed per review
2013-05-11 10:41:34 -07:00
Philip Rosedale
59a681ee44
Fixes per review.
2013-05-11 10:19:57 -07:00
Jeffrey Ventrella
d7d435177d
Merge pull request #294 from ZappoMan/render_voxels_optimization
...
Optimized distanceToCamera()
2013-05-10 22:45:20 -07:00
ZappoMan
8e4c75ada0
Merge pull request #292 from Ventrella/master
...
Headotomy (made head its own class to prepare for future development)
2013-05-10 22:33:58 -07:00
Jeffrey Ventrella
ab9fa0a556
cleaned up some code
2013-05-10 22:31:51 -07:00
Jeffrey Ventrella
f1346604f4
indentation
2013-05-10 22:10:06 -07:00
Jeffrey Ventrella
1e4305d277
Merge remote-tracking branch 'upstream/master'
2013-05-10 21:58:52 -07:00
Jeffrey Ventrella
e4c84e7b74
added mouse view shift behaviors
2013-05-10 21:58:11 -07:00
Andrzej Kapolka
750843e867
More editing progress. Now there are threading issues. Joy!
2013-05-10 21:02:08 -07:00
ZappoMan
af7057619a
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-10 18:13:22 -07:00
ZappoMan
930353e658
optimized distanceToCamera() added distanceToPoint() and distanceSquaredToPoint()
2013-05-10 18:13:08 -07:00
