Jeffrey Ventrella
aa9783a88d
Merge remote-tracking branch 'upstream/master'
2013-05-20 11:41:45 -07:00
Jeffrey Ventrella
7f0d2e572e
some preliminary work on avatarRenderer
2013-05-20 07:38:00 -07:00
Andrzej Kapolka
dd3e8d524a
Support for eye offset position/orientation in camera/frustum.
2013-05-19 18:37:21 -07:00
Philip Rosedale
29889725ef
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-15 21:17:34 -06:00
Stephen Birarda
d78daf53e9
fix copy of Avatar object for use in Audio class
2013-05-15 17:28:27 -07:00
Philip Rosedale
2820323567
Fixes from merge
2013-05-15 13:48:55 -07:00
Andrzej Kapolka
3e57aa08c9
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-15 12:48:51 -07:00
Andrzej Kapolka
4292cd9ab3
Moved voxel options into their own menu, switched destructive flag to check
...
Qt action.
2013-05-15 12:05:32 -07:00
Andrzej Kapolka
0ce9e42085
Support dragging when in coloring mode. I tried it in add/delete mode, too,
...
but it felt messy.
2013-05-15 11:48:23 -07:00
Andrzej Kapolka
6317404249
When in add mode and there's no voxel under the cursor, place the mouse voxel
...
a fixed distance away.
2013-05-15 11:21:34 -07:00
Stephen Birarda
4693082db0
refactor Audio to remove requirement of AudioData
2013-05-15 10:54:36 -07:00
Andrzej Kapolka
b05140ee51
Turned the voxel edit commands into menu options for better visibility.
2013-05-15 10:40:41 -07:00
Philip Rosedale
73c793c0a1
Added optional millisecond onscreen frame timer for easier latency timing with high-speed camera
2013-05-15 09:37:36 -07:00
Philip Rosedale
62a97f23bf
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-14 15:11:04 -07:00
Philip Rosedale
b30f7b02bd
Removed mouse shift prototype.
2013-05-14 15:10:44 -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
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
537686d541
Allow changing the edit voxel size using the mouse wheel.
2013-05-14 11:06:03 -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
Stephen Birarda
b6925edbe8
add a PairingHandler to send pair requests to the pairing server
2013-05-13 17:34:34 -07:00
Andrzej Kapolka
5a113fd546
Added a stub for a Qt application class that creates a menu (which, since it's
...
unparented, will only appear on OS X) with a test item connected to a slot.
2013-05-10 12:07:47 -07:00
