Stephen Birarda
|
7d0bf5ea4c
|
Merge pull request #3235 from birarda/domain-server-auth
remove unused variable in VoxelEditPacketSender
|
2014-07-31 14:12:02 -07:00 |
|
Stephen Birarda
|
2f0f5d2c28
|
remove unused variable in VoxelEditPacketSender
|
2014-07-31 14:11:36 -07:00 |
|
Brad Hefta-Gaub
|
9c1362d7f4
|
Merge pull request #3234 from birarda/domain-server-auth
clear domain settings on NodeList reset
|
2014-07-31 14:11:11 -07:00 |
|
Stephen Birarda
|
6024b90932
|
remove extra debug line
|
2014-07-31 14:08:52 -07:00 |
|
Stephen Birarda
|
8986e62b8a
|
add distinction between hard reset and soft reset for DomainHandler
|
2014-07-31 14:08:25 -07:00 |
|
Stephen Birarda
|
adcf45583e
|
clear domain settings on NodeList reset
|
2014-07-31 14:06:43 -07:00 |
|
Andrzej Kapolka
|
53fc31353d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-31 12:06:01 -07:00 |
|
Stephen Birarda
|
3c459d8460
|
fix include of tgmath for windows
|
2014-07-31 11:12:41 -07:00 |
|
Stephen Birarda
|
e1ba076a71
|
complete redemption of signed transactions from octree server
|
2014-07-31 11:03:12 -07:00 |
|
Stephen Birarda
|
453c37f4b9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth
|
2014-07-31 10:05:40 -07:00 |
|
Stephen Birarda
|
eadae8ed1a
|
allow unauthenticated redemptions of signed transactions from octree server
|
2014-07-31 10:05:26 -07:00 |
|
Stephen Birarda
|
ce4336894a
|
actually send signed transaction from PaymentManager
|
2014-07-31 09:26:18 -07:00 |
|
Brad Hefta-Gaub
|
d4d4069f11
|
Merge pull request #3225 from birarda/master
cmake file cleanup to suppress warnings on cmake 3.0
|
2014-07-30 19:20:18 -07:00 |
|
Brad Hefta-Gaub
|
faa25af0e2
|
Merge pull request #3228 from Barnold1953/dancerScript
Procedural Animation
|
2014-07-30 19:19:10 -07:00 |
|
Andrzej Kapolka
|
f2a72aa5a9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-30 18:17:28 -07:00 |
|
Andrzej Kapolka
|
c3c2265ddd
|
Hide the unset (black) bits.
|
2014-07-30 18:14:11 -07:00 |
|
Stephen Birarda
|
ef58453fda
|
turn off verbose octree packet debug
|
2014-07-30 18:10:11 -07:00 |
|
Stephen Birarda
|
db25cd9d2c
|
call PaymentManager when an OctreeEditPacketSender needs to pay
|
2014-07-30 18:07:08 -07:00 |
|
Brad Hefta-Gaub
|
d6e6cfd585
|
Merge pull request #3216 from wangyix/inbound_audio_stream
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
|
2014-07-30 18:00:17 -07:00 |
|
Stephen Birarda
|
363cef6d8a
|
move satoshi costs to VoxelEditPacketSender
|
2014-07-30 17:33:37 -07:00 |
|
Andrzej Kapolka
|
6c15468c87
|
Fix for sizing.
|
2014-07-30 17:21:31 -07:00 |
|
Stephen Birarda
|
eba92eb517
|
have the OctreeEditPacketSender emit a signal when payment is required
|
2014-07-30 17:21:04 -07:00 |
|
wangyix
|
7281eca5a4
|
fixed inj crash; added statcDesired to MixedAudioStream
|
2014-07-30 17:20:05 -07:00 |
|
Stephen Birarda
|
04effabe48
|
Merge branch 'master' into domain-server-auth
|
2014-07-30 17:14:03 -07:00 |
|
Andrzej Kapolka
|
f356f0652b
|
Collapse nodes when they fall out of LOD.
|
2014-07-30 16:36:40 -07:00 |
|
wangyix
|
24be668d36
|
added check before pushAudioToOutput to prevent starvecount buildup
|
2014-07-30 15:47:49 -07:00 |
|
wangyix
|
daeb2a898d
|
added staticDesiredJitterBufferFrames feature; AudioMixer crashing
moved some callbacks from Application::updateAvatar() to
Application::update()
|
2014-07-30 15:35:40 -07:00 |
|
barnold1953
|
66c1aba7f7
|
Animation improvements, exposed roll/yaw head control.
|
2014-07-30 15:23:03 -07:00 |
|
Andrzej Kapolka
|
a722c4ba0a
|
Merge fix.
|
2014-07-30 15:22:45 -07:00 |
|
barnold1953
|
c4a7c2783c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dancerScript
|
2014-07-30 15:21:49 -07:00 |
|
Stephen Birarda
|
2796f71419
|
library cleanup to suppress warnings on cmake 3.0
|
2014-07-30 15:06:15 -07:00 |
|
Andrzej Kapolka
|
82e442c115
|
Working on heightfield transmission, merging.
|
2014-07-30 14:54:38 -07:00 |
|
Stephen Birarda
|
ab1be38fd5
|
reset the cost of the packet back to 0 so it doesn't keep accumulating
|
2014-07-30 14:02:46 -07:00 |
|
wangyix
|
af5eedb50e
|
fixed sequenceNumberStats sender changed msgs
|
2014-07-30 11:39:29 -07:00 |
|
wangyix
|
5b0662f1d0
|
fixed setToStarved() behavior of InboundAudioStream
|
2014-07-30 10:51:50 -07:00 |
|
wangyix
|
656131b7ee
|
made frames available avg window 2s; added missing _silentFramesDropped update
|
2014-07-30 10:24:24 -07:00 |
|
Stephen Birarda
|
7a128e5f77
|
add satoshi cost to voxel packet debug
|
2014-07-30 10:14:51 -07:00 |
|
Stephen Birarda
|
66592466ad
|
pipe satoshi cost down to queuePacketToNodes
|
2014-07-30 10:05:21 -07:00 |
|
Stephen Birarda
|
2c8808e922
|
repairs to cost calculations for voxels
|
2014-07-30 09:45:33 -07:00 |
|
Stephen Birarda
|
ff889882ce
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth
|
2014-07-30 09:24:48 -07:00 |
|
Stephen Birarda
|
f944c27caf
|
don't calculate satoshi cost if the costs are non-existent
|
2014-07-30 09:24:31 -07:00 |
|
Andrzej Kapolka
|
1ea9b0ccbc
|
Working on heightfield encoding.
|
2014-07-29 19:13:43 -07:00 |
|
wangyix
|
ecfd5c2757
|
default max frames over desired changed to 10
|
2014-07-29 17:37:59 -07:00 |
|
Andrzej Kapolka
|
496f4a184e
|
Translation, etc.
|
2014-07-29 17:36:52 -07:00 |
|
Stephen Birarda
|
6a534a6ff1
|
send along satoshi costs for voxel additions from VoxelEditPacketSender
|
2014-07-29 17:31:12 -07:00 |
|
Stephen Birarda
|
9dbe74b02f
|
parse voxel costs to the DomainHandler object
|
2014-07-29 17:22:17 -07:00 |
|
Stephen Birarda
|
40e08d5008
|
add voxel cost amounts to VoxelEditPacketSender
|
2014-07-29 16:39:06 -07:00 |
|
wangyix
|
d49970d010
|
maxFramesOverDesired added; settable from domain page and preferences
|
2014-07-29 15:57:32 -07:00 |
|
Andrzej Kapolka
|
2a7847c5b3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-29 14:28:14 -07:00 |
|
wangyix
|
bb2adb2721
|
minor refactoring
|
2014-07-29 14:02:18 -07:00 |
|