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
Jonathan G Rennison b7ddd486cf Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
3 years ago
..
core Merge branch 'master' into jgrpp 3 years ago
CMakeLists.txt Add: introduce CMake for project management 4 years ago
network.cpp Only use more specific texts for money sending where available 3 years ago
network.h Merge branch 'master' into jgrpp 5 years ago
network_admin.cpp Merge branch 'master' into jgrpp 3 years ago
network_admin.h Codechange: Remove std::function from Pool iteration wrapper 5 years ago
network_base.h Codechange: Replace network related FOR_ALL with range-based for loops 5 years ago
network_chat_gui.cpp Merge branch 'master' into jgrpp 3 years ago
network_client.cpp Merge branch 'master' into jgrpp 3 years ago
network_client.h Merge branch 'master' into jgrpp 5 years ago
network_command.cpp Change: move "give money" from client-list to company window 4 years ago
network_content.cpp Merge branch 'master' into jgrpp 3 years ago
network_content.h Cleanup: Removed SVN headers 5 years ago
network_content_gui.cpp Codechange: Remove min/max functions in favour of STL variants (#8502) 4 years ago
network_content_gui.h Cleanup: Removed SVN headers 5 years ago
network_func.h Merge branch 'master' into jgrpp 4 years ago
network_gamelist.cpp Codechange: Replace custom linked list for GRF texts with STL vectors and strings. 4 years ago
network_gamelist.h Cleanup: Removed SVN headers 5 years ago
network_gui.cpp Merge branch 'master' into jgrpp 3 years ago
network_gui.h Change: move "give money" from client-list to company window 4 years ago
network_internal.h Merge branch 'master' into jgrpp 5 years ago
network_server.cpp Merge branch 'master' into jgrpp 3 years ago
network_server.h Network: Use unique_ptr for packets, use deque for packet queues 4 years ago
network_type.h Merge branch 'master' into jgrpp 4 years ago
network_udp.cpp Merge branch 'master' into jgrpp 3 years ago
network_udp.h Cleanup: Removed SVN headers 5 years ago