Stephen Birarda
c5fdfd64e7
remove extra space
2013-05-15 12:22:11 -07:00
Stephen Birarda
44b12cb593
spacing changes
2013-05-15 12:21:43 -07:00
Stephen Birarda
fb42e8df04
correct some global references in Audio.cpp
2013-05-15 12:19:40 -07:00
Stephen Birarda
e83710e45e
prepend audio packets from the mixer with a packet header
2013-05-15 12:00:04 -07:00
Stephen Birarda
ce34a8f3e0
add packet headers and agent types for audio clarity
2013-05-15 11:43:49 -07:00
Stephen Birarda
26c34bb86c
sensible initialization for Audio member variables
2013-05-15 11:29:52 -07:00
Stephen Birarda
4693082db0
refactor Audio to remove requirement of AudioData
2013-05-15 10:54:36 -07:00
birarda
6f7d2a6922
Merge pull request #314 from birarda/transmitter
...
add new packet header for V2 transmitter data
2013-05-14 16:30:55 -07:00
Stephen Birarda
aca2ce47b6
add a V2 transmitter data packet for new iOS transmitter
2013-05-14 16:29:39 -07:00
Andrzej Kapolka
8e04c17cc2
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
2013-05-14 14:44:22 -07:00
Andrzej Kapolka
e1016ad902
What matters is the active state, not the focus.
2013-05-14 14:40:18 -07:00
Andrzej Kapolka
b4ca7ca5e3
Just manually request focus.
2013-05-14 14:36:43 -07:00
Andrzej Kapolka
053c0d1ca5
Focus tweak; focus isn't returning to the GL widget after closing the color
...
dialog on OS X.
2013-05-14 14:34:36 -07:00
Andrzej Kapolka
ebc612f87a
Start out with gray, fix coloring smaller portions by (similar to deleting)
...
breaking up leaf nodes into their components.
2013-05-14 14:23:08 -07:00
ZappoMan
8dc61d89fc
Added support for "destructive" vs "non-destructive" voxel create
...
- changed VoxelTree to support destructive and non-destructive mode
- added protocol packet headers to differentiate
- added new UI to switch modes
- default mode now, non-destructive.
2013-05-14 14:19:31 -07:00
Andrzej Kapolka
4eced82cf4
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2013-05-14 13:51:27 -07:00
Andrzej Kapolka
9033152401
Color selection for painting.
2013-05-14 13:49:24 -07:00
ZappoMan
43e190fe3c
switched Want Delta menu to use new Qt menus
2013-05-14 12:19:23 -07:00
Andrzej Kapolka
174fdb8109
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/main.cpp
2013-05-14 11:32:43 -07:00
Andrzej Kapolka
60e8971eb9
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/main.cpp
2013-05-14 11:29:08 -07:00
ZappoMan
63510aa30b
Merge pull request #301 from PhilipRosedale/master
...
Improved stability of invensense for drift
2013-05-14 11:27:01 -07:00
Andrzej Kapolka
537686d541
Allow changing the edit voxel size using the mouse wheel.
2013-05-14 11:06:03 -07:00
Philip Rosedale
d386221620
Merge pull request #297 from Ventrella/master
...
added code to allow mouse hover over avatar to be used for touch effects
2013-05-14 11:04:59 -07:00
Andrzej Kapolka
a5e7fdeacd
Accidentally left a debug line in.
2013-05-14 10:47:21 -07:00
Andrzej Kapolka
096421347e
Missed some comments in transferring from main.cpp to Application.h; trying to
...
preserve original formatting.
2013-05-14 10:45:54 -07:00
Andrzej Kapolka
31b94203ff
Disable the menu shortcuts for "regular" keys when the chat entry is showing.
2013-05-14 00:24:53 -07:00
Andrzej Kapolka
1e99389a4b
Various fixes, removed the bulk of main.cpp.
2013-05-13 23:15:45 -07:00
Andrzej Kapolka
75eee4bcbd
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2013-05-13 21:23:00 -07:00
Andrzej Kapolka
e0388515a4
Massive migration from GLUT/globals to Qt/class members. Mostly there.
2013-05-13 21:11:54 -07:00
Philip Rosedale
6b85d93aee
Simplified serial port init to not use baud.
2013-05-13 18:52:43 -07:00
Stephen Birarda
a3a91984d2
include stdio for sprintf
2013-05-13 18:22:55 -07:00
Stephen Birarda
2c66ec8520
include string for methods in PairingHandler
2013-05-13 18:19:19 -07:00
Stephen Birarda
a01b35f041
remove extra debugging
2013-05-13 18:16:59 -07:00
Philip Rosedale
87dfbf9f4f
Improved Invensense stability by adding average of first few samples to better eliminate DC bias/drift
2013-05-13 18:04:21 -07:00
Stephen Birarda
b6925edbe8
add a PairingHandler to send pair requests to the pairing server
2013-05-13 17:34:34 -07:00
Jeffrey Ventrella
6e3ab12411
Merge remote-tracking branch 'upstream/master'
2013-05-13 16:54:41 -07:00
Jeffrey Ventrella
54010d36c4
created transitions between camera modes
2013-05-13 16:53:45 -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
Jeffrey Ventrella
6c3de00bcd
cleaned up some code spacing
2013-05-13 14:53:05 -07:00
Jeffrey Ventrella
6f1000447b
Merge remote-tracking branch 'upstream/master'
2013-05-13 14:01:32 -07:00
Jeffrey Ventrella
3ab0fa4e8c
added code to detect mouse hovering over avatar joints for various touch effects
2013-05-13 14:00:25 -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
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
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
