Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 02:47:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-JulianGro/domain-server/src
History
David Rowe ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
2020-04-09 16:46:27 +12:00
..
AssetsBackupHandler.cpp BUGZ-319 - Add 'Installed By' username to installed content section on 2019-07-29 16:25:51 -07:00
AssetsBackupHandler.h BUGZ-319 - Add 'Installed By' username to installed content section on 2019-07-29 16:25:51 -07:00
BackupHandler.h BUGZ-319 - Add 'Installed By' username to installed content section on 2019-07-29 16:25:51 -07:00
ContentSettingsBackupHandler.cpp BUGZ-319 - Add 'Installed By' username to installed content section on 2019-07-29 16:25:51 -07:00
ContentSettingsBackupHandler.h BUGZ-319 - Add 'Installed By' username to installed content section on 2019-07-29 16:25:51 -07:00
DomainContentBackupManager.cpp oopse 2019-07-30 11:30:23 -07:00
DomainContentBackupManager.h BUGZ-319 - Add 'Installed By' username to installed content section on 2019-07-29 16:25:51 -07:00
DomainGatekeeper.cpp log wakeup (on client and report to DS) during connection on Windows 2019-07-08 16:50:36 -07:00
DomainGatekeeper.h Log packet processing time for domain server list request packets 2019-05-24 14:52:55 -07:00
DomainMetadata.cpp There is no anon restriction - only open, hifi, acl 2019-04-25 13:53:00 -07:00
DomainMetadata.h remove open hours from domain settings 2017-02-06 10:50:59 -08:00
DomainServer.cpp Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
DomainServer.h Slight optimization; comments 2019-12-06 10:32:45 -08:00
DomainServerNodeData.cpp Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
DomainServerNodeData.h Revert "Merge pull request #15620 from highfidelity/revert-15612-domaincheckin" 2019-05-23 11:00:43 -07:00
DomainServerSettingsManager.cpp set file permissions on the config.json file for the domain server 2019-09-11 16:27:00 -07:00
DomainServerSettingsManager.h DEV-168 - add filename reporting for installed/restored backup content 2019-07-25 11:46:05 -07:00
DomainServerWebSessionData.cpp Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
DomainServerWebSessionData.h persist and recall domain-server web sessions from ini settings 2014-07-24 17:17:57 -07:00
EntitiesBackupHandler.cpp BUGZ-319 - Add 'Installed By' username to installed content section on 2019-07-29 16:25:51 -07:00
EntitiesBackupHandler.h BUGZ-319 - Add 'Installed By' username to installed content section on 2019-07-29 16:25:51 -07:00
main.cpp Add shutdown annotations for crash reporting 2019-09-30 14:54:17 -07:00
NodeConnectionData.cpp CR fixes 2019-06-24 14:58:06 -07:00
NodeConnectionData.h add OS type to connect message 2019-06-19 13:53:38 -07:00
PendingAssignedNodeData.cpp add a debug for refused connection in DomainGatekeeper 2015-08-24 14:58:25 -07:00
PendingAssignedNodeData.h de-bloat the domain-server by adding a DomainGatekeeper 2015-08-24 14:19:33 -07:00