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 c5b3c18bb5 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini
5 months ago
..
core Merge branch 'master' into jgrpp 5 months ago
CMakeLists.txt Network: Extend post-desync frame sync history 9 months ago
network.cpp Fix: Compilation with DEBUG_DUMP_COMMANDS enabled (#11607) 5 months ago
network.h
network_admin.cpp Strong typedef: Use strong typedefs for date, date tick, minutes types 6 months ago
network_admin.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
network_base.h Codechange: Delete date_type.h 9 months ago
network_chat_gui.cpp Merge branch 'master' into jgrpp 5 months ago
network_client.cpp Debug: De-duplicate formatting of hex dates for desync/random logging 5 months ago
network_client.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
network_command.cpp Codechange: coding style fixes 5 months ago
network_content.cpp Fix: race-conditions in GUI updates when downloading HTTP files (#11639) 5 months ago
network_content.h Fix: race-conditions in GUI updates when downloading HTTP files (#11639) 5 months ago
network_content_gui.cpp Merge branch 'master' into jgrpp 5 months ago
network_content_gui.h Merge branch 'master' into jgrpp 5 months ago
network_coordinator.cpp Merge branch 'master' into jgrpp 6 months ago
network_coordinator.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
network_func.h Merge branch 'master' into jgrpp 6 months ago
network_gamelist.cpp Codechange: make the MD5 hash/digest/checksum variables a std::array 1 year ago
network_gamelist.h Codechange: workaround CMake/Xcode duplicate file name issue (#11186) 9 months ago
network_gui.cpp Merge branch 'master' into jgrpp 5 months ago
network_gui.h Merge branch 'master' into jgrpp 6 months ago
network_internal.h Replace BytesToHexString with FormatArrayAsHex 7 months ago
network_query.cpp Merge branch 'master' into jgrpp 6 months ago
network_query.h Add various missing includes 11 months ago
network_server.cpp Merge branch 'master' into jgrpp 5 months ago
network_server.h Merge branch 'master' into jgrpp 6 months ago
network_stun.cpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
network_stun.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
network_survey.cpp Fix: race-conditions in GUI updates when downloading HTTP files (#11639) 5 months ago
network_survey.h Fix: race-conditions in GUI updates when downloading HTTP files (#11639) 5 months ago
network_sync.h Network: Extend post-desync frame sync history 9 months ago
network_turn.cpp Merge branch 'master' into jgrpp 6 months ago
network_turn.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
network_type.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
network_udp.cpp Merge branch 'master' into jgrpp 6 months ago
network_udp.h