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 55d78a23be Merge branch 'master' into jgrpp ... # Conflicts: # src/3rdparty/squirrel/include/squirrel.h # src/blitter/32bpp_sse_func.hpp # src/bridge_map.h # src/clear_map.h # src/company_manager_face.h # src/console_func.h # src/core/bitmath_func.hpp # src/core/endian_func.hpp # src/core/random_func.hpp # src/depot_map.h # src/elrail_func.h # src/fontcache.h # src/industry_map.h # src/map_func.h # src/newgrf_spritegroup.h # src/object_map.h # src/rail.h # src/rail_map.h # src/road_func.h # src/road_map.h # src/saveload/saveload.h # src/saveload/saveload_error.hpp # src/settings_gui.cpp # src/sl/oldloader.h # src/sprite.h # src/spritecache.h # src/station_func.h # src/station_map.h # src/story_base.h # src/strings_func.h # src/tile_cmd.h # src/tile_map.h # src/tile_type.h # src/town.h # src/town_map.h # src/tree_map.h # src/tunnel_map.h # src/tunnelbridge_map.h # src/vehicle_func.h # src/viewport_func.h # src/void_map.h # src/water.h # src/water_map.h # src/widget_type.h		5 months ago
..
CMakeLists.txt	Core: Add missing strong_typedef_type.hpp	6 months ago
alloc_func.cpp	Codechange: replace error/usererror printf variant with fmt variant and rename	1 year ago
alloc_func.hpp	Merge branch 'master' into jgrpp	5 months ago
alloc_type.hpp	Add std::unique_ptr<T[]> wrapper (UniqueBuffer) which also stores the size	5 months ago
arena_alloc.hpp	Formatting: Fix indentation of public/private specifiers	1 year ago
backup_type.hpp	Add mode to AutoRestoreBackup to not change backed up value	1 year ago
bitmath_func.cpp	Use bitmath builtins for FindLastBit	10 months ago
bitmath_func.hpp	Merge branch 'master' into jgrpp	5 months ago
checksum_func.hpp	Debug: De-duplicate formatting of hex dates for desync/random logging	6 months ago
container_func.hpp	Merge branch 'master' into jgrpp	11 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	Fix: Globally apply preprocessor directive coding style	4 years ago
enum_type.hpp	Merge branch 'master' into jgrpp	1 year ago
format.hpp	Core: Add missing strong_typedef_type.hpp	6 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	6 months ago
hash_func.hpp	Add a simple 32 bit to 32 bit hash function (MurmurHash3)	2 years ago
kdtree.hpp	Merge branch 'master' into jgrpp	6 months ago
math_func.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
math_func.hpp	Merge branch 'master' into jgrpp	5 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	Merge branch 'master' into jgrpp	5 months ago
pod_pool.hpp	Formatting: Fix indentation of public/private specifiers	1 year ago
pool_func.cpp	Codechange: replace x.size() == 0 with x.empty()	8 months ago
pool_func.hpp	Fix assert ifdefs in src/core/poll_func.hpp	6 months ago
pool_type.hpp	Merge branch 'master' into jgrpp	5 months ago
random_func.cpp	Debug: De-duplicate formatting of hex dates for desync/random logging	6 months ago
random_func.hpp	Merge branch 'master' into jgrpp	5 months ago
ring_buffer.hpp	Fix narrowing conversion warning in ring_buffer.hpp	7 months ago
ring_buffer_queue.hpp	Ring buffer: Use as backing for std::queue uses	10 months ago
serialisation.cpp	Fix some unused variable warnings when asserts are disabled	7 months ago
serialisation.hpp	Serialisation: Add view/span variants of binary receive methods	12 months ago
smallstack_type.hpp	Add various missing includes	11 months ago
span_type.hpp	Merge branch 'master' into jgrpp	5 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