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 ba34ec7ade Merge branch 'master' into jgrpp ... Replace build and refit, and group collapse implementations Fix template creation build and refit # Conflicts: # Makefile.bundle.in # config.lib # src/animated_tile.cpp # src/blitter/32bpp_anim.hpp # src/blitter/32bpp_base.hpp # src/blitter/8bpp_base.hpp # src/blitter/null.hpp # src/build_vehicle_gui.cpp # src/command.cpp # src/command_func.h # src/console_gui.cpp # src/core/smallstack_type.hpp # src/date.cpp # src/debug.cpp # src/genworld_gui.cpp # src/ground_vehicle.hpp # src/group_gui.cpp # src/lang/korean.txt # src/linkgraph/linkgraph_gui.h # src/main_gui.cpp # src/misc_gui.cpp # src/network/core/game.h # src/network/core/packet.cpp # src/network/core/udp.cpp # src/network/core/udp.h # src/network/network_content.cpp # src/network/network_type.h # src/network/network_udp.cpp # src/newgrf_house.h # src/openttd.cpp # src/order_cmd.cpp # src/order_gui.cpp # src/os/unix/crashlog_unix.cpp # src/os/windows/crashlog_win.cpp # src/osk_gui.cpp # src/pathfinder/opf/opf_ship.cpp # src/rail_cmd.cpp # src/rail_gui.cpp # src/saveload/saveload.cpp # src/settings.cpp # src/settings_gui.cpp # src/smallmap_gui.h # src/station_base.h # src/station_cmd.cpp # src/table/gameopt_settings.ini # src/table/newgrf_debug_data.h # src/table/settings.ini # src/timetable_gui.cpp # src/toolbar_gui.cpp # src/train_gui.cpp # src/vehicle.cpp # src/vehicle_gui.cpp # src/vehiclelist.cpp # src/viewport.cpp # src/widgets/dropdown.cpp # src/window_gui.h		5 years ago
..
8bpp_base.cpp	Codechange: [Blitter] Change DrawLine to be templated	5 years ago
8bpp_base.hpp	Merge branch 'master' into jgrpp	5 years ago
8bpp_optimized.cpp	Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch	9 years ago
8bpp_optimized.hpp	Codechange: Use override specifer for overriding member declarations	5 years ago
8bpp_simple.cpp	(svn r27837) -Fix (r26969): Black remap did nothing in 8bpp-simple blitter.	7 years ago
8bpp_simple.hpp	Codechange: Use override specifer for overriding member declarations	5 years ago
32bpp_anim.cpp	Codechange: [Blitter] Change DrawLine to be templated	5 years ago
32bpp_anim.hpp	Merge branch 'master' into jgrpp	5 years ago
32bpp_anim_sse2.cpp	Add: 32bpp SSE2 blitter palette animator (#6795)	6 years ago
32bpp_anim_sse2.hpp	Codechange: Use override specifer for overriding member declarations	5 years ago
32bpp_anim_sse4.cpp	Merge branch 'master' into jgrpp	6 years ago
32bpp_anim_sse4.hpp	Codechange: Use override specifer for overriding member declarations	5 years ago
32bpp_base.cpp	Codechange: [Blitter] Change DrawLine to be templated	5 years ago
32bpp_base.hpp	Merge branch 'master' into jgrpp	5 years ago
32bpp_optimized.cpp	Blitter: Also use sprite flags for non-SSE 32bpp sprite encoder	6 years ago
32bpp_optimized.hpp	Merge branch 'master' into jgrpp	5 years ago
32bpp_simple.cpp	(svn r26969) -Fix (r26869): black palette didn't work very well with unmasked 32bpp sprites	10 years ago
32bpp_simple.hpp	Codechange: Use override specifer for overriding member declarations	5 years ago
32bpp_sse2.cpp	(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values	10 years ago
32bpp_sse2.hpp	Merge branch 'master' into jgrpp	5 years ago
32bpp_sse4.cpp	(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values	10 years ago
32bpp_sse4.hpp	Codechange: Use override specifer for overriding member declarations	5 years ago
32bpp_sse_func.hpp	Implement a 32bpp SSE2 palette animator. This is ~4x faster than 32bpp-anim's.	9 years ago
32bpp_sse_type.h	Doc: Lots and lots of doxymentation fixes	6 years ago
32bpp_ssse3.cpp	(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values	10 years ago
32bpp_ssse3.hpp	Codechange: Use override specifer for overriding member declarations	5 years ago
base.hpp	Codechange: [Blitter] Change DrawLine to be templated	5 years ago
common.hpp	Codechange: [Blitter] Adjust line-drawing algorithm to reduce wasted off-screen work	5 years ago
factory.hpp	(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)	10 years ago
null.cpp	(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values	10 years ago
null.hpp	Merge branch 'master' into jgrpp	5 years ago