Philip Rosedale
c99f1646db
Merge pull request #1015 from ZappoMan/voxel_render_pipeline_improvement
...
Fixes to delete/add voxel sometimes not rendering
2013-10-03 16:08:12 -07:00
ZappoMan
608c24e258
fix build buster
2013-10-03 15:58:15 -07:00
Andrzej Kapolka
c2e3682f6e
Merge pull request #1014 from ey6es/master
...
Fix for relative texture paths.
2013-10-03 15:48:25 -07:00
Andrzej Kapolka
2fc1af8c1a
Fix for relative texture paths.
2013-10-03 15:47:43 -07:00
ZappoMan
2450d64016
Merge branch 'master' of https://github.com/worklist/hifi into voxel_render_pipeline_improvement
2013-10-03 15:09:28 -07:00
Philip Rosedale
a140f4e309
Merge pull request #1013 from ey6es/master
...
Use Faceshift mapping files (FST) when present for their transform offsets and joint/blendshape mapping. Fixed crash on meshes with no texture coordinates.
2013-10-03 14:54:11 -07:00
Andrzej Kapolka
813fa1030b
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-03 14:39:13 -07:00
Andrzej Kapolka
b2b9e1e0bf
Need to allow multiple blendshape mappings per shape index.
2013-10-03 14:35:58 -07:00
Andrzej Kapolka
cc5cc1a409
Fixed incorrect capitalization.
2013-10-03 14:16:28 -07:00
ZappoMan
1c664b311d
fixed behavior of voxel delete and some cases of voxel add in fast pipeline mode
2013-10-03 14:15:13 -07:00
Andrzej Kapolka
5756733aef
Load mapping and use it for offset, joint mappings, blendshape mappings.
2013-10-03 14:03:01 -07:00
Stephen Birarda
a36ea50154
Merge pull request #1012 from ZappoMan/voxeleditsender_improvements
...
fix sendVoxelEditMessage() to honor jurisdictions, cleanup some threadin...
2013-10-03 10:37:09 -07:00
ZappoMan
84862310d1
fix sendVoxelEditMessage() to honor jurisdictions, cleanup some threading/nonthreading behavior in PacketSender
2013-10-03 10:25:00 -07:00
Philip Rosedale
e9a21e284a
Merge pull request #1011 from ZappoMan/voxeleditsender_improvements
...
VoxelEditPacketSender class improvements
2013-10-02 21:25:10 -07:00
ZappoMan
f937170b67
fixed PR feedback
2013-10-02 21:18:35 -07:00
ZappoMan
8a439fabed
Merge pull request #1008 from PhilipRosedale/master
...
Head-driven mouse works with Faceshift
2013-10-02 21:17:43 -07:00
ZappoMan
5a356340e0
call setProcessCallIntervalHint() in JS Agent, so the non-threaded voxel sender knows how often we plan to call it
2013-10-02 20:55:38 -07:00
ZappoMan
529bcc2b4a
fix build buster
2013-10-02 20:46:49 -07:00
ZappoMan
9d231a50b6
implement support for process interval hints and handling sending only some packets per call to process in non-threaded mode
2013-10-02 20:39:58 -07:00
ZappoMan
4271fc5d41
removed debug
2013-10-02 17:01:07 -07:00
ZappoMan
f94f535254
make sure sleep is never too long
2013-10-02 17:00:46 -07:00
ZappoMan
aac6d409d2
delete voxels locally on edit to match add behavior
2013-10-02 17:00:19 -07:00
ZappoMan
90c64ab25c
more work on handleing pending packets in VoxelEditPacketSender
2013-10-02 16:33:06 -07:00
Andrzej Kapolka
db6951a9be
Merge pull request #1010 from ey6es/master
...
Fix for Faceshift head position when avatar is scaled.
2013-10-02 15:15:12 -07:00
Andrzej Kapolka
fad114d5ea
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-02 15:14:10 -07:00
Andrzej Kapolka
1994f9cc91
Missed a spot.
2013-10-02 15:10:35 -07:00
ZappoMan
4e66e4ed7c
new releaseQueuedMessages() api
2013-10-02 15:03:58 -07:00
Andrzej Kapolka
97762b21c4
Change order of transformations so that head offset is consistent with scale.
2013-10-02 15:03:33 -07:00
ZappoMan
51fa5f4f47
Merge branch 'master' of https://github.com/worklist/hifi into voxeleditsender_improvements
2013-10-02 15:02:33 -07:00
ZappoMan
cc0009976b
first cut and handling buffering of edit packets when voxel servers are unknown
2013-10-02 15:02:23 -07:00
ZappoMan
3635f448b3
Merge pull request #1009 from birarda/assignment
...
changes to assignment flow, fix for restart hold behavior
2013-10-02 15:00:45 -07:00
Philip Rosedale
eb5c48c6ac
Merge pull request #1007 from ey6es/master
...
Shared geometry/textures between instances and download/apply diffuse texture maps. Also some transform work.
2013-10-02 14:04:17 -07:00
Andrzej Kapolka
c98dec8a65
Dilate our network-downloaded textures.
2013-10-02 11:59:14 -07:00
Stephen Birarda
e8b0790b3e
updates to VoxelScriptingInterface for smarter packet sending
2013-10-02 11:42:27 -07:00
Stephen Birarda
a771a5de07
fix for restart hold behavior in domain-server
2013-10-02 10:53:54 -07:00
PhilipRosedale
26618f45f8
use clamp instead of min, max
2013-10-02 10:50:41 -07:00
PhilipRosedale
8f1ff46fa7
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-02 10:46:53 -07:00
PhilipRosedale
6d2585a732
faceshift drives head mouse, improved reticle
2013-10-02 10:46:31 -07:00
Andrzej Kapolka
d87fe204e0
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-02 10:23:43 -07:00
Andrzej Kapolka
97cbef1d59
Avoid warnings on invalid URLs, delete reply when reference is deleted.
2013-10-02 10:23:04 -07:00
ZappoMan
bac16cc5cf
Merge pull request #1006 from birarda/master
...
fix DS bug with AC talking on restart
2013-10-01 20:42:32 -07:00
Andrzej Kapolka
40a3268d7c
Fixed an OS X warning and a misplaced parenthesis.
2013-10-01 16:31:57 -07:00
Stephen Birarda
e5c5bb7552
completion of fix for requesting AC on DS restart
2013-10-01 16:15:07 -07:00
Stephen Birarda
dc3756d81c
check if there are static assignments to queue while serving request
2013-10-01 16:11:10 -07:00
PhilipRosedale
99c866dba4
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-01 16:10:30 -07:00
PhilipRosedale
7dd1a7525e
starting to add faceshift head mouse
2013-10-01 16:10:22 -07:00
Stephen Birarda
8d5146a050
Merge pull request #1005 from birarda/master
...
remove a bad comment and add extra debug
2013-10-01 16:04:17 -07:00
Stephen Birarda
74ec83d8ed
add an extra debug to track down HQ issue
2013-10-01 16:03:53 -07:00
Stephen Birarda
63d41d85de
remove a bad comment
2013-10-01 16:00:10 -07:00
Stephen Birarda
5d1091db3d
Merge pull request #1004 from birarda/master
...
debug line to track down HQ issue:
2013-10-01 15:59:24 -07:00
