Jonathan G Rennison 0a9c44d1a2 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/airport_gui.cpp
#	src/blitter/32bpp_anim_sse4.cpp
#	src/console_cmds.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/newgrf_object.h
#	src/road_gui.cpp
#	src/widgets/road_widget.h
#	src/window.cpp

2022-10-16 20:14:13 +01:00

..

cocoa

Merge branch 'master' into jgrpp

2022-10-16 20:14:13 +01:00

allegro_v.cpp

Codechange: use _cur_palette the same in all the drivers

2021-06-26 20:28:05 +02:00

allegro_v.h

…

CMakeLists.txt

…

dedicated_v.cpp

Show failure reason in message box when network savegame load fails

2022-08-27 22:34:28 +01:00

dedicated_v.h

…

null_v.cpp

Fix: thread safety issue during exiting the game (#9380)

2021-10-08 18:11:02 +01:00

null_v.h

…

opengl.cpp

Merge branch 'master' into jgrpp

2022-05-15 13:54:13 +01:00

opengl.h

Add: Show current video driver info in Options window

2022-05-03 21:03:30 +02:00

sdl2_default_v.cpp

Codechange: use _cur_palette the same in all the drivers

2021-06-26 20:28:05 +02:00

sdl2_default_v.h

…

sdl2_opengl_v.cpp

Merge branch 'master' into jgrpp

2022-05-15 13:54:13 +01:00

sdl2_opengl_v.h

…

sdl2_v.cpp

Merge branch 'master' into jgrpp

2022-05-15 13:54:13 +01:00

sdl2_v.h

Merge branch 'master' into jgrpp

2022-05-15 13:54:13 +01:00

sdl_v.cpp

Codechange: use _cur_palette the same in all the drivers

2021-06-26 20:28:05 +02:00

sdl_v.h

…

video_driver.cpp

Fix: don't propagate shift/ctrl state till next game-tick (#9381)

2021-06-17 20:22:57 +02:00

video_driver.hpp

Merge branch 'master' into jgrpp

2022-05-15 13:54:13 +01:00

win32_v.cpp

Merge branch 'master' into jgrpp

2022-10-16 20:14:13 +01:00

win32_v.h

Merge branch 'master' into jgrpp

2022-05-15 13:54:13 +01:00