You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/src/network/core
Jonathan G Rennison faf32200cf Merge tag '12.0-beta1' into jgrpp-beta
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/build_vehicle_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/fios.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_coordinator.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/rev.cpp.in
#	src/settings_type.h
#	src/train.h
#	src/train_cmd.cpp
3 years ago
..
CMakeLists.txt Feature: allow the use of TURN to connect client and server together 3 years ago
address.cpp Merge branch 'master' into jgrpp-beta 3 years ago
address.h Merge branch 'master' into jgrpp-beta 3 years ago
config.cpp Feature: allow the use of STUN to connect client and server together 3 years ago
config.h Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
core.cpp Codechange: convert printf DEBUG statements to fmt Debug statements 3 years ago
core.h Remove: COMPANY_INFO packets and related code (#9475) 3 years ago
game_info.cpp Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
game_info.h Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
host.cpp Merge branch 'master' into jgrpp-beta 3 years ago
host.h Cleanup: Removed SVN headers 5 years ago
os_abstraction.cpp Merge branch 'master' into jgrpp-beta 3 years ago
os_abstraction.h Merge branch 'master' into jgrpp-beta 3 years ago
packet.cpp Merge branch 'jgrpp' into jgrpp-beta 3 years ago
packet.h Merge branch 'master' into jgrpp-beta 3 years ago
tcp.cpp Merge branch 'master' into jgrpp-beta 3 years ago
tcp.h Merge branch 'master' into jgrpp-beta 3 years ago
tcp_admin.cpp Merge branch 'master' into jgrpp-beta 3 years ago
tcp_admin.h Codechange: [Network] Make admin name and version std::string 3 years ago
tcp_connect.cpp Merge branch 'master' into jgrpp-beta 3 years ago
tcp_content.cpp Merge branch 'master' into jgrpp-beta 3 years ago
tcp_content.h Merge branch 'master' into jgrpp-beta 3 years ago
tcp_content_type.h Cleanup: [ContentInfo] Remove some functions that are not needed anymore 3 years ago
tcp_coordinator.cpp Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
tcp_coordinator.h Feature: allow the use of TURN to connect client and server together 3 years ago
tcp_game.cpp Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
tcp_game.h Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
tcp_http.cpp Merge branch 'master' into jgrpp-beta 3 years ago
tcp_http.h Codechange: [Network] Simplify constructing the HTTP request with fmt 3 years ago
tcp_listen.h Merge branch 'master' into jgrpp-beta 3 years ago
tcp_stun.cpp Merge branch 'master' into jgrpp-beta 3 years ago
tcp_stun.h Feature: allow the use of STUN to connect client and server together 3 years ago
tcp_turn.cpp Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
tcp_turn.h Feature: allow the use of TURN to connect client and server together 3 years ago
udp.cpp Merge branch 'master' into jgrpp-beta 3 years ago
udp.h Merge branch 'master' into jgrpp-beta 3 years ago