Eric Johnston
cf38a0e837
Avatar's arm follows real or simulated Leap glove, if present.
...
This is a tiny change, and the effect is pretty good.
It's only active if there's a Leap device connected and you're using it, or else if you've used the Debug menu item to fake a Leap glove.
2013-07-16 17:02:40 -07:00
ZappoMan
bdb14fee33
cleanup
2013-07-16 16:53:15 -07:00
ZappoMan
5ee6910256
cleanup
2013-07-16 16:51:09 -07:00
ZappoMan
d54bae8e76
cleanup
2013-07-16 16:47:18 -07:00
ZappoMan
75d052b997
cleanup
2013-07-16 16:46:58 -07:00
Philip Rosedale
59810cac99
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-16 16:41:02 -07:00
Philip Rosedale
192ae63789
Colliding with ground, voxels makes interesting sounds and flashes your display
2013-07-16 16:40:50 -07:00
ZappoMan
f6619c6d05
Merge pull request #692 from birarda/master
...
Cleaner buffer flush for QDebug message handler
2013-07-16 16:09:52 -07:00
Stephen Birarda
021344fb79
link Qt to voxel-edit target now that QDebug is included in shared
2013-07-16 15:56:46 -07:00
Stephen Birarda
fa155adc8c
register the shared message handler to fix voxel-server output
2013-07-16 15:50:37 -07:00
ZappoMan
22bfe3494e
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-07-16 15:35:59 -07:00
Stephen Birarda
7cec2f5ffd
use fprintf instead of printf and flush for qDebug
2013-07-16 15:27:14 -07:00
ZappoMan
fbc59de081
latest cut at dirty bit sending
2013-07-16 15:08:09 -07:00
Stephen Birarda
1e0f3e4d1c
Merge pull request #686 from Atlante45/few_avatar_resizing_correction
...
Few avatar resizing correction
2013-07-16 14:31:27 -07:00
ZappoMan
70e54f0350
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-07-16 13:52:07 -07:00
ZappoMan
844fef3e1d
Merge pull request #685 from birarda/qdebug
...
switch to qDebug in favor of custom printLog
2013-07-16 13:51:36 -07:00
Stephen Birarda
8464a013fe
fix format string warnings in Application
2013-07-16 13:39:24 -07:00
Stephen Birarda
c78759da16
cleanup printLogs reintroduce on merge with upstream master
2013-07-16 13:37:16 -07:00
Stephen Birarda
9d62e7f187
Merge remote-tracking branch 'upstream/master' into qdebug
2013-07-16 13:34:42 -07:00
Stephen Birarda
e66c1ca552
link Qt to the shared library
2013-07-16 13:01:46 -07:00
Stephen Birarda
ce0c9e2e1a
flush stdout in case non new-line output is received
2013-07-16 12:58:16 -07:00
Stephen Birarda
16d603e203
clean up extra new lines and LogDisplay line break
2013-07-16 12:53:43 -07:00
Andrzej Kapolka
fd1671a44f
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-16 12:48:24 -07:00
Stephen Birarda
1b48d4f0fc
revert removal of extraneous newlines
2013-07-16 12:46:32 -07:00
Andrzej Kapolka
be72aab3d0
Merge pull request #687 from ey6es/master
...
Fix for sexy eyeshadow when voxels were turned off.
2013-07-16 12:34:24 -07:00
Andrzej Kapolka
e81fed2622
Calling glInterleavedArrays enables the client vertex/color array states, so
...
we need to disable them afterwards.
2013-07-16 12:31:58 -07:00
atlante45
b10c395440
Merge branch 'master' of http://github.com/worklist/hifi into few_avatar_resizing_correction
2013-07-16 12:05:11 -07:00
atlante45
f713bb961d
Adapt avatar message size to the avatars
2013-07-16 12:04:22 -07:00
atlante45
13762da7d8
Changed shortcuts to ALT+ +/-
2013-07-16 12:03:07 -07:00
ZappoMan
8626c95a20
whitespace fix
2013-07-16 12:01:09 -07:00
Stephen Birarda
063094f96c
correctly break on end of qDebug message in LogDisplay
2013-07-16 12:00:14 -07:00
ZappoMan
c12ab63dc2
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-07-16 12:00:07 -07:00
Andrzej Kapolka
905bd9b011
Track features on face, add a mode to render just key points.
2013-07-16 11:54:19 -07:00
Stephen Birarda
51d1e6ae80
add a message handler to send messages over to LogDisplay
2013-07-16 11:50:40 -07:00
ZappoMan
995507065c
Merge pull request #684 from Atlante45/scale_in_settings
...
Scale in settings
2013-07-16 11:46:43 -07:00
Stephen Birarda
89d3cfdb6f
remove now extraneous newlines after switch to QDebug
2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756
switch calls to printLog to QDebug
2013-07-16 11:07:22 -07:00
atlante45
2a62f8b4fd
Merge branch 'master' of http://github.com/worklist/hifi into scale_in_settings
2013-07-16 10:55:39 -07:00
atlante45
64ba01e23c
added scale to settings
2013-07-16 10:54:58 -07:00
Philip Rosedale
be30a27a4f
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-16 10:45:21 -07:00
Stephen Birarda
3f9865759c
Merge pull request #682 from ZappoMan/bug_fixes
...
Import Voxels and Paste Bug fixes
2013-07-16 10:11:11 -07:00
ZappoMan
440352c584
white space
2013-07-16 10:02:27 -07:00
ZappoMan
42e5440b7b
CR feedback
2013-07-16 10:00:55 -07:00
ZappoMan
7becb94357
reworking time stamps from doubles
2013-07-16 09:41:34 -07:00
ZappoMan
d71400a42a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
2013-07-16 09:36:39 -07:00
Philip Rosedale
edf031b985
improve collision sounds, difference between ground and voxels
2013-07-15 22:42:55 -07:00
Philip Rosedale
d05108e26d
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-15 19:59:26 -07:00
Philip Rosedale
d38955aa63
Merge pull request #683 from machinelevel/dev4
...
Fixed problem in idle(), causing events to stack up.
2013-07-15 19:57:53 -07:00
Eric Johnston
802abade4f
Fixed problem in idle(), causing events to stack up.
...
The problem was that idle() was set on a zero-ms timer (using idleTimer->start(0)), and the time is then self-regulated by returning early if it's not time yet.
Because of this, Qt stays perpetually in the timer servicing, instead of processing events. This causes keys and menu items to be delayed if the user drags the mouse before activating them, especially at low frame rates. It also causes very-delayed multitouch response.
The fix I've applied is to reset the idle timer after servicing the idle. I've set it to 2ms because I noticed that 1ms didn't always clear out all of the events. We can tune it to whatever we need, or even calculate it based on the time it took us to service the idle.
2013-07-15 18:16:50 -07:00
ZappoMan
e4b7ba7428
Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes
2013-07-15 17:58:45 -07:00
