Andrzej Kapolka
|
e99b7ea92c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
assignment-client/src/metavoxels/MetavoxelServer.cpp
interface/src/MetavoxelSystem.cpp
|
2014-01-29 13:34:19 -08:00 |
|
Stephen Birarda
|
4de270b832
|
cleanup Node types, closes #1726
|
2014-01-28 13:38:33 -08:00 |
|
Stephen Birarda
|
4103cc1cde
|
packet header changes and beginning of conversion to QByteArray
|
2014-01-28 10:36:08 -08:00 |
|
Andrzej Kapolka
|
9a892ea51a
|
Let's actually close our sessios on exit.
|
2014-01-27 17:03:35 -08:00 |
|
Andrzej Kapolka
|
1e4bfffdd8
|
Retain a shared node pointer, use the active socket. Fixed a compile warning.
|
2014-01-27 16:41:25 -08:00 |
|
Andrzej Kapolka
|
d5695395c4
|
Basic editing with delta streaming up and running.
|
2014-01-27 15:49:50 -08:00 |
|
Andrzej Kapolka
|
adc747fa93
|
Streaming fix.
|
2014-01-26 16:06:11 -08:00 |
|
Andrzej Kapolka
|
1ef6f5f7b3
|
MetavoxelDataPointer -> MetavoxelData, grid spacing as power of 2.
|
2014-01-26 13:23:10 -08:00 |
|
Andrzej Kapolka
|
7f20750e80
|
Working on sending edits.
|
2014-01-24 16:03:25 -08:00 |
|
Andrzej Kapolka
|
4414c91f1e
|
Working on streaming edits.
|
2014-01-23 18:05:04 -08:00 |
|
Andrzej Kapolka
|
a3ffb1d8a3
|
Working on performing the actual edit.
|
2014-01-22 19:17:48 -08:00 |
|
Andrzej Kapolka
|
ba8791274f
|
Remove test script for now, working on actual edits.
|
2014-01-22 15:58:41 -08:00 |
|
Andrzej Kapolka
|
bf9fc65de4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-01-20 17:40:16 -08:00 |
|
Andrzej Kapolka
|
c163b513d2
|
Working on allowing visitors to modify, as well as read, data.
|
2014-01-13 18:09:28 -08:00 |
|
Stephen Birarda
|
7d1a64ca8c
|
change NodeList container to QHash with QSharedPointer
|
2014-01-13 17:09:21 -08:00 |
|
Andrew Meadows
|
d28ed70ca9
|
merge pull request 1446
|
2014-01-10 15:55:38 -08:00 |
|
Andrzej Kapolka
|
3504cc6d5a
|
More work on deltas.
|
2014-01-06 12:01:14 -08:00 |
|
Andrzej Kapolka
|
31443e4f4e
|
Working on delta encoding.
|
2014-01-05 22:07:38 -08:00 |
|
Andrzej Kapolka
|
67ed045869
|
More work on delta streaming.
|
2014-01-03 11:10:21 -08:00 |
|
Andrzej Kapolka
|
a08afae319
|
More work on client/server communication.
|
2014-01-02 17:40:43 -08:00 |
|
Andrzej Kapolka
|
d7d8cdce44
|
init -> commonInit, streaming tweaks.
|
2013-12-31 16:19:03 -08:00 |
|
Andrzej Kapolka
|
effd00a405
|
Basic "meta type compiler" for streaming, streaming fixes and test.
|
2013-12-31 15:30:15 -08:00 |
|
Andrzej Kapolka
|
ecd9c9f41d
|
Communication between client and server.
|
2013-12-30 18:28:30 -08:00 |
|
Andrzej Kapolka
|
f70670d0a9
|
Working on sessions.
|
2013-12-30 13:39:08 -08:00 |
|