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 2a31095118 Merge branch 'master' into jgrpp ... # Conflicts: # regression/regression/result.txt # src/aircraft_cmd.cpp # src/airport_gui.cpp # src/articulated_vehicles.cpp # src/console_cmds.cpp # src/date_gui.cpp # src/engine.cpp # src/genworld_gui.cpp # src/gfx_layout_fallback.cpp # src/group_gui.cpp # src/hotkeys.cpp # src/network/core/tcp_connect.cpp # src/network/core/tcp_listen.h # src/newgrf.cpp # src/newgrf.h # src/newgrf_engine.cpp # src/newgrf_gui.cpp # src/newgrf_station.cpp # src/openttd.cpp # src/order_gui.cpp # src/os/macosx/osx_main.cpp # src/pathfinder/yapf/yapf_node_rail.hpp # src/rail_gui.cpp # src/saveload/afterload.cpp # src/saveload/cargopacket_sl.cpp # src/saveload/linkgraph_sl.cpp # src/saveload/station_sl.cpp # src/script/api/script_industrytype.cpp # src/settings.cpp # src/settings_gui.cpp # src/settings_table.cpp # src/settingsgen/settingsgen.cpp # src/station.cpp # src/station_cmd.cpp # src/strings.cpp # src/timer/timer_game_calendar.cpp # src/timer/timer_game_calendar.h # src/timer/timer_manager.h # src/timer/timer_window.cpp # src/timetable_cmd.cpp # src/toolbar_gui.cpp # src/town_cmd.cpp # src/town_gui.cpp # src/train_gui.cpp # src/vehicle_cmd.h # src/vehicle_gui.cpp # src/viewport.cpp # src/widgets/dropdown.cpp # src/window_func.h # src/window_gui.h		6 months ago
..
8bpp_base.cpp	Merge branch 'master' into jgrpp	6 months ago
8bpp_base.hpp	Blitter: Change some informational virtual functions to member values	9 months ago
8bpp_optimized.cpp	Sprite cache: Allow caching only required subset of sprite zoom levels	9 months ago
8bpp_optimized.hpp	Sprite: Don't allocate sprite encode space for map-mode zoom levels	9 months ago
8bpp_simple.cpp	Sprite cache: Allow caching only required subset of sprite zoom levels	9 months ago
8bpp_simple.hpp	Cleanup: Removed SVN headers	5 years ago
32bpp_anim.cpp	Fix 2f692a79: Dest ptr not advanced for BM_BLACK_REMAP in 32bpp anim blitter	9 months ago
32bpp_anim.hpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
32bpp_anim_sse2.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
32bpp_anim_sse2.hpp	Fix #9935: Use more selectivity when building SSE specific code	2 years ago
32bpp_anim_sse4.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
32bpp_anim_sse4.hpp	Sprite cache: Allow caching only required subset of sprite zoom levels	9 months ago
32bpp_base.cpp	Merge branch 'master' into jgrpp	6 months ago
32bpp_base.hpp	Blitter: Change some informational virtual functions to member values	9 months ago
32bpp_optimized.cpp	Fix 2f692a79: Dest ptr not advanced for BM_BLACK_REMAP in 32bpp optimised blitter	9 months ago
32bpp_optimized.hpp	Sprite cache: Allow caching only required subset of sprite zoom levels	9 months ago
32bpp_simple.cpp	Sprite cache: Allow caching only required subset of sprite zoom levels	9 months ago
32bpp_simple.hpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
32bpp_sse2.cpp	Sprite cache: Allow caching only required subset of sprite zoom levels	9 months ago
32bpp_sse2.hpp	Sprite cache: Allow caching only required subset of sprite zoom levels	9 months ago
32bpp_sse4.cpp	Cleanup: Removed SVN headers	5 years ago
32bpp_sse4.hpp	Fix #9935: Use more selectivity when building SSE specific code	2 years ago
32bpp_sse_func.hpp	Codechange: Silence warnings about intentionally unused parameters.	9 months ago
32bpp_sse_type.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
32bpp_ssse3.cpp	Cleanup: Removed SVN headers	5 years ago
32bpp_ssse3.hpp	Fix #9935: Use more selectivity when building SSE specific code	2 years ago
40bpp_anim.cpp	Blitter: Use 32 bit memset where available	10 months ago
40bpp_anim.hpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
CMakeLists.txt	Fix #9935: Use more selectivity when building SSE specific code	2 years ago
base.hpp	Blitter: Change some informational virtual functions to member values	9 months ago
common.hpp	Change Colour constructors to be constexpr	10 months ago
factory.hpp	Merge branch 'master' into jgrpp	6 months ago
null.cpp	Sprite cache: Allow caching only required subset of sprite zoom levels	9 months ago
null.hpp	Codechange: Silence warnings about intentionally unused parameters.	9 months ago