Stephen Birarda
be32ffff77
merge branch assignee with upstream/master
2013-07-16 14:41:08 -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
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
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
Stephen Birarda
1b48d4f0fc
revert removal of extraneous newlines
2013-07-16 12:46:32 -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
Stephen Birarda
063094f96c
correctly break on end of qDebug message in LogDisplay
2013-07-16 12:00:14 -07:00
Stephen Birarda
51d1e6ae80
add a message handler to send messages over to LogDisplay
2013-07-16 11:50:40 -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
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
Stephen Birarda
6844490dbe
merge branch assignee with upstream/master
2013-07-16 09:17:39 -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
ZappoMan
a3009981d0
added Import Voxels to Clipboard
2013-07-15 17:54:50 -07:00
Stephen Birarda
9f9d8e59bd
don't accept voxel packet if rendering is turned off, correct boolean for kill
2013-07-15 17:12:44 -07:00
Stephen Birarda
38d8041bfb
kill local voxels when voxel rendering is turned off
2013-07-15 17:12:24 -07:00
ZappoMan
01b7f3868b
Merge pull request #672 from birarda/domain-switch
...
add an option in preferences to dynamically switch domain servers
2013-07-15 17:10:18 -07:00
ZappoMan
31875abcab
Merge branch 'master' of https://github.com/worklist/hifi into bug_fixes
2013-07-15 17:05:10 -07:00
Stephen Birarda
c27cd7ae42
couple of type squishes in NodeList
2013-07-15 16:49:36 -07:00
ZappoMan
1fb1622beb
added sleep to sendVoxelOperation() to keep from overwhelming server
2013-07-15 16:27:23 -07:00
Philip Rosedale
7075258317
Merge pull request #673 from Atlante45/better_import
...
Better import
2013-07-15 16:20:01 -07:00
Andrzej Kapolka
4f1e786392
Fix for iris rendering; was broken by scale change.
2013-07-15 16:12:23 -07:00
atlante45
bf328c8532
Improved import system copying to clipboard
2013-07-15 16:07:50 -07:00
Stephen Birarda
33ddda2558
correct reference to audio mixer sockaddr_in
2013-07-15 16:02:36 -07:00
Stephen Birarda
a204a8b872
lock the audioMixer to avoid crash when grabbing socket
2013-07-15 16:01:05 -07:00
Stephen Birarda
9fe1c7c63d
lock the voxel server when receiving data to avoid race crash
2013-07-15 15:59:31 -07:00
Stephen Birarda
6c2682833e
lock on the solo voxelServer before deleting local voxels
2013-07-15 15:53:25 -07:00
Stephen Birarda
6b83f95f9e
conditionally set a new hostname on preferences save
2013-07-15 15:46:04 -07:00
Stephen Birarda
d389dc6e3a
add method to NodeList to set domain IP to local, move mutex lock to node
2013-07-15 15:17:10 -07:00
Eric Johnston
e937f86822
Build fail fix when Leap libs are not present.
2013-07-15 14:33:09 -07:00
Eric Johnston
0239341127
updated per feedback
2013-07-15 14:27:58 -07:00
Eric Johnston
c61966ebcd
made Leap unit-conversion method public
2013-07-15 14:12:52 -07:00
Eric Johnston
86faa33f83
Added fake Leap finger generation so that Ryan and Jeffrey can work on Leap glove-code without needing a Leap sensor at all times.
2013-07-15 13:56:37 -07:00
atlante45
423a0eaac8
Fixed typo
2013-07-15 12:28:22 -07:00
atlante45
fbcacc8cf7
Few pre-review change for avatar resizing
2013-07-15 12:11:29 -07:00
atlante45
bf3c4fa1f8
Avatar resizing final commit
2013-07-15 12:04:24 -07:00
atlante45
078a47b006
Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming
2013-07-15 12:03:04 -07:00
Stephen Birarda
a851f32d3e
Merge branch 'master' of github.com:worklist/hifi into assignee
2013-07-15 09:39:22 -07:00
ZappoMan
f415f4081a
Fixed a bug in LOD boundaries
...
- changed the way we calculate whether or not to render a parent "average" voxel so
that if any of it's most distant child would not be visible, then it's used instead
of it's children
- added precalculated value for topFarLeft corner of AABox (optimization)
- changed VoxelSystem::newTreeToArrays() and VoxelTree::encodeTreeBitstreamRecursion()
to use the same help function for determining this LOD boundary behavior
- deleted old dead code in voxel-server and VoxelTree for picking which node to start
sending with, since it wasn't being used
- added VoxelNode::furthestDistanceToCamera() which tells you not the distance to the
center of the voxel, but the distance from the camera to the furthest corner relative
to the camera.
- added ViewFrustum::getFurthestPointFromCamera() which given an axis-aligned box will
tell you which vertex of the box is furthest from the camera
2013-07-15 01:32:14 -07:00
