Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6280 commits 71 branches 56 tags 1.2 GiB
Commit graph

6280 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Birarda
a238fb959f link platform appropriate dl libraries on UNIX for civetweb 2013-09-17 09:30:40 -07:00
Stephen Birarda
b2f7115aef remove document root debug 2013-09-17 09:18:46 -07:00
Stephen Birarda
9f8fb56bf4 Merge pull request #942 from ZappoMan/10_mile_domain 
make TREE_SCALE roughly 10 miles
 2013-09-17 09:17:01 -07:00
Stephen Birarda
291d34d49f lowercase civetweb library in domain-server so it isn't so loud 2013-09-17 09:16:10 -07:00
ZappoMan
d96fe7a24e added VoxelServerState.h 2013-09-16 23:36:27 -07:00
ZappoMan
4eedc6df29 make TREE_SCALE roughly 10 miles 2013-09-16 22:39:47 -07:00
ZappoMan
100eda6960 allow voxel servers in standalone mode to work with new domain server and assignment client 2013-09-16 19:56:34 -07:00
ZappoMan
92fb393e14 allow standalone voxel-server to specify port and domain, add VoxelServerType to assignment-client 2013-09-16 19:34:07 -07:00
Andrzej Kapolka
1fce6c717b Working on shipping around the complete set of blendshape coefficients. 2013-09-16 17:28:04 -07:00
ZappoMan
b484951cc2 fix build buster? 2013-09-16 16:30:46 -07:00
ZappoMan
3f4245d597 fix local mode option 2013-09-16 16:19:24 -07:00
ZappoMan
023892a4d0 command line options 2013-09-16 16:02:05 -07:00
Andrzej Kapolka
f9426cbecc Working on reading and rendering the rig from Faceshift. 2013-09-16 15:49:40 -07:00
ZappoMan
8f3de6fb5d Merge pull request #940 from birarda/assignment 
replace mongoose webserver with MIT licensed civetweb
 2013-09-16 13:11:12 -07:00
Stephen Birarda
d6e3a4f3ba reference domain-server web files relative to executable dir 2013-09-16 12:56:36 -07:00
Stephen Birarda
67389589ef replace mongoose webserver with MIT licensed civetweb 2013-09-16 12:47:38 -07:00
ZappoMan
c1e93b4bf1 first cut at making VoxelServer a class and library 2013-09-16 12:26:06 -07:00
ZappoMan
86307ea67f Merge pull request #938 from Atlante45/perlin_face 
Perlin face
 2013-09-14 16:27:47 -07:00
atlante45
2b64e4553f Hopefully the final fix to all those merges 2013-09-14 14:48:28 -07:00
atlante45
494242f363 Merge branch 'perlin_face' of https://github.com/Atlante45/hifi into perlin_face 2013-09-14 14:47:13 -07:00