Jonathan G Rennison
|
865cf79915
|
Fix missing override keywords
|
2021-03-02 23:45:08 +00:00 |
|
Jonathan G Rennison
|
f4e29071be
|
Merge tag '1.11.0-beta2' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release.yml
# CMakeLists.txt
# src/blitter/32bpp_optimized.cpp
# src/debug.cpp
# src/gfx.cpp
# src/gfx_func.h
# src/lang/czech.txt
# src/lang/english.txt
# src/lang/italian.txt
# src/lang/swedish.txt
# src/lang/ukrainian.txt
# src/network/network_server.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/pathfinder/follow_track.hpp
# src/screenshot.cpp
# src/settings_type.h
# src/spritecache.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/video_driver.cpp
# src/video/video_driver.hpp
# src/video/win32_v.cpp
|
2021-03-02 11:59:03 +00:00 |
|
Michael Lutz
|
6776229047
|
Codechange: Make the simple Malloc sprite allocator globally usable.
|
2021-02-22 22:16:07 +01:00 |
|
Jonathan G Rennison
|
e95216b59d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_cmd.cpp
# src/core/geometry_func.cpp
# src/date.cpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/object_gui.cpp
# src/openttd.cpp
# src/settings_type.h
# src/video/allegro_v.cpp
# src/video/dedicated_v.cpp
# src/video/null_v.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
|
2021-02-19 15:38:34 +00:00 |
|
Michael Lutz
|
21a2cd7bc3
|
Codechange: Replace magic numbers by constants.
|
2021-02-14 11:48:58 +01:00 |
|
Michael Lutz
|
c6af8f16f6
|
Codechange: [Win32] Move Win32-specific font code to a seperate file.
|
2021-02-13 20:09:14 +01:00 |
|