dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ead18b2af2b4cf600e95b5e959b8345e73e2a306
openttd/src/core
History
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
2023-07-02 12:02:36 +01:00
..
alloc_func.cpp
Codechange: replace error/usererror printf variant with fmt variant and rename
2023-04-25 17:55:09 +02:00
alloc_func.hpp
Cleanup: Unused alloca definitions and includes
2023-04-15 16:57:00 +01:00
alloc_type.hpp
Merge branch 'master' into jgrpp
2023-07-01 02:42:51 +01:00
arena_alloc.hpp
Formatting: Fix indentation of public/private specifiers
2023-02-28 01:44:28 +00:00
backup_type.hpp
Add mode to AutoRestoreBackup to not change backed up value
2023-02-15 22:02:23 +00:00
bitmath_func.cpp
Fix: if vehicles only refit to cargo-slots >= 32, the default cargo was wrong. (#9744)
2021-12-12 17:35:41 +01:00
bitmath_func.hpp
Merge branch 'master' into jgrpp
2023-04-12 19:34:11 +01:00
checksum_func.hpp
Include company infrastructure totals in state checksum
2022-11-13 11:53:16 +00:00
CMakeLists.txt
Merge branch 'master' into jgrpp
2023-07-02 12:02:36 +01:00
container_func.hpp
Merge branch 'master' into jgrpp
2023-07-02 12:02:36 +01:00
dyn_arena_alloc.hpp
Formatting: Fix indentation of public/private specifiers
2023-02-28 01:44:28 +00:00
endian_func.hpp
Fix: Globally apply preprocessor directive coding style
2020-07-03 09:08:46 +02:00
endian_type.hpp
Fix: Globally apply preprocessor directive coding style
2020-07-03 09:08:46 +02:00
enum_type.hpp
Merge branch 'master' into jgrpp
2023-05-26 20:08:05 +01:00
format.hpp
Merge branch 'master' into jgrpp
2023-07-02 12:02:36 +01:00
geometry_func.cpp
Add: RectPadding type.
2022-12-03 22:28:49 +00:00
geometry_func.hpp
Merge branch 'master' into jgrpp
2021-02-19 15:38:34 +00:00
geometry_type.hpp
Merge tag '13.0-beta2' into jgrpp
2022-12-04 20:43:11 +00:00
hash_func.hpp
Add a simple 32 bit to 32 bit hash function (MurmurHash3)
2022-06-13 01:08:03 +01:00
kdtree.hpp
Change: include fmt.h C++ headers in stdafx.h
2023-05-08 16:49:23 +02:00
math_func.cpp
Add utility function for integer dynamic range extension encoding
2022-09-06 22:33:39 +01:00
math_func.hpp
Merge branch 'master' into jgrpp
2023-06-03 19:16:57 +01:00
mem_func.hpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
multimap.hpp
Codechange: Move includes for common STL headers to stdafx.
2023-05-17 10:14:41 +01:00
overflowsafe_type.hpp
Merge branch 'master' into jgrpp
2023-06-03 19:16:57 +01:00
pod_pool.hpp
Formatting: Fix indentation of public/private specifiers
2023-02-28 01:44:28 +00:00
pool_func.cpp
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
pool_func.hpp
Codechange: replace error/usererror printf variant with fmt variant and rename
2023-04-25 17:55:09 +02:00
pool_type.hpp
Merge branch 'master' into jgrpp
2023-07-02 12:02:36 +01:00
random_func.cpp
Codechange: move all date-related variables inside the timer (#10706)
2023-04-24 15:56:01 +00:00
random_func.hpp
Merge branch 'master' into jgrpp
2020-07-07 17:28:19 +01:00
serialisation.cpp
Serialisation: Adjust method names/types
2023-06-14 19:39:36 +01:00
serialisation.hpp
Serialisation: Add view/span variants of binary receive methods
2023-06-15 20:56:15 +01:00
smallstack_type.hpp
Merge branch 'master' into jgrpp
2023-07-02 12:02:36 +01:00
span_type.hpp
Add missing data() method to span
2023-06-15 20:56:15 +01:00
tinystring_type.hpp
Add TinyString: SLE_STR compatible c-string wrapper
2020-05-21 23:44:34 +01:00
y_combinator.hpp
Util: Add a y-combinator template class
2022-06-01 22:34:06 +01:00