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 cfebbfac8c Merge branch 'master' into jgrpp ... # Conflicts: # src/autoreplace_cmd.cpp # src/company_base.h # src/company_gui.cpp # src/cpu.cpp # src/debug.h # src/group.h # src/group_cmd.cpp # src/house.h # src/industry.h # src/newgrf_house.cpp # src/news_type.h # src/openttd.cpp # src/saveload/company_sl.cpp # src/settings_type.h # src/sl/oldloader_sl.cpp # src/story.cpp # src/table/town_land.h # src/viewport.cpp		4 months ago
..
core	Merge branch 'master' into jgrpp	4 months ago
CMakeLists.txt	Network: Extend post-desync frame sync history	10 months ago
network.cpp	Merge branch 'master' into jgrpp	4 months ago
network.h	…
network_admin.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_admin.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_base.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_chat_gui.cpp	Merge branch 'master' into jgrpp	5 months ago
network_client.cpp	Replace NetworkRandomBytesWithFallback with RandomBytesWithFallback	4 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	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_content.cpp	Merge branch 'master' into jgrpp	4 months ago
network_content.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_content_gui.cpp	Fix: TextfileWindow called virtual methods before constructor completed. (#11889)	5 months ago
network_content_gui.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_coordinator.cpp	Merge branch 'master' into jgrpp	4 months ago
network_coordinator.h	Merge branch 'master' into jgrpp	4 months ago
network_func.h	Saveload: Remove use of randombytes in company passwords storage	4 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)	10 months ago
network_gui.cpp	Fix: TextfileWindow called virtual methods before constructor completed. (#11889)	5 months ago
network_gui.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_internal.h	Replace NetworkRandomBytesWithFallback with RandomBytesWithFallback	4 months ago
network_query.cpp	Fix getting information from JGRPP servers on local LAN	5 months ago
network_query.h	Add various missing includes	12 months ago
network_server.cpp	Replace NetworkRandomBytesWithFallback with RandomBytesWithFallback	4 months ago
network_server.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_stun.cpp	Codechange: use std::shared_ptr for vector of TCPConnecters	5 months ago
network_stun.h	Merge branch 'master' into jgrpp	4 months ago
network_survey.cpp	Survey: Update to match upstream	5 months ago
network_survey.h	Merge branch 'master' into jgrpp	5 months ago
network_sync.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_turn.cpp	Codechange: use std::shared_ptr for vector of TCPConnecters	5 months ago
network_turn.h	Merge branch 'master' into jgrpp	4 months ago
network_type.h	Merge branch 'master' into jgrpp	5 months ago
network_udp.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
network_udp.h	…