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
