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 |
|
Stephen Birarda
|
350c759618
|
add a method to SignedWalletTransaction to return binary message
|
2014-07-31 09:18:57 -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 |
|
Stephen Birarda
|
631977bac2
|
setup a SignedTransaction from PaymentManager
|
2014-07-30 18:15:20 -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
|
9c1dd7c4a4
|
fix call to connect in Application
|
2014-07-30 17:35:49 -07:00 |
|
Stephen Birarda
|
99daa062c0
|
trigger domainSettingsReceived slot when connected to domain
|
2014-07-30 17:35:33 -07:00 |
|
Stephen Birarda
|
363cef6d8a
|
move satoshi costs to VoxelEditPacketSender
|
2014-07-30 17:33:37 -07:00 |
|
wangyix
|
7281eca5a4
|
fixed inj crash; added statcDesired to MixedAudioStream
|
2014-07-30 17:20:05 -07:00 |
|
wangyix
|
24be668d36
|
added check before pushAudioToOutput to prevent starvecount buildup
|
2014-07-30 15:47:49 -07:00 |
|
wangyix
|
636b6d3307
|
Merge branch 'pull_mode_audio_output' into inbound_audio_stream
|
2014-07-30 15:37:18 -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 |
|
Stephen Birarda
|
2796f71419
|
library cleanup to suppress warnings on cmake 3.0
|
2014-07-30 15:06:15 -07:00 |
|
Stephen Birarda
|
6275dd68ab
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-07-30 14:15:22 -07:00 |
|
Stephen Birarda
|
4be8a92e52
|
remove explicit requirement of LibOVR source file in OculusManager
|
2014-07-30 14:15:14 -07:00 |
|
wangyix
|
a2945eaa96
|
qaudiooutput overflow check enabled by default
|
2014-07-30 12:52:35 -07:00 |
|
wangyix
|
efd4b7ad67
|
switched upstream/downstream stats; added menu item to disable injected stats
|
2014-07-30 12:04:03 -07:00 |
|
wangyix
|
81e5419287
|
added CTRL+A shortcut to display audio stats
|
2014-07-30 11:43:33 -07:00 |
|
wangyix
|
2b77a72aba
|
changed Mac downstream ringbuffer to 100 frames
|
2014-07-30 11:13:15 -07:00 |
|
wangyix
|
30c17067a1
|
moved pushAudioOutput to handleAudioInput
|
2014-07-30 11:02:10 -07:00 |
|
Philip Rosedale
|
f0b64c11bc
|
Merge pull request #3221 from lzuwei/add_cara_face_tracker
Add cara face tracker
|
2014-07-29 20:22:21 -07:00 |
|
Zu
|
1e719f1a88
|
fixed: restyled code for better readability
|
2014-07-30 10:04:20 +08:00 |
|
Zu
|
113a173577
|
fix: update code style to conform to hifi convention
|
2014-07-30 09:30:55 +08:00 |
|
Atlante45
|
9b3cdacf08
|
Removed microthreading in favor of lazy computation
|
2014-07-29 18:28:33 -07:00 |
|
Zu
|
dcd7b81426
|
Merge branch 'master' into add_cara_face_tracker
|
2014-07-30 08:45:44 +08:00 |
|
wangyix
|
ecfd5c2757
|
default max frames over desired changed to 10
|
2014-07-29 17:37:59 -07:00 |
|
wangyix
|
bcf9a3c20c
|
changed default max frames over desired in client to 20
|
2014-07-29 17:17:10 -07:00 |
|
Atlante45
|
8cd59ab5de
|
Forward declaration of RotationExtractor
|
2014-07-29 16:08:15 -07:00 |
|
Atlante45
|
42ba3ea338
|
CR lost _transformChanged
|
2014-07-29 15:59:53 -07:00 |
|
wangyix
|
d49970d010
|
maxFramesOverDesired added; settable from domain page and preferences
|
2014-07-29 15:57:32 -07:00 |
|
Atlante45
|
7800ffbf2e
|
Make _rotation extraction asynchronous by default in computeTransform
|
2014-07-29 15:55:47 -07:00 |
|
Atlante45
|
897481d557
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation
|
2014-07-29 15:39:35 -07:00 |
|
Philip Rosedale
|
fdead9802e
|
Merge pull request #3222 from Atlante45/sit_js_fix
Sit js fix
|
2014-07-29 15:26:51 -07:00 |
|
wangyix
|
71c23eac1e
|
added TimeWeightedAvg to InboundAudioStream
_maxFramesOverDesired hardcoded right now
|
2014-07-29 13:51:46 -07:00 |
|
Atlante45
|
75dfb87c8e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation
|
2014-07-29 13:47:24 -07:00 |
|
Atlante45
|
8354763e36
|
CR
|
2014-07-29 13:35:13 -07:00 |
|
Atlante45
|
0bad10b09c
|
Add isLoaded to Overlays
|
2014-07-29 13:25:42 -07:00 |
|
Atlante45
|
28d4efbad6
|
Don't display anything if overlays not loaded
|
2014-07-29 13:15:09 -07:00 |
|
Philip Rosedale
|
1ba8922f0b
|
Merge pull request #3218 from ey6es/metavoxels
Various metavoxel improvements relating to threading and VBO-based rendering.
|
2014-07-29 09:59:55 -07:00 |
|
Zu
|
4016f8ca44
|
Merge branch 'master' into add_cara_face_tracker
|
2014-07-29 12:21:40 +08:00 |
|
Zu
|
cce962fb16
|
added: smile, surprise, anger to blendshapes
fix: roll, yaw direction
added: source comments
removed: debug print outs
|
2014-07-29 11:07:04 +08:00 |
|
Brad Hefta-Gaub
|
8e1d4eb0a6
|
Merge pull request #3210 from Atlante45/add_start_stop_animation_for_scripted_avatar
Add start stop animation for scripted avatar
|
2014-07-28 19:43:58 -07:00 |
|
Atlante45
|
6183c4d97e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation
|
2014-07-28 16:51:09 -07:00 |
|
Atlante45
|
fb670275c2
|
Don't recompute unchaged transform
|
2014-07-28 16:42:16 -07:00 |
|
Andrzej Kapolka
|
cc909e2286
|
Fixed spelling error.
|
2014-07-28 16:24:49 -07:00 |
|
Andrzej Kapolka
|
3ac4bb6ddd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-28 16:24:43 -07:00 |
|