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 88670a230f Merge branch 'master' into jgrpp ... # Conflicts: # src/articulated_vehicles.cpp # src/articulated_vehicles.h # src/base_media_base.h # src/base_media_func.h # src/build_vehicle_gui.cpp # src/dock_gui.cpp # src/main_gui.cpp # src/music_gui.cpp # src/network/network_chat_gui.cpp # src/network/network_content.cpp # src/newgrf.cpp # src/newgrf_roadstop.cpp # src/os/windows/string_uniscribe.h # src/os/windows/win32.cpp # src/rail_gui.cpp # src/road.cpp # src/road_gui.cpp # src/settings.cpp # src/settings_gui.cpp # src/smallmap_gui.cpp # src/strings.cpp # src/terraform_gui.cpp # src/tests/test_script_admin.cpp # src/tests/test_window_desc.cpp # src/timer/timer_game_calendar.h # src/vehicle.cpp # src/vehicle_base.h # src/viewport.cpp # src/widget_type.h # src/window.cpp # src/window_gui.h		6 months ago
..
8bpp_base.cpp	Merge branch 'master' into jgrpp	6 months ago
8bpp_base.hpp	Merge branch 'master' into jgrpp	6 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	Merge branch 'master' into jgrpp	6 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	Merge branch 'master' into jgrpp	6 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	Merge branch 'master' into jgrpp	6 months ago
CMakeLists.txt	Fix #9935: Use more selectivity when building SSE specific code	2 years ago
base.hpp	Merge branch 'master' into jgrpp	6 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	Merge branch 'master' into jgrpp	6 months ago