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 0d4d4a9cac Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/3rdparty/squirrel/squirrel/sqclosure.h
#	src/3rdparty/squirrel/squirrel/sqobject.h
#	src/3rdparty/squirrel/squirrel/sqvm.h
#	src/aircraft.h
#	src/airport_gui.cpp
#	src/blitter/32bpp_sse_func.hpp
#	src/blitter/null.hpp
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.h
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/date_gui.cpp
#	src/depot_gui.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/fios_gui.cpp
#	src/fontcache/spritefontcache.h
#	src/framerate_gui.cpp
#	src/game/game_text.cpp
#	src/gamelog.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/highscore_gui.cpp
#	src/hotkeys.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/main_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_gui.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_airport.cpp
#	src/newgrf_airport.h
#	src/newgrf_airporttiles.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_animation_base.h
#	src/newgrf_canal.cpp
#	src/newgrf_commons.h
#	src/newgrf_config.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_engine.h
#	src/newgrf_generic.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/newgrf_industries.cpp
#	src/newgrf_industries.h
#	src/newgrf_industrytiles.cpp
#	src/newgrf_industrytiles.h
#	src/newgrf_object.cpp
#	src/newgrf_object.h
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_roadtype.cpp
#	src/newgrf_roadtype.h
#	src/newgrf_spritegroup.cpp
#	src/newgrf_spritegroup.h
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/newgrf_town.cpp
#	src/newgrf_town.h
#	src/news_gui.cpp
#	src/object_gui.cpp
#	src/order_gui.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32_main.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/npf/queue.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/roadveh.h
#	src/saveload/saveload.cpp
#	src/screenshot.cpp
#	src/script/api/script_text.hpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_table.cpp
#	src/signs_cmd.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spriteloader/grf.hpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/station_map.h
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/terraform_gui.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_window.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/water_cmd.cpp
#	src/waypoint_cmd.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/rail_widget.h
#	src/widgets/terraform_widget.h
#	src/window.cpp
#	src/window_gui.h
7 months ago
..
CMakeLists.txt Ring buffer: Use as backing for std::queue uses 10 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 Sprite cache: Allow caching only required subset of sprite zoom levels 10 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 Fix 87911bdf: Fix FindLastBit for unsigned long long (uint64 on Windows) 9 months ago
checksum_func.hpp Include company infrastructure totals in state checksum 2 years 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 Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 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 Codechange: make TimerGameCalendar Date and Year types strongly typed (#10761) 10 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 Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months 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 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 7 months ago
mem_func.hpp Codechange: Use std::reverse instead of custom implementation. (#10918) 1 year ago
multimap.hpp Codechange: Move includes for common STL headers to stdafx. 1 year ago
overflowsafe_type.hpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months 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 7 months ago
random_func.cpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
random_func.hpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 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 Serialisation: Adjust method names/types 1 year ago
serialisation.hpp Serialisation: Add view/span variants of binary receive methods 1 year ago
smallstack_type.hpp Add various missing includes 12 months ago
span_type.hpp Merge branch 'master' into jgrpp 9 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