overte-AleziaKurdis/assignment-client/src
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
..
audio perfom packet verification on same thread as NodeList hash 2014-08-15 09:35:03 -07:00
avatars repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
entities convert IDs to UUIDs 2014-08-07 17:02:11 -07:00
metavoxels Progress on threading. 2014-07-23 18:20:00 -07:00
octree more DIDNT_FIT logic improvements/fixes 2014-08-18 14:09:01 -07:00
particles added sendNackPackets() to OctreeInboundPacketProcessor 2014-06-16 09:57:05 -07:00
voxels added sendNackPackets() to OctreeInboundPacketProcessor 2014-06-16 09:57:05 -07:00
Agent.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00
Agent.h Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-31 10:34:23 -07:00
AssignmentClient.cpp make sure NetworkAccessManager singleton is on main AC thread 2014-07-03 11:34:39 -07:00
AssignmentClient.h remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 16:16:22 -07:00
AssignmentClientMonitor.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
AssignmentClientMonitor.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
AssignmentFactory.cpp more Models->Entities renaming 2014-06-26 17:01:07 -07:00
AssignmentFactory.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
AssignmentThread.cpp run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
AssignmentThread.h fix header include guards via regex 2014-04-09 12:03:17 -07:00
main.cpp Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00