Andrzej Kapolka
8863645dc9
Working on transmitting and receiving the face video.
2013-07-17 18:02:27 -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
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
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
Andrzej Kapolka
d8d9f5e315
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-15 16:54:29 -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
Andrzej Kapolka
d5abb3e6eb
Merge branch 'master' of https://github.com/worklist/hifi into pointy
2013-07-15 16:15:12 -07:00
Andrzej Kapolka
fdeb63c121
More work on face points.
2013-07-15 16:09:49 -07:00
atlante45
bf328c8532
Improved import system copying to clipboard
2013-07-15 16:07:50 -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
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
bf3c4fa1f8
Avatar resizing final commit
2013-07-15 12:04:24 -07:00
atlante45
280afed7f0
added scale in avatar packets eand slots to change it from the menu
2013-07-12 17:51:47 -07:00
atlante45
35c00c739c
resizing avatar now handle the camera
2013-07-12 14:53:51 -07:00
atlante45
16647e3591
Resolve conflict
2013-07-12 13:27:46 -07:00
Jeffrey Ventrella
c348c5ec35
Merge remote-tracking branch 'upstream/master' into particles
2013-07-12 12:12:25 -07:00
Jeffrey Ventrella
106d7c225a
turned on particle system viewing for pull request
2013-07-12 12:11:51 -07:00
Philip Rosedale
4e9530f946
Body slowly turns to follow touch look
2013-07-11 22:31:31 -07:00
Philip Rosedale
4e89c679b9
Oculus will work with touch look (hopefully)
2013-07-11 21:51:13 -07:00
Philip Rosedale
6609a850eb
Gyros and touch look now work at same time
2013-07-11 21:34:42 -07:00
ZappoMan
c26e39764a
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-11 13:50:33 -07:00
ZappoMan
57ce20d3ce
add support for Low Res sending while moving
2013-07-11 12:43:43 -07:00
Stephen Birarda
b201d13e31
refactor ping packet sending to push past version byte
2013-07-11 12:42:45 -07:00
Stephen Birarda
64887f2a36
Merge branch 'master' of github.com:worklist/hifi into packet-versions
2013-07-11 11:02:49 -07:00
Stephen Birarda
fcb8865d2e
resolve conflicts on merge with upstream master
2013-07-11 10:58:45 -07:00
Mark Peng
9749e5edd6
Add const var to represent magic num in eyecontact code when gyros
...
are on.
2013-07-11 10:53:38 -07:00
Mark Peng
24d32bcdc8
Fix style mistakes according to code review for eyecontact code.
2013-07-11 10:40:57 -07:00
ZappoMan
9aed3d3cc6
enable delta sending by default
2013-07-11 10:37:28 -07:00
Mark Peng
083e0e9d06
Merge remote-tracking branch 'upstream/master'
2013-07-11 10:20:41 -07:00
Mark Peng
f145a1eac4
Add condition to updateAvatar() where if another avatar's head is at
...
the center of the screen, the lookAtPosition is set to the eye level
of that avatar.
2013-07-11 10:17:45 -07:00
Stephen Birarda
211204e878
Merge remote-tracking branch 'upstream/master' into timestamps
2013-07-11 09:23:16 -07:00
Philip Rosedale
cf665e10b3
Merge pull request #644 from ZappoMan/occlusion_culling
...
Latest Revision of Occlusion Culling & Delta Sending Work - now it's always better and never worse
2013-07-11 09:05:03 -07:00
Philip Rosedale
8ea2b46264
Merge pull request #641 from ZappoMan/bug_fixes
...
Two small bug fixes
2013-07-11 07:46:57 -07:00
ZappoMan
dc70675c22
removed obsolete ResIn mode
2013-07-10 19:04:28 -07:00
Jeffrey Ventrella
6c3644a2fc
merge
2013-07-10 18:32:59 -07:00
Jeffrey Ventrella
420ecddafb
Merge remote-tracking branch 'upstream/master' into particles
2013-07-10 18:32:42 -07:00
ZappoMan
3d3eca9afa
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
2013-07-10 17:45:04 -07:00
