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
..
CMakeLists.txt	Add: use https:// for content-service connections (#10448)	1 year ago
address.cpp	Merge branch 'master' into jgrpp	11 months ago
address.h	Merge branch 'master' into jgrpp	11 months ago
config.cpp	Merge branch 'master' into jgrpp	11 months ago
config.h	Merge branch 'master' into jgrpp	11 months ago
core.cpp	…
core.h	Codechange: use default dtor instead of empty (#10826)	1 year ago
game_info.cpp	Merge branch 'master' into jgrpp	11 months ago
game_info.h	Codechange: Define Date/Year/Month/Day within TimerGameCalendar class	1 year ago
host.cpp	Merge branch 'master' into jgrpp	11 months ago
host.h	…
http.h	Codechange: use default dtor instead of empty (#10826)	1 year ago
http_curl.cpp	Merge branch 'master' into jgrpp	11 months ago
http_none.cpp	Codechange: replace instance of char * with std::string	1 year ago
http_winhttp.cpp	Merge branch 'master' into jgrpp	11 months ago
os_abstraction.cpp	…
os_abstraction.h	…
packet.cpp	Add a helper for sub-packet deserialisation	12 months ago
packet.h	Add a helper for sub-packet deserialisation	12 months ago
tcp.cpp	Merge branch 'master' into jgrpp	3 years ago
tcp.h	Codechange: Move includes for common STL headers to stdafx.	1 year ago
tcp_admin.cpp	Network: Fix error logging for game and admin server HandlePacket	12 months ago
tcp_admin.h	Fix: Update some network documentation to match the new command system (#10657)	1 year ago
tcp_connect.cpp	Codechange: Move includes for common STL headers to stdafx.	1 year ago
tcp_content.cpp	Merge branch 'master' into jgrpp	11 months ago
tcp_content.h	…
tcp_content_type.h	Merge branch 'master' into jgrpp	11 months ago
tcp_coordinator.cpp	Codechange: Move calendar date functions inside TimerGameCalendar (#10753)	1 year ago
tcp_coordinator.h	…
tcp_game.cpp	Network: Defer deletion of client and server game socket handler	12 months ago
tcp_game.h	Merge branch 'master' into jgrpp	11 months ago
tcp_listen.h	Merge branch 'master' into jgrpp	11 months ago
tcp_stun.cpp	…
tcp_stun.h	…
tcp_turn.cpp	Codechange: Move calendar date functions inside TimerGameCalendar (#10753)	1 year ago
tcp_turn.h	…
udp.cpp	Merge branch 'master' into jgrpp	11 months ago
udp.h	…