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 ead18b2af2 Merge branch 'master' into jgrpp ... # Conflicts: # CMakeLists.txt # src/3rdparty/md5/md5.h # src/3rdparty/squirrel/squirrel/squtils.h # src/animated_tile.cpp # src/console_func.h # src/core/CMakeLists.txt # src/core/container_func.hpp # src/core/smallstack_type.hpp # src/crashlog.cpp # src/crashlog.h # src/debug.h # src/economy.cpp # src/gamelog.cpp # src/industry_gui.cpp # src/lang/catalan.txt # src/misc_gui.cpp # src/network/network_content.h # src/newgrf.cpp # src/newgrf.h # src/newgrf_config.cpp # src/newgrf_config.h # src/newgrf_gui.cpp # src/os/unix/font_unix.cpp # src/os/windows/crashlog_win.cpp # src/rail_cmd.cpp # src/saveload/animated_tile_sl.cpp # src/script/api/script_tilelist.cpp # src/settings.cpp # src/settingsgen/settingsgen.cpp # src/sl/oldloader_sl.cpp # src/station.cpp # src/station_cmd.cpp # src/stdafx.h # src/strgen/strgen.cpp # src/strgen/strgen_base.cpp # src/table/settings/gui_settings.ini # src/train_gui.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehicle_cmd.cpp # src/vehicle_gui_base.h # src/viewport_sprite_sorter.h		11 months ago
..
core	Merge branch 'master' into jgrpp	11 months ago
CMakeLists.txt	Feature: opt-in survey when exiting a game	1 year ago
network.cpp	Merge branch 'master' into jgrpp	11 months ago
network.h	…
network_admin.cpp	Merge branch 'master' into jgrpp	1 year ago
network_admin.h	Merge branch 'master' into jgrpp-beta	3 years ago
network_base.h	Codechange: Define Date/Year/Month/Day within TimerGameCalendar class	1 year ago
network_chat_gui.cpp	Merge branch 'master' into jgrpp	11 months ago
network_client.cpp	Merge branch 'master' into jgrpp	11 months ago
network_client.h	Network: Change protocol for game/rcon/settings password auth	12 months ago
network_command.cpp	Serialisation: Adjust method names/types	12 months ago
network_content.cpp	Merge branch 'master' into jgrpp	11 months ago
network_content.h	Merge branch 'master' into jgrpp	11 months ago
network_content_gui.cpp	Merge branch 'master' into jgrpp	11 months ago
network_content_gui.h	Merge tag '13.0-beta2' into jgrpp	2 years ago
network_coordinator.cpp	Merge branch 'master' into jgrpp	3 years ago
network_coordinator.h	Codechange: Move includes for common STL headers to stdafx.	1 year ago
network_func.h	Fix NetworkAddChatMessage when MAX_CHAT_MESSAGES is 0	12 months ago
network_gamelist.cpp	Codechange: make the MD5 hash/digest/checksum variables a std::array	1 year ago
network_gamelist.h	Add: [Network] Keep the refresh button in lowered state while refreshing (#9600)	3 years ago
network_gui.cpp	Merge branch 'master' into jgrpp	11 months ago
network_gui.h	Merge branch 'master' into jgrpp	11 months ago
network_internal.h	Network: Change protocol for game/rcon/settings password auth	12 months ago
network_query.cpp	Merge branch 'master' into jgrpp-beta	3 years ago
network_query.h	Merge branch 'master' into jgrpp-beta	3 years ago
network_server.cpp	Use std::all_of instead of std::count for checking if all 0	12 months ago
network_server.h	Network: Change protocol for game/rcon/settings password auth	12 months ago
network_stun.cpp	…
network_stun.h	…
network_survey.cpp	Merge branch 'master' into jgrpp	11 months ago
network_survey.h	Feature: opt-in survey when exiting a game	1 year ago
network_turn.cpp	Codechange: ensure OnConnect() always gets called with a valid socket (#9729)	3 years ago
network_turn.h	…
network_type.h	Merge branch 'master' into jgrpp-beta	3 years ago
network_udp.cpp	Merge branch 'master' into jgrpp	11 months ago
network_udp.h	…