Philip Rosedale
5d6dbfbb01
Merge pull request #304 from ey6es/master
...
Changed main globals to Application private members; switched from GLUT to Qt for windowing, input, menus.
2013-05-14 12:05:43 -07:00
birarda
7902daec8a
Merge pull request #310 from birarda/master
...
conditional repairs in custom find modules
2013-05-14 12:03:21 -07:00
Stephen Birarda
9a163d2a72
conditional repairs for custom modules
2013-05-14 12:02:54 -07:00
birarda
60456b2096
Merge pull request #309 from birarda/master
...
hopefully fix the broken link to PortAudio on UNIX
2013-05-14 12:00:11 -07:00
Stephen Birarda
c3bbebee58
don't allow CMake to escape UNIX in path for PortAudio
2013-05-14 11:59:17 -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
ba0263a436
Fixed uninitialized audio loudness value
2013-05-13 19:26:46 -07:00
Philip Rosedale
6b85d93aee
Simplified serial port init to not use baud.
2013-05-13 18:52:43 -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
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
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
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
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
