Commit graph

574 commits

Author SHA1 Message Date
ZappoMan
afcf6dd3e0 type squish 2013-10-15 18:28:56 -07:00
ZappoMan
6fff53a2dc next round of voxelnode size improvements 2013-10-15 14:43:51 -07:00
ZappoMan
c9b0edf345 first cut at reducing memory footprint of AABox 2013-10-15 11:29:04 -07:00
Stephen Birarda
5ca805693c reset nodeTypesOfInterest on NodeList reset 2013-10-11 17:48:54 -07:00
Stephen Birarda
0eae0f129c allow audio injection from javascript 2013-10-11 17:37:48 -07:00
Stephen Birarda
515e2d5a23 handle conflicts on merge with upstream master 2013-10-11 14:24:05 -07:00
Stephen Birarda
8be527f85d remove sleep time debug 2013-10-11 11:15:10 -07:00
Stephen Birarda
13ac5472ea fix an idiotic bug with silent node kill thread 2013-10-11 10:23:59 -07:00
Stephen Birarda
60095bcbca add debug on NodeList clear 2013-10-11 10:08:28 -07:00
Philip Rosedale
53e2486d4d Merge pull request #1045 from birarda/data-server
fix bug with constant avatar kill/adds
2013-10-10 18:05:23 -07:00
Stephen Birarda
7d68c79fd8 fix bug with constant avatar kill adds 2013-10-10 17:40:01 -07:00
Stephen Birarda
aa0a97b959 use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread 2013-10-10 16:23:22 -07:00
Philip Rosedale
3a92856386 Merge pull request #1029 from birarda/nameserver
initial revision of storing user data in data-server
2013-10-09 11:36:36 -07:00
Stephen Birarda
36a57e2a98 remove more debugging in NodeList 2013-10-09 10:42:33 -07:00
Stephen Birarda
7d69c6f211 remove extraneous debugging in NodeList 2013-10-09 10:41:33 -07:00
Stephen Birarda
6fe0b0b124 don’t have AvatarMixer ask DS for agents 2013-10-09 10:40:19 -07:00
Stephen Birarda
6bd71da84e pack the UUID with the avatar data 2013-10-08 13:31:39 -07:00
Stephen Birarda
892614470e Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-08 11:19:32 -07:00
Stephen Birarda
40dd698293 don’t have AvatarMixer ask DS for agents 2013-10-08 11:07:46 -07:00
Stephen Birarda
76cecb43cf Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-08 09:59:52 -07:00
ZappoMan
8baa863242 fixed PPS bugs in threaded version of PacketSender class 2013-10-07 17:34:41 -07:00
Stephen Birarda
5a7d21f529 add UUID helper class to get UUID string without braces 2013-10-07 10:56:23 -07:00
Stephen Birarda
13232a4c0b stubbing of mechanism to confirm packets sent to data server 2013-10-07 10:45:54 -07:00
Stephen Birarda
4cc9f29c83 initial stub of data server client code in Interface 2013-10-07 09:55:08 -07:00
ZappoMan
5f6fb3a3ae added some timing debugging 2013-10-05 00:55:34 -07:00
Stephen Birarda
f8bb2661c8 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-04 13:30:27 -07:00
Stephen Birarda
e977d28fe3 replace QVariantMap glm::vec3 setters with conversions for QScriptValue 2013-10-03 11:55:30 -07:00
ZappoMan
84862310d1 fix sendVoxelEditMessage() to honor jurisdictions, cleanup some threading/nonthreading behavior in PacketSender 2013-10-03 10:25:00 -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
f94f535254 make sure sleep is never too long 2013-10-02 17:00:46 -07:00
ZappoMan
90c64ab25c more work on handleing pending packets in VoxelEditPacketSender 2013-10-02 16:33:06 -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
Stephen Birarda
fb27e37607 have AC making create request use its own UUID 2013-09-30 14:09:46 -07:00
Stephen Birarda
32314ad540 have VS send UUID with check in for static assignment behavior 2013-09-30 13:34:22 -07:00
Stephen Birarda
38873c0693 some assignment debug cleanup 2013-09-30 13:26:31 -07:00
Stephen Birarda
0e5c5886b6 touchups to DS with static assignment file 2013-09-30 13:11:46 -07:00
Stephen Birarda
a8d55644e9 Assignment as LinkedData, add back to queue on node death 2013-09-30 11:04:42 -07:00
Stephen Birarda
ef1ff01188 resolve conflicts on merge with upstream/master 2013-09-30 10:12:54 -07:00
stojce
a0f23d409e Merging changes 2013-09-28 13:16:50 +02:00
stojce
bac228bdb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-28 12:47:47 +02:00
Stephen Birarda
db1dacbbf4 some refactoring for DS, add create assignments to file 2013-09-26 15:56:41 -07:00
Andrzej Kapolka
91999dfe1f Pupil dilation. 2013-09-26 15:48:11 -07:00
Stephen Birarda
70c5d3e349 decouple DS from main, move to C++11 2013-09-26 15:03:43 -07:00
Stephen Birarda
bed4819313 inital setup for static assignment mapped file 2013-09-24 14:41:26 -07:00
Stephen Birarda
e774419f8d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-20 17:39:03 -07:00
Stephen Birarda
6533d7fcde add method to packet sender to flush queue without sleep 2013-09-20 14:40:09 -07:00
Andrzej Kapolka
5c841616dc Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 16:37:26 -07:00
Andrzej Kapolka
a04ced633e Include the face model URL in the same packet as the avatar voxel URL. 2013-09-19 16:35:25 -07:00
Andrzej Kapolka
09fa782c61 More work on FBX reading. 2013-09-19 15:05:17 -07:00
Stephen Birarda
23e7278be5 re-use the check in packet sent to the domain-server, allow reset 2013-09-19 12:58:48 -07:00