Commit graph

9 commits

Author SHA1 Message Date
ZappoMan
95bb125e48 more voxelEctomy 2014-12-30 20:13:57 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
ZappoMan
81cc15495f rename Models to Entities, and add menu option to disable Light entities 2014-10-30 14:43:43 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
ZappoMan
3667eadff0 some various fixes 2014-07-29 13:34:08 -07:00
ZappoMan
ccc9eabd33 first cut at renaming Models to Entities 2014-06-26 16:39:52 -07:00
wangyix
d84beee3e4 VoxelPacketProcessor -> OctreePacketProcessor
added nodes bookkeeping in ReceivedPacketProcessor; added check in
sendNack() to not send NACKs to nodes that have sent packets that are
waiting in the message queue.
2014-06-10 11:05:51 -07:00
Renamed from interface/src/voxels/VoxelPacketProcessor.cpp (Browse further)