Jonathan G Rennison 6459e62fff Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/lang/english.txt
#	src/map_type.h
#	src/network/network_command.cpp
#	src/object_cmd.cpp
#	src/rail_cmd.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/settings_gui.cpp
#	src/string.cpp
#	src/table/road_land.h
#	src/table/settings/game_settings.ini
#	src/table/settings/world_settings.ini
#	src/tbtr_template_gui_main.h
#	src/train_cmd.cpp

2022-11-05 19:24:44 +00:00

..

cocoa

Revert "Disable OSX touchbar support, fixes #358"

2022-10-27 23:49:12 +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-11-05 19:24:44 +00:00

opengl.h

Cleanup: Remove svn-style $Id$ comments. (#10122)

2022-11-01 18:24:31 -06: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