Jonathan G Rennison 56be293107 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp

2018-05-25 18:29:17 +01:00

..

8bpp_base.cpp

Blitter: Change DrawLine to be templated

2018-01-17 02:36:15 +00:00

8bpp_base.hpp

Blitter: Change DrawLine to be templated

2018-01-17 02:36:15 +00:00

8bpp_optimized.cpp

Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch

2015-08-05 21:24:30 +01:00

8bpp_optimized.hpp

(svn r26209) -Codechange: remove some template magic and simplify some code

2014-01-02 22:41:58 +00:00

8bpp_simple.cpp

(svn r27837) -Fix (r26969): Black remap did nothing in 8bpp-simple blitter.

2017-03-30 21:33:40 +00:00

8bpp_simple.hpp

(svn r26209) -Codechange: remove some template magic and simplify some code

2014-01-02 22:41:58 +00:00

32bpp_anim_sse2.cpp

Add: 32bpp SSE2 blitter palette animator (#6795)

2018-05-23 09:55:04 +01:00

32bpp_anim_sse2.hpp

Add: 32bpp SSE2 blitter palette animator (#6795)

2018-05-23 09:55:04 +01:00

32bpp_anim_sse4.cpp

Add: 32bpp SSE2 blitter palette animator (#6795)

2018-05-23 09:55:04 +01:00

32bpp_anim_sse4.hpp

Add: 32bpp SSE2 blitter palette animator (#6795)

2018-05-23 09:55:04 +01:00

32bpp_anim.cpp

Merge branch 'master' into jgrpp

2018-05-25 18:29:17 +01:00

32bpp_anim.hpp

Add: 32bpp SSE2 blitter palette animator (#6795)

2018-05-23 09:55:04 +01:00

32bpp_base.cpp

Merge branch 'master' into jgrpp

2018-05-25 18:29:17 +01:00

32bpp_base.hpp

Add: 32bpp SSE2 blitter palette animator (#6795)

2018-05-23 09:55:04 +01:00

32bpp_optimized.cpp

Blitter: Also use sprite flags for non-SSE 32bpp sprite encoder

2018-01-19 23:24:09 +00:00

32bpp_optimized.hpp

Blitter: Also use sprite flags for non-SSE 32bpp sprite encoder

2018-01-19 23:24:09 +00:00

32bpp_simple.cpp

(svn r26969) -Fix (r26869): black palette didn't work very well with unmasked 32bpp sprites

2014-10-06 18:45:51 +00:00

32bpp_simple.hpp

(svn r26209) -Codechange: remove some template magic and simplify some code

2014-01-02 22:41:58 +00:00

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

2014-04-23 20:13:33 +00:00

32bpp_sse2.hpp

Blitter: Also use sprite flags for non-SSE 32bpp sprite encoder

2018-01-19 23:24:09 +00:00

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

2014-04-23 20:13:33 +00:00

32bpp_sse4.hpp

(svn r26260) -Codechange: add template parameters for (non) translucent and (non) animated sprites, so the least expensive variant can be chosen (MJP)

2014-01-13 18:20:23 +00:00

32bpp_sse_func.hpp

Implement a 32bpp SSE2 palette animator. This is ~4x faster than 32bpp-anim's.

2015-12-17 20:45:33 +00:00

32bpp_sse_type.h

Fix: [OSX] Remove some OSX compiler warnings on newer SDKs/compilers.

2018-04-10 23:30:01 +02:00

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

2014-04-23 20:13:33 +00:00

32bpp_ssse3.hpp

(svn r26260) -Codechange: add template parameters for (non) translucent and (non) animated sprites, so the least expensive variant can be chosen (MJP)

2014-01-13 18:20:23 +00:00

base.hpp

Blitter: Also use sprite flags for non-SSE 32bpp sprite encoder

2018-01-19 23:24:09 +00:00

factory.hpp

(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)

2014-04-25 15:40:32 +00:00

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

2014-04-23 20:13:33 +00:00

null.hpp

Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch

2015-08-05 21:24:30 +01:00