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 0b0d154788 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	.github/workflows/ci-build.yml
#	src/lang/german.txt
#	src/lang/romanian.txt
#	src/lang/slovak.txt
#	src/lang/turkish.txt
#	src/network/core/address.cpp
#	src/network/core/tcp.h
#	src/network/core/udp.cpp
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/newgrf_sl.cpp
#	src/tree_cmd.cpp
#	src/video/video_driver.hpp
#	src/window.cpp
#	src/window_gui.h
3 years ago
..
core Merge branch 'master' into jgrpp-beta 3 years ago
CMakeLists.txt Add: introduce CMake for project management 4 years ago
network.cpp Merge branch 'master' 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 Codechange: [Network] replace _realtime_tick with std::chrono 3 years ago
network_base.h Codechange: move all NetworkGameInfo related functions to a single file 3 years ago
network_chat_gui.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_client.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_client.h Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' 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 Codechange: merge duplicated logic to scroll in lists by key into a single function 3 years ago
network_content_gui.h Cleanup: Removed SVN headers 5 years ago
network_func.h Merge branch 'master' into jgrpp-beta 3 years ago
network_gamelist.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_gamelist.h Codechange: [Network] Use new/delete instead of calloc/free for NetworkGameList 3 years ago
network_gui.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_gui.h Merge branch 'master' into jgrpp-beta 3 years ago
network_internal.h Merge branch 'master' into jgrpp-beta 3 years ago
network_server.cpp Merge branch 'master' into jgrpp-beta 3 years ago
network_server.h Support sending extended game info in response to PACKET_CLIENT_GAME_INFO 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 Codechange: use connection_string in favour of NetworkAddress (#9197) 3 years ago