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
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
..
core Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
CMakeLists.txt Feature: allow the use of TURN to connect client and server together 3 years ago
network.cpp Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
network.h Merge branch 'master' into jgrpp 5 years ago
network_admin.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_admin.h Merge branch 'master' into jgrpp-beta 3 years ago
network_base.h Codechange: [Network] Let NetworkClientInfo use std::string 3 years ago
network_chat_gui.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_client.cpp Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
network_client.h Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
network_command.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_content.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_content.h Merge branch 'master' into jgrpp-beta 3 years ago
network_content_gui.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_content_gui.h Merge branch 'master' into jgrpp-beta 3 years ago
network_coordinator.cpp Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
network_coordinator.h Feature: allow the use of TURN to connect client and server together 3 years ago
network_func.h Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
network_gamelist.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_gamelist.h Cleanup: remove unused optional ctor parameter for NetworkGameList 3 years ago
network_gui.cpp Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
network_gui.h Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
network_internal.h Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
network_server.cpp Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
network_server.h Merge tag '12.0-beta1' into jgrpp-beta 3 years ago
network_stun.cpp Feature: allow the use of STUN to connect client and server together 3 years ago
network_stun.h Feature: allow the use of STUN to connect client and server together 3 years ago
network_turn.cpp Feature: allow the use of TURN to connect client and server together 3 years ago
network_turn.h Feature: allow the use of TURN to connect client and server together 3 years ago
network_type.h Merge branch 'master' into jgrpp-beta 3 years ago
network_udp.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_udp.h Remove: old server listing via Master Server 3 years ago