Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 11:57:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/assignment-client/src/octree
History
ZappoMan 3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
..
OctreeInboundPacketProcessor.cpp prune missing set before constructing nack packets; 2014-07-01 12:01:51 -07:00
OctreeInboundPacketProcessor.h prune missing set before constructing nack packets; 2014-07-01 12:01:51 -07:00
OctreeQueryNode.cpp Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 2014-07-03 14:20:40 -07:00
OctreeQueryNode.h try appendElementData() a different way 2014-06-10 10:43:50 -07:00
OctreeSendThread.cpp Revert "added code for AC to send nack packets; no locking yet" 2014-06-13 09:58:56 -07:00
OctreeSendThread.h Revert "added code for AC to send nack packets; no locking yet" 2014-06-13 09:58:56 -07:00
OctreeServer.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-04 12:01:23 -07:00
OctreeServer.h complete redemption of signed transactions from octree server 2014-07-31 11:03:12 -07:00
OctreeServerConsts.h fix header include guards via regex 2014-04-09 12:03:17 -07:00