Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 09:33:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6118 commits 25 branches 0 tags 1.1 GiB
Commit graph

1296 commits

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
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
Stephen Birarda
74a0b8a7b5 resolve conflicts on merge with upstream master 2013-09-17 11:50:30 -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
Stephen Birarda
17fda717fe move audio and avatar classes into assignment-client target 2013-09-17 11:04:46 -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
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
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
ZappoMan
c1e93b4bf1 first cut at making VoxelServer a class and library 2013-09-16 12:26:06 -07:00
atlante45
fe12437da9 Fixed double declaration in broadcastData 2013-09-13 16:46:48 -07:00
atlante45
8f27d22f7b Put _isFaceshiftConnected in a bit set 2013-09-13 14:57:30 -07:00
atlante45
c2502d03db Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 13:25:41 -07:00
Stephen Birarda
d66e560842 Merge pull request #934 from birarda/assignment 
simple fix to fix path for javascript save
 2013-09-13 12:20:37 -07:00
ZappoMan
bc95f94157 Merge pull request #933 from birarda/assignment 
add handling of Agent assignments to Assignment, DS, AC
 2013-09-13 11:27:36 -07:00
Stephen Birarda
5ac694224e remove extra space at the top of AudioMixer 2013-09-13 11:24:56 -07:00
atlante45
7ae1f649c9 changed packet format 2013-09-13 11:17:55 -07:00
Stephen Birarda
d089991237 add handling of Agent assignments to Assignment, DS, AC 2013-09-13 11:14:00 -07:00
LionTurtle
6f8ab7a6c6 Fix sign error in nudge code that made nudging in the negative Z 
direction buggy.
 2013-09-13 10:50:29 -07:00
atlante45
74e929100a Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 10:44:21 -07:00
ZappoMan
3441199f0b Merge pull request #930 from LionTurtle/master 
Fix for copy/cut/paste single voxel leaves.
 2013-09-13 09:18:46 -07:00
atlante45
7cd2f2b06b send faceshift data to avatar mixer 2013-09-12 17:41:26 -07:00
LionTurtle
99db8491ef Get rid of qDebug statements in VoxelTree.cpp. 2013-09-12 17:41:02 -07:00
LionTurtle
71d5f3d2d8 Fix for copy/cut/paste single voxel leaves. 2013-09-12 17:38:16 -07:00
Stephen Birarda
8d7b4ab321 add debugging for assignment send and remove a useless cast 2013-09-12 17:37:37 -07:00
Stephen Birarda
49b72370be fix UUID getter to match the private variable 2013-09-12 17:08:06 -07:00
Stephen Birarda
f878b17798 fix DS reply to node on same box to remove check in AC 2013-09-12 17:03:05 -07:00
Stephen Birarda
2578516940 talk to AC on loopback when on same node 2013-09-12 16:47:06 -07:00
Stephen Birarda
25cd800ab4 create a UUID with assignments, store JS for script 2013-09-12 16:18:53 -07:00
LionTurtle
bb1feab661 Merge remote-tracking branch 'upstream/master' 2013-09-11 16:45:29 -07:00
LionTurtle
cef4837654 Fix voxel erase bug in nudge code. Fix rendering of nudge guide. 2013-09-11 16:43:50 -07:00
Stephen Birarda
dfede2b947 rename direction to command for assignment 2013-09-11 14:43:37 -07:00
Stephen Birarda
b7aa49cf97 have DS act as AS and hand assignments directly 2013-09-11 12:16:47 -07:00
ZappoMan
befbc1b93a Merge pull request #916 from LionTurtle/master 
Nudge
 2013-09-10 11:16:12 -07:00
LionTurtle
30c8af222d Merge remote-tracking branch 'upstream/master' 2013-09-10 11:10:50 -07:00
LionTurtle
3b464094d9 Remove magic numbers, fix spacing, and other code clean up in nudge code. 2013-09-10 11:09:50 -07:00
Stephen Birarda
fb8c9dbfea fix spacing in Assignment 2013-09-10 09:58:42 -07:00
LionTurtle
f41533fee6 Add nudgeVoxel shading in grid. Fix erase bug. 2013-09-09 18:23:37 -07:00
Stephen Birarda
fa521a5dc9 handle case where AC is on same network as DS but not AS 2013-09-09 18:15:33 -07:00
Stephen Birarda
e53807ca82 store an attached local and public socket with assignment 2013-09-09 17:29:33 -07:00
LionTurtle
b0803c1267 Merge remote-tracking branch 'upstream/master' 2013-09-09 16:54:34 -07:00
LionTurtle
ac878c9c63 UI for nudge completed! 2013-09-09 16:53:31 -07:00
Stephen Birarda
97803b827e pack destination socket for assignment as tightly as possible 2013-09-09 16:45:44 -07:00