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 |
|
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 |
|
Philip Rosedale
|
743200a38c
|
Merge pull request #3220 from Atlante45/avatar_simulate_optimisation
Avatar simulate optimisation
|
2014-07-29 20:20:32 -07:00 |
|
Andrzej Kapolka
|
ff01d4b80d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-29 19:14:08 -07:00 |
|
Andrzej Kapolka
|
1ea9b0ccbc
|
Working on heightfield encoding.
|
2014-07-29 19:13:43 -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 |
|
barnold1953
|
1c6834cdd6
|
Improved the API and cleaned up the code
|
2014-07-29 17:49: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 |
|
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 |
|
wangyix
|
bcf9a3c20c
|
changed default max frames over desired in client to 20
|
2014-07-29 17:17:10 -07:00 |
|
barnold1953
|
9be9f1417a
|
Made some API changes for procedural animation
|
2014-07-29 16:51:57 -07:00 |
|
Andrew Meadows
|
67b9c185eb
|
formatting and minor tweaks to constraint strengths
|
2014-07-29 16:48:34 -07:00 |
|
Andrew Meadows
|
34628aef3b
|
separate muscle constraints from joint constraints
|
2014-07-29 16:47:54 -07:00 |
|
Stephen Birarda
|
40e08d5008
|
add voxel cost amounts to VoxelEditPacketSender
|
2014-07-29 16:39:06 -07:00 |
|
Stephen Birarda
|
5fd7a11c6b
|
rename the voxel cost settings
|
2014-07-29 16:38:07 -07:00 |
|
Andrzej Kapolka
|
436727dfdb
|
Added scale field, fixed height/color extraction.
|
2014-07-29 16:33:36 -07:00 |
|
Atlante45
|
8cd59ab5de
|
Forward declaration of RotationExtractor
|
2014-07-29 16:08:15 -07:00 |
|
Andrzej Kapolka
|
6824479762
|
Progress on rendering heightfield buffers.
|
2014-07-29 16:06:35 -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 |
|
barnold1953
|
6be62842e3
|
Added walkWheel for syncinc animation speed, plus other improvements.
|
2014-07-29 15:45:12 -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 |
|
Andrzej Kapolka
|
2a7847c5b3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-29 14:28:14 -07:00 |
|
Andrzej Kapolka
|
d04eb6261e
|
More work on heightfields.
|
2014-07-29 14:27:51 -07:00 |
|
wangyix
|
bb2adb2721
|
minor refactoring
|
2014-07-29 14:02:18 -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 |
|
Atlante45
|
f2dbaaf65c
|
Clean sitting targets when changing domain
|
2014-07-29 13:13:16 -07:00 |
|
Atlante45
|
6c21c44beb
|
Bumped up the search radius to 50
|
2014-07-29 11:52:25 -07:00 |
|
Atlante45
|
56f335bb65
|
Make sure models are in range before adding them
|
2014-07-29 11:51:24 -07:00 |
|
Stephen Birarda
|
39e6d7d31b
|
octree packet methods can take a cost
|
2014-07-29 11:40:07 -07:00 |
|
Stephen Birarda
|
85b8449e83
|
use two different signals for settings success and failure
|
2014-07-29 11:17:27 -07:00 |
|
Stephen Birarda
|
9a7267a10c
|
remove an unecessary reference to loop
|
2014-07-29 10:52:14 -07:00 |
|
Stephen Birarda
|
133e8570a3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth
|
2014-07-29 10:50:36 -07:00 |
|
wangyix
|
c709a103ad
|
minor comment change
|
2014-07-29 10:42:30 -07:00 |
|
wangyix
|
ccedb1bd20
|
forgot some code in checkBuffersBeforeFrameSend
corrected updateLastPopOutputTrailingLoudness behavior to match what the
old code did.
|
2014-07-29 10:40:01 -07:00 |
|