Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
6300 commits 2 branches 0 tags 1.1 GiB
Commit graph

6300 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
06f739a623 pass voxelServerConfig from domain-server through Assignment _payload to VoxelServer 2013-09-18 07:23:37 -07:00
Stephen Birarda
b6548303d1 Merge pull request #950 from ZappoMan/multi_VS_assigments 
Make VoxelServer class run as multiple instances
 2013-09-17 17:43:33 -07:00
ZappoMan
4a821d0874 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 17:35:13 -07:00
ZappoMan
3145a543d9 fixed CR feedback 2013-09-17 17:34:47 -07:00
ZappoMan
bf2a3d6742 Merge pull request #951 from birarda/assignment 
have domain-server reject audio and avatar mixers who try to check in with bad UUID
 2013-09-17 17:32:01 -07:00
ZappoMan
1bfd23e3de CR feedback 2013-09-17 17:27:20 -07:00
Stephen Birarda
3f381eeae8 put unconfirmed AM assignments at the back of the queue 2013-09-17 17:24:22 -07:00
ZappoMan
5f9ac5c280 second constructor 2013-09-17 17:19:39 -07:00
Andrzej Kapolka
596d0ac471 Subtract the neutral position from the blendshapes. 2013-09-17 17:01:17 -07:00
ZappoMan
f75b480b0e correctly hook up VoxelSendThread in VoxelNodeData 2013-09-17 16:40:39 -07:00
Stephen Birarda
001432ec55 have domain-server reject audio and avatar mixers with bad UUID 2013-09-17 16:40:30 -07:00
Andrzej Kapolka
617b3d67cf I think we need to treat the blend shapes as offsets from neutral. 2013-09-17 16:11:07 -07:00
ZappoMan
49c4075277 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 16:00:32 -07:00
ZappoMan
2b9290a9e3 moving VoxelServer globals to member variables 2013-09-17 15:47:39 -07:00
ZappoMan
e86b4f2d8d moving VoxelServer globals to member variables 2013-09-17 15:47:29 -07:00
ZappoMan
d074a34954 Merge pull request #948 from birarda/assignment 
make assignment targets subclasses of assignment to have access to assignment data
 2013-09-17 15:46:44 -07:00
Stephen Birarda
89546f7140 repairs to temporary standalone voxel-server for assignment subclass 2013-09-17 15:38:54 -07:00
Stephen Birarda
8bb77ecc9e type squish for deployed assignment 2013-09-17 15:23:49 -07:00
Andrzej Kapolka
558d3d41a6 First attempt at blending. 2013-09-17 15:22:06 -07:00
Stephen Birarda
17a210813b repairs to subclasses of assignment 2013-09-17 15:20:34 -07:00
Stephen Birarda
d830351ed6 make the assignment targets subclasses of Assignment for access to UUID 2013-09-17 14:54:58 -07:00
ZappoMan
2388cfc8e0 first cut at making VoxelServer class run with configuration or standalone 2013-09-17 14:33:31 -07:00
ZappoMan
25d9281496 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 13:41:44 -07:00
ZappoMan
386250cff8 remove hacked payloads 2013-09-17 13:41:04 -07:00
ZappoMan
6344ae8fd3 Merge pull request #947 from birarda/master 
add API to attach payloads to assignments
 2013-09-17 13:39:48 -07:00
Stephen Birarda
fb7927d326 cleanup check for attached socket 2013-09-17 13:28:19 -07:00
Stephen Birarda
3f2dc7a28d add a getter for the number of bytes in the payload 2013-09-17 13:27:17 -07:00
Stephen Birarda
94f04a9806 add API to attach payloads to assignments 2013-09-17 13:24:25 -07:00
ZappoMan
4932c3266f moving to Assignment payload style implementation 2013-09-17 13:22:09 -07:00
ZappoMan
ad4dea129c Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 12:18:51 -07:00
ZappoMan
48a579ae49 first cut at domain server config support 2013-09-17 12:18:46 -07:00
ZappoMan
0e6dae6403 Merge pull request #946 from birarda/assignment 
improvments to assignment flow
 2013-09-17 12:17:58 -07:00
Stephen Birarda
2cfa45e4f8 allow the assignment-client to specify the type of assignment it desires 2013-09-17 12:09:10 -07:00
Stephen Birarda
74a0b8a7b5 resolve conflicts on merge with upstream master 2013-09-17 11:50:30 -07:00
Andrzej Kapolka
1afece81c5 Use quads as well as triangles, apply scale. 2013-09-17 11:49:50 -07:00
Stephen Birarda
76df707e31 add the ability to ask for multiple instances from JS page 2013-09-17 11:48:08 -07:00
Stephen Birarda
0e19d9a53a add handling for number of instances to domain-server 2013-09-17 11:19:13 -07:00
Andrzej Kapolka
b4ca66eb68 Merge branch 'master' of https://github.com/worklist/hifi into blendface 
Conflicts:
	interface/src/devices/Faceshift.cpp
 2013-09-17 11:05:11 -07:00
Stephen Birarda
17fda717fe move audio and avatar classes into assignment-client target 2013-09-17 11:04:46 -07:00
Andrzej Kapolka
00506b1a84 Merge pull request #945 from ey6es/master 
Initialization order fix, only render Perlin face for local user.
 2013-09-17 11:00:07 -07:00
Stephen Birarda
75c59c4863 add doxygen comments to VoxelScriptingInterface 2013-09-17 10:54:44 -07:00
Andrzej Kapolka
93b59648ea Merge branch 'master' of https://github.com/worklist/hifi 2013-09-17 10:51:56 -07:00
Andrzej Kapolka
262365f15f Only render the Perlin face for the local user. 2013-09-17 10:51:33 -07:00
Stephen Birarda
063896f92a Merge pull request #941 from ZappoMan/voxel_server_assignments 
Voxel Server as a Assignment Client task
 2013-09-17 10:51:31 -07:00
Stephen Birarda
a45d64a214 add ability to send a voxel in JS via VoxelScriptingInterface 2013-09-17 10:49:51 -07:00
Andrzej Kapolka
a4f79390f4 Fixed initialization order. 2013-09-17 10:25:27 -07:00
ZappoMan
c7f8bded3c Merge pull request #943 from birarda/master 
changes to DS and civetweb
 2013-09-17 10:25:05 -07:00
Stephen Birarda
df862c152b add a VoxelScriptingInterface to accept voxel addition in JS 2013-09-17 10:24:15 -07:00
Andrzej Kapolka
5a2d52b530 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-17 09:59:22 -07:00
Andrzej Kapolka
354c173c9f Disable sending coefficients for now. 2013-09-17 09:58:54 -07:00