overte-HifiExperiments/domain-server/src
ZappoMan 027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
2014-08-08 14:26:56 -07:00
..
DomainServer.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-08 14:26:56 -07:00
DomainServer.h persist and recall domain-server web sessions from ini settings 2014-07-24 17:17:57 -07:00
DomainServerNodeData.cpp associate username with agent nodes in domain-server 2014-07-21 10:30:11 -07:00
DomainServerNodeData.h associate username with agent nodes in domain-server 2014-07-21 10:30:11 -07:00
DomainServerSettingsManager.cpp parse voxel costs to the DomainHandler object 2014-07-29 17:22:17 -07:00
DomainServerSettingsManager.h allow domain-server to serve settings publicly, fix retry in DomainHandler 2014-07-28 14:56:26 -07:00
DomainServerWebSessionData.cpp persist and recall domain-server web sessions from ini settings 2014-07-24 17:17:57 -07:00
DomainServerWebSessionData.h persist and recall domain-server web sessions from ini settings 2014-07-24 17:17:57 -07:00
main.cpp Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
PendingAssignedNodeData.cpp add pending assignment purgatory for assignees 2014-05-20 15:28:45 -07:00
PendingAssignedNodeData.h add pending assignment purgatory for assignees 2014-05-20 15:28:45 -07:00