Serious-Engine/Sources/Engine/Network
Ryan C. Gordon 1a2ccb8f50 Merge github.com:Croteam-Official/Serious-Engine
Conflicts:
	Sources/Ecc/Parser.cpp
	Sources/Ecc/Scanner.cpp
	Sources/Engine/Base/Scanner.cpp
	Sources/Engine/GameAgent/GameAgent.cpp
	Sources/Engine/Graphics/Gfx_wrapper.h
	Sources/Engine/Network/Network.cpp
	Sources/Engine/Sound/SoundDecoder.h
	Sources/Engine/Templates/HashTableTemplate.cpp
	Sources/Engine/Terrain/Terrain.h
	Sources/EntitiesMP/ParticleCloudsHolder.es
	Sources/EntitiesMP/ParticleCloudsMarker.es
	Sources/SeriousSam/CDCheck.h
	Sources/SeriousSam/Menu.cpp
	Sources/SeriousSam/MenuGadgets.cpp
	Sources/SeriousSam/SeriousSam.cpp
	Sources/SeriousSam/SplashScreen.cpp
	Sources/SeriousSam/StdH.cpp
	Sources/SeriousSam/StdH.h
	Sources/Shaders/StdH.cpp
2016-04-02 23:56:12 -04:00
..
ActionBuffer.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ActionBuffer.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Buffer.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Buffer.h Add GPL header to files 2016-03-11 18:20:51 -06:00
ClientInterface.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ClientInterface.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Common.h Add GPL header to files 2016-03-11 18:20:51 -06:00
CommunicationInterface.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
CommunicationInterface.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Compression.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Compression.h Add GPL header to files 2016-03-11 18:20:51 -06:00
CPacket.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
CPacket.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Diff.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Diff.h Add GPL header to files 2016-03-11 18:20:51 -06:00
EMsgBuffer.cpp Add GPL header to files 2016-03-11 18:20:51 -06:00
EMsgBuffer.h Add GPL header to files 2016-03-11 18:20:51 -06:00
EntityHashing.cpp Add GPL header to files 2016-03-11 18:20:51 -06:00
EntityHashing.h Add GPL header to files 2016-03-11 18:20:51 -06:00
LevelChange.h Add GPL header to files 2016-03-11 18:20:51 -06:00
MessageDispatcher.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
MessageDispatcher.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Network.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Network.h Fixed SeriousSam and GameAgent bugs 2016-03-30 16:54:30 +03:00
NetworkMessage.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
NetworkMessage.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
NetworkProfile.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
NetworkProfile.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Packet.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Packet.h Add GPL header to files 2016-03-11 18:20:51 -06:00
PlayerBuffer.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
PlayerBuffer.h Add GPL header to files 2016-03-11 18:20:51 -06:00
PlayerSource.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
PlayerSource.h Add GPL header to files 2016-03-11 18:20:51 -06:00
PlayerTarget.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
PlayerTarget.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Server.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Server.h Add GPL header to files 2016-03-11 18:20:51 -06:00
SessionSocket.h Add GPL header to files 2016-03-11 18:20:51 -06:00
SessionState.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
SessionState.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00