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.

Jonathan G Rennison 88670a230f Merge branch 'master' into jgrpp ... # Conflicts: # src/articulated_vehicles.cpp # src/articulated_vehicles.h # src/base_media_base.h # src/base_media_func.h # src/build_vehicle_gui.cpp # src/dock_gui.cpp # src/main_gui.cpp # src/music_gui.cpp # src/network/network_chat_gui.cpp # src/network/network_content.cpp # src/newgrf.cpp # src/newgrf_roadstop.cpp # src/os/windows/string_uniscribe.h # src/os/windows/win32.cpp # src/rail_gui.cpp # src/road.cpp # src/road_gui.cpp # src/settings.cpp # src/settings_gui.cpp # src/smallmap_gui.cpp # src/strings.cpp # src/terraform_gui.cpp # src/tests/test_script_admin.cpp # src/tests/test_window_desc.cpp # src/timer/timer_game_calendar.h # src/vehicle.cpp # src/vehicle_base.h # src/viewport.cpp # src/widget_type.h # src/window.cpp # src/window_gui.h		6 months ago
..
core	Merge branch 'master' into jgrpp	6 months ago
CMakeLists.txt	Network: Extend post-desync frame sync history	9 months ago
network.cpp	Merge branch 'master' into jgrpp	6 months ago
network.h	…
network_admin.cpp	Merge branch 'master' into jgrpp	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	6 months ago
network_client.cpp	Merge branch 'master' into jgrpp	6 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	Scheduled dispatch: Allow moving dispatch schedules in schedule list	8 months ago
network_content.cpp	Merge branch 'master' into jgrpp	6 months ago
network_content.h	Merge branch 'master' into jgrpp	6 months ago
network_content_gui.cpp	Merge branch 'master' into jgrpp	6 months ago
network_content_gui.h	Merge branch 'master' into jgrpp	6 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	6 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	6 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	Merge branch 'master' into jgrpp	6 months ago
network_survey.h	Merge branch 'master' into jgrpp	7 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	Remove: old server listing via Master Server	3 years ago