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/core
Jonathan G Rennison fdd666f66a Merge tag '14.0-beta1' into jgrpp
# Conflicts:
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/aircraft.h
#	src/animated_tile.h
#	src/base_consist.h
#	src/cargotype.h
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/engine_gui.cpp
#	src/industry_gui.cpp
#	src/lang/english.txt
#	src/music/extmidi.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_industries.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/order_type.h
#	src/os/macosx/misc_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_gui.cpp
#	src/rail_gui.h
#	src/roadveh.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/script/api/script_town.cpp
#	src/settingsgen/settingsgen.cpp
#	src/ship.h
#	src/ship_cmd.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen.h
#	src/table/settings/script_settings.ini
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_cmd.h
#	src/town_gui.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/waypoint_base.h
#	src/widget.cpp
4 months ago
..
CMakeLists.txt Merge branch 'master' into jgrpp 5 months ago
alloc_func.cpp Merge tag '14.0-beta1' into jgrpp 4 months ago
alloc_func.hpp Merge tag '14.0-beta1' into jgrpp 4 months ago
alloc_type.hpp Add std::unique_ptr<T[]> wrapper (UniqueBuffer) which also stores the size 6 months ago
arena_alloc.hpp Formatting: Fix indentation of public/private specifiers 1 year ago
backup_type.hpp Re-order various structs to reduce holes/padding 5 months ago
bitmath_func.hpp Merge branch 'master' into jgrpp 4 months ago
checksum_func.hpp Merge branch 'master' into jgrpp 5 months ago
container_func.hpp Merge branch 'master' into jgrpp 12 months ago
dyn_arena_alloc.hpp Formatting: Fix indentation of public/private specifiers 1 year ago
endian_func.hpp Merge branch 'master' into jgrpp 5 months ago
endian_type.hpp Remove: unused OTTD_ALIGNMENT define and ReadLE16(Un)aligned 5 months ago
enum_type.hpp Merge branch 'master' into jgrpp 5 months ago
format.hpp Update fmt StrongType adapter 4 months ago
geometry_func.cpp Merge branch 'master' into jgrpp 6 months ago
geometry_func.hpp Merge branch 'master' into jgrpp 5 months ago
geometry_type.hpp Merge branch 'master' into jgrpp 5 months ago
hash_func.hpp Add a simple 64 bit to 64 bit hash (from MurmurHash3) 5 months ago
kdtree.hpp Merge branch 'master' into jgrpp 7 months ago
math_func.cpp Merge branch 'master' into jgrpp 4 months ago
math_func.hpp Merge branch 'master' into jgrpp 4 months ago
mem_func.hpp Codechange: replace static inline with static for non-class functions 5 months ago
multimap.hpp Codechange: Move includes for common STL headers to stdafx. 1 year ago
overflowsafe_type.hpp Codechange: Replace old non-standard attributes with C++17/20 standard attributes. 4 months ago
pod_pool.hpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
pool_func.cpp Codechange: replace x.size() == 0 with x.empty() 8 months ago
pool_func.hpp Merge tag '14.0-beta1' into jgrpp 4 months ago
pool_type.hpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
random_func.cpp Random: Try a little bit harder in the random bytes fallback path 4 months ago
random_func.hpp Merge branch 'master' into jgrpp 4 months ago
ring_buffer.hpp ring buffer: Fix ambiguous comparison operators in C++20 5 months ago
ring_buffer_queue.hpp Ring buffer: Use as backing for std::queue uses 10 months ago
serialisation.cpp Adding of _t to (u)int types, and WChar to char32_t 5 months ago
serialisation.hpp Serialisation: Add std::span wrappers for Recv_binary, Send_binary 4 months ago
smallstack_type.hpp Add various missing includes 12 months ago
strong_typedef_type.hpp Strong typedef: Add edit_base() method to return a base reference 6 months ago
tinystring_type.hpp
y_combinator.hpp Util: Add a y-combinator template class 2 years ago