Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-19 19:01:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-JulianGro/domain-server/src
History
Atlante45 2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
..
DomainServer.cpp Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 11:03:14 -08:00
DomainServer.h a simple model for persistent scripts in domain-server 2014-12-16 18:34:39 -08: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 remove an extra debug of posted settings in DSSM 2014-10-09 11:32:09 -07:00
DomainServerSettingsManager.h Made helpers private methods 2014-10-07 21:04:59 -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 move Logging to LogHandler 2014-10-28 13:59:23 -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