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
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
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
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
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
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
ZappoMan
1d16df175d
Merge pull request #680 from birarda/master
...
delete local voxels when render voxels is unchecked
2013-07-15 17:58:15 -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
099fa4b4b1
fixed server persistance issue
2013-07-15 16:40:00 -07:00
ZappoMan
dc0b4d3e99
Merge pull request #676 from birarda/master
...
make randIntInRange and randomColorValue inclusive on max side
2013-07-15 16:31:25 -07:00
ZappoMan
1fb1622beb
added sleep to sendVoxelOperation() to keep from overwhelming server
2013-07-15 16:27:23 -07:00
Stephen Birarda
7f6009bb4a
make randIntInRange inclusive on the max side
2013-07-15 16:25:09 -07:00
Philip Rosedale
7075258317
Merge pull request #673 from Atlante45/better_import
...
Better import
2013-07-15 16:20:01 -07:00
ZappoMan
ca06af779b
Merge pull request #675 from birarda/high-agent-IDs
...
fix the high node IDs in avatar mixer
2013-07-15 16:19:23 -07:00
Stephen Birarda
d3f40033f9
fix the node ID unpack for avatar data
2013-07-15 16:17:08 -07:00
Andrzej Kapolka
90794caf67
Merge pull request #674 from ey6es/master
...
Fix for iris rendering.
2013-07-15 16:13:33 -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
081a44dbff
only process new domain list if it comes from current DS
2013-07-15 16:05:23 -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
e3d1e5db5d
correct reference to mutex to lock in Node
2013-07-15 15:45:27 -07:00
Stephen Birarda
94b6bfccf6
update the private mutex node variable to standard
2013-07-15 15:17:53 -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
atlante45
6dcd4edfcb
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-15 14:48:57 -07:00
Stephen Birarda
e8f7d32ec5
Merge pull request #671 from machinelevel/dev4
...
Build fail fix when Leap libs are not present.
2013-07-15 14:34:08 -07:00
atlante45
98ae23a72c
Merge branch 'master' of https://github.com/worklist/hifi into master-old
2013-07-15 14:33:33 -07:00
Eric Johnston
e937f86822
Build fail fix when Leap libs are not present.
2013-07-15 14:33:09 -07:00
