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	Merge branch 'master' into jgrpp	11 months ago
alloc_func.cpp	Codechange: replace error/usererror printf variant with fmt variant and rename	1 year ago
alloc_func.hpp	Cleanup: Unused alloca definitions and includes	1 year ago
alloc_type.hpp	Merge branch 'master' into jgrpp	11 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	Fix: if vehicles only refit to cargo-slots >= 32, the default cargo was wrong. (#9744)	3 years ago
bitmath_func.hpp	Merge branch 'master' into jgrpp	1 year ago
checksum_func.hpp	Include company infrastructure totals in state checksum	2 years 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	Fix: Globally apply preprocessor directive coding style	4 years 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	Merge branch 'master' into jgrpp	11 months ago
geometry_func.cpp	Add: RectPadding type.	2 years ago
geometry_func.hpp	Merge branch 'master' into jgrpp	3 years ago
geometry_type.hpp	Merge tag '13.0-beta2' into jgrpp	2 years ago
hash_func.hpp	Add a simple 32 bit to 32 bit hash function (MurmurHash3)	2 years ago
kdtree.hpp	Change: include fmt.h C++ headers in stdafx.h	1 year ago
math_func.cpp	Add utility function for integer dynamic range extension encoding	2 years ago
math_func.hpp	Merge branch 'master' into jgrpp	1 year ago
mem_func.hpp	Cleanup: Removed SVN headers	5 years ago
multimap.hpp	Codechange: Move includes for common STL headers to stdafx.	1 year ago
overflowsafe_type.hpp	Merge branch 'master' into jgrpp	1 year ago
pod_pool.hpp	Formatting: Fix indentation of public/private specifiers	1 year ago
pool_func.cpp	Cleanup: Removed SVN headers	5 years ago
pool_func.hpp	Codechange: replace error/usererror printf variant with fmt variant and rename	1 year ago
pool_type.hpp	Merge branch 'master' into jgrpp	11 months ago
random_func.cpp	Codechange: move all date-related variables inside the timer (#10706)	1 year ago
random_func.hpp	Merge branch 'master' into jgrpp	4 years ago
serialisation.cpp	Serialisation: Adjust method names/types	12 months ago
serialisation.hpp	Serialisation: Add view/span variants of binary receive methods	12 months ago
smallstack_type.hpp	Merge branch 'master' into jgrpp	11 months ago
span_type.hpp	Add missing data() method to span	12 months ago
tinystring_type.hpp	Add TinyString: SLE_STR compatible c-string wrapper	4 years ago
y_combinator.hpp	Util: Add a y-combinator template class	2 years ago