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
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
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
Philip Rosedale
eee8c3e570
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-15 16:27:51 -07:00
Philip Rosedale
26c0eb2dea
Start to add heartbeat
2013-07-15 16:27:46 -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
Philip Rosedale
f8f6b29559
Audio collision sounds are played locally as well as injected
2013-07-15 14:24:21 -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
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
tosh
ac3b95efe7
fixes sliced-away initialization (crashes program during shutdown when running without audio device)
2013-07-13 22:51:57 +02:00
Philip Rosedale
8b9e0426b2
Simple glassy collision sound
2013-07-12 21:34:48 -07:00
atlante45
34cbe317fa
Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming
...
Conflicts:
interface/src/Avatar.cpp
interface/src/Webcam.cpp
2013-07-12 17:57:20 -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
Philip Rosedale
832e81b45f
Less skeleton averaging, can see first person arms
2013-07-12 17:00: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
Stephen Birarda
5044139374
Merge pull request #662 from birarda/master
...
revert linking of STK to interface
2013-07-12 13:16:30 -07:00
ZappoMan
006929e45b
Merge pull request #660 from PhilipRosedale/master
...
Add speed brakes for better flying/walking
2013-07-12 13:15:22 -07:00
Stephen Birarda
93b122bc76
Revert "link STK to interface"
...
This reverts commit d55387f727
2013-07-12 13:12:52 -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
Stephen Birarda
d55387f727
link STK to interface
2013-07-12 11:18:15 -07:00
Philip Rosedale
e756fdbee6
Add speed brakes for better flying/walking
2013-07-12 08:28:50 -07:00
