wangyix
|
2dd78b36db
|
moved _sequenceNumber to OctreeSendThread
|
2014-05-23 09:47:08 -07:00 |
|
ZappoMan
|
2c02178802
|
Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers
Conflicts:
assignment-client/src/AssignmentClient.cpp
assignment-client/src/AssignmentClient.h
libraries/shared/src/NodeList.cpp
|
2014-04-18 14:28:54 -07:00 |
|
Stephen Birarda
|
ae4b8348a2
|
fix header include guards via regex
|
2014-04-09 12:03:17 -07:00 |
|
Stephen Birarda
|
6a51df9e38
|
initial regex replacement of headers
|
2014-04-08 17:30:36 -07:00 |
|
ZappoMan
|
7cd39d3ef0
|
add forceNodeShutdown() to handle forced shutdown of nodes in case of server shutdown
|
2014-03-31 20:53:34 -07:00 |
|
ZappoMan
|
6601a0d4e9
|
cleaning up nodeKilled()
|
2014-03-31 14:54:39 -07:00 |
|
ZappoMan
|
226274e98b
|
cleaning up SharedNodePointer usage
|
2014-03-31 14:24:08 -07:00 |
|
ZappoMan
|
0f9df4a8ee
|
clean up includes
|
2014-03-31 14:11:47 -07:00 |
|
ZappoMan
|
faa062f8ab
|
use single instance of SharedAssignmentPointer for assignment client so we actually get reference counting
|
2014-03-31 14:08:19 -07:00 |
|
ZappoMan
|
8856a609a4
|
first cut at migrating to SharedOctreeServerPointer for ref count management of OctreeServer
|
2014-03-28 09:46:23 -07:00 |
|
ZappoMan
|
9fdfa4a7a8
|
switch to using SharedNodePointer instead of UUID in octree server send thread
|
2014-03-27 02:33:32 -07:00 |
|
ZappoMan
|
3cb3cb81c4
|
fixes to voxel server crashes on client shutdown
|
2014-03-21 14:15:02 -07:00 |
|
ZappoMan
|
b4f5a6d1ce
|
add _isShuttingDown to OctreeQueryNode and bail as fast as possible when shutting down
|
2014-03-20 14:44:47 -07:00 |
|
ZappoMan
|
b3f60a068d
|
remove isScheduledForDelete from OctreeQueryNode
|
2014-03-19 00:17:14 -07:00 |
|
ZappoMan
|
86c2b5baa7
|
removed some debugging, added some comments, more work on optimizaiton
|
2014-03-18 01:51:30 -07:00 |
|
ZappoMan
|
329d3b37e0
|
add last know root timestamp property to query node
|
2014-03-18 01:07:45 -07:00 |
|
ZappoMan
|
aab2ca826f
|
Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling
|
2014-03-17 11:01:25 -07:00 |
|
ZappoMan
|
981ab7374a
|
fix crash in client shutdown, clean up some debugging, clean up Q_OBJECT
|
2014-03-17 11:01:09 -07:00 |
|
ZappoMan
|
5709a8893e
|
more unix signedness warnings
|
2014-03-15 23:19:16 -07:00 |
|
ZappoMan
|
08d89a4565
|
arg windows signedness warnings
|
2014-03-15 23:17:03 -07:00 |
|
ZappoMan
|
6f85cfdb2f
|
more warnings fixes
|
2014-03-15 23:00:03 -07:00 |
|
Stephen Birarda
|
f4fe2bb754
|
move octree-server libs to assignment-client
|
2014-02-05 16:04:23 -08:00 |
|