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
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
Philip Rosedale
a0179073ae
Merge pull request #306 from ZappoMan/render_voxels_optimization
...
Added "Delta" mode
2013-05-14 12:37:23 -07:00
ZappoMan
43e190fe3c
switched Want Delta menu to use new Qt menus
2013-05-14 12:19:23 -07:00
birarda
ff6ce63a31
Merge pull request #311 from birarda/master
...
fix casing of PORTAUDIO_ROOT_DIR
2013-05-14 12:13:23 -07:00
Stephen Birarda
306d2a4b98
casing is important for UNIX
2013-05-14 12:12:36 -07:00
Andrzej Kapolka
c9b688b876
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-14 11:56:36 -07:00
birarda
6073ad3245
Merge pull request #308 from birarda/master
...
fix broken reference to LODEPNG_LIBRARY
2013-05-14 11:55:04 -07:00
Stephen Birarda
c117d62532
fix old reference to LODEPNG_LIBRARY
2013-05-14 11:54:35 -07:00
Andrzej Kapolka
c6ce992332
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-14 11:49:27 -07:00
birarda
1c2de455a0
Merge pull request #307 from birarda/master
...
refactor modules so they actually bail when things are missing
2013-05-14 11:47:28 -07:00
Stephen Birarda
241c170345
refactor find modules so they complain when things are missing
2013-05-14 11:46:19 -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
3f503e1e4d
Merge pull request #305 from birarda/master
...
link PortAudio as static lib instead of compiling as dependency
2013-05-14 11:28:23 -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
Stephen Birarda
4c9d1c19ff
link PortAudio as a static library instead of compiling as dependency
2013-05-14 11:22:34 -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
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
Philip Rosedale
f115f2a991
fixes to repair merge
2013-05-11 10:55:20 -07:00
