Jonathan G Rennison
|
fd4d4d341d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/animated_tile.cpp
# src/cargopacket.h
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/date.cpp
# src/disaster_vehicle.cpp
# src/dock_gui.cpp
# src/economy.cpp
# src/engine.cpp
# src/error_gui.cpp
# src/fontcache/spritefontcache.cpp
# src/game/game_gui.cpp
# src/game/game_text.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/highscore_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/italian.txt
# src/lang/portuguese.txt
# src/lang/russian.txt
# src/lang/turkish.txt
# src/lang/vietnamese.txt
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_generic.cpp
# src/news_gui.cpp
# src/openttd.cpp
# src/os/unix/unix.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/misc_sl.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/script/script_gui.cpp
# src/settings_table.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/spritecache.cpp
# src/spritecache.h
# src/spriteloader/grf.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/stdafx.h
# src/strgen/strgen_base.cpp
# src/subsidy.cpp
# src/table/settings/difficulty_settings.ini
# src/texteff.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/townname.cpp
# src/vehicle.cpp
# src/waypoint_cmd.cpp
# src/widgets/dropdown.cpp
# src/window.cpp
|
2023-05-26 19:36:48 +01:00 |
|
Jonathan G Rennison
|
de5b114a83
|
Fix #10660: Sprite Font scale affected by viewport zoom level limits. (#10668)
(cherry picked from commit db573c8742)
# Conflicts:
# src/fontcache/spritefontcache.cpp
# src/gfx.cpp
# src/spritecache.cpp
|
2023-04-18 00:01:51 +01:00 |
|
PeterN
|
db573c8742
|
Fix #10660: Sprite Font scale affected by viewport zoom level limits. (#10668)
|
2023-04-17 00:14:03 +02:00 |
|
PeterN
|
e97bf271dc
|
Codechange: Make SpriteType, CargoSortType, SourceType and ScriptType enum classes. (#10663)
This avoids a (soft) namespace conflict between the four ST_* enums.
|
2023-04-16 20:00:55 +01:00 |
|
Jonathan G Rennison
|
9e33153df9
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/os/macosx/string_osx.cpp
|
2022-12-20 18:05:43 +00:00 |
|
Peter Nelson
|
8599041ce4
|
Fix: GetDefaultFontHeight() is static, don't use ->
|
2022-12-18 11:46:01 -05:00 |
|
Jonathan G Rennison
|
6d4474b84e
|
Merge tag '13.0-beta2' into jgrpp
# Conflicts:
# src/cheat_gui.cpp
# src/company_gui.cpp
# src/console_gui.cpp
# src/depot_gui.cpp
# src/error_gui.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/misc_gui.cpp
# src/network/network_content_gui.h
# src/newgrf_debug_gui.cpp
# src/order_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/station_gui.cpp
# src/subsidy_gui.cpp
# src/table/settings/gui_settings.ini
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_cmd.cpp
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/water_cmd.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
2022-12-04 20:43:11 +00:00 |
|
Peter Nelson
|
9666e46739
|
Feature: Variable GUI scale.
GUI scale is now variable from 100% to 500%, and no longer restricted to
powers-of-2.
|
2022-11-12 18:28:39 +00:00 |
|
Peter Nelson
|
13d271217f
|
Change: Sprite-scale inter-character spacing of fonts.
|
2022-11-12 18:28:39 +00:00 |
|
Jonathan G Rennison
|
23b974fb39
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/fontcache.cpp
# src/openttd.cpp
# src/os/macosx/font_osx.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/font_win32.cpp
# src/strings.cpp
|
2022-10-03 20:32:26 +01:00 |
|
Peter Nelson
|
2cdd8b7429
|
Change: Separate fontcache implementations.
|
2022-09-25 18:34:24 +01:00 |
|