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 2f8e63e954 Merge branch 'master' into jgrpp ... # Conflicts: # src/gfx.cpp # src/lang/traditional_chinese.txt # src/station_cmd.cpp		3 years ago
..
cocoa	Merge branch 'master' into jgrpp	3 years ago
CMakeLists.txt	…
allegro_v.cpp	Codechange: use _cur_palette the same in all the drivers	3 years ago
allegro_v.h	…
dedicated_v.cpp	Codechange: convert printf DEBUG statements to fmt Debug statements	3 years ago
dedicated_v.h	…
null_v.cpp	Fix: thread safety issue during exiting the game (#9380)	3 years ago
null_v.h	…
opengl.cpp	Merge branch 'master' into jgrpp-beta	3 years ago
opengl.h	Fix: [OpenGL] Check maximum supported texture size against screen resolution.	3 years ago
sdl2_default_v.cpp	Codechange: use _cur_palette the same in all the drivers	3 years ago
sdl2_default_v.h	…
sdl2_opengl_v.cpp	Codechange: use _cur_palette the same in all the drivers	3 years ago
sdl2_opengl_v.h	…
sdl2_v.cpp	Merge branch 'master' into jgrpp-beta	3 years ago
sdl2_v.h	Codechange: use _cur_palette the same in all the drivers	3 years ago
sdl_v.cpp	Codechange: use _cur_palette the same in all the drivers	3 years ago
sdl_v.h	…
video_driver.cpp	Fix: don't propagate shift/ctrl state till next game-tick (#9381)	3 years ago
video_driver.hpp	Merge branch 'master' into jgrpp-beta	3 years ago
win32_v.cpp	MinGW: Avoid function cast warnings with GetProcAddress	3 years ago
win32_v.h	Merge branch 'master' into jgrpp	3 years ago