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/core
Jonathan G Rennison ba34ec7ade Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
5 years ago
..
address.cpp Remove: ENABLE_NETWORK switch 5 years ago
address.h Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector 5 years ago
config.h Merge branch 'save_ext' into jgrpp 5 years ago
core.cpp Remove: ENABLE_NETWORK switch 5 years ago
core.h Remove: ENABLE_NETWORK switch 5 years ago
game.h Merge branch 'master' into jgrpp 5 years ago
host.cpp Fix #7165: Missed 'Append() --> push_back()' replacement 5 years ago
host.h
os_abstraction.h Merge branch 'master' into jgrpp 5 years ago
packet.cpp Merge branch 'master' into jgrpp 5 years ago
packet.h Merge branch 'master' into jgrpp 5 years ago
tcp.cpp Merge branch 'master' into jgrpp 5 years ago
tcp.h Codechange: Use override keyword in networking classes. 5 years ago
tcp_admin.cpp Remove: ENABLE_NETWORK switch 5 years ago
tcp_admin.h Codechange: Use override keyword in networking classes. 5 years ago
tcp_connect.cpp Codechange: Removed SmallVector completely 5 years ago
tcp_content.cpp Remove: ENABLE_NETWORK switch 5 years ago
tcp_content.h Codechange: Use override keyword in networking classes. 5 years ago
tcp_game.cpp Remove: ENABLE_NETWORK switch 5 years ago
tcp_game.h Merge branch 'master' into jgrpp 5 years ago
tcp_http.cpp Merge branch 'master' into jgrpp 5 years ago
tcp_http.h Codechange: Use override keyword in networking classes. 5 years ago
tcp_listen.h Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 5 years ago
udp.cpp Merge branch 'master' into jgrpp 5 years ago
udp.h Merge branch 'master' into jgrpp 5 years ago