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
|
2 years ago |
Peter Nelson
|
f6ad8e1c9c
|
Change: Rename some freetype things to fontcache.
The font cache supports more than just FreeType as a font provider, but still used freetype in some naming.
This now uses more suitable terms.
|
2 years ago |
|
Jonathan G Rennison
|
f54d69a60a
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/economy.cpp
# src/elrail.cpp
# src/graph_gui.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/network/core/game_info.cpp
# src/newgrf_station.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/strings_func.h
# src/table/settings/network_settings.ini
# src/table/settings/settings.ini
|
3 years ago |
|
Jonathan G Rennison
|
fd605e3cf3
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
|
3 years ago |
|
Jonathan G Rennison
|
da1ac73c02
|
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
# Conflicts:
# src/lang/estonian.txt
# src/lang/hungarian.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/packet.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/string_func.h
|
3 years ago |
rubidium42
|
979783f90e
|
Codechange: replace InjectDParam/ShiftParameters by setting the right parameter values in the first place
|
3 years ago |
|
rubidium42
|
2e0297b0fa
|
Add: GetString that returns std::string instead of filling a passed buffer
|
3 years ago |
|
rubidium42
|
6bca9e090d
|
Codechange: add SetDParamStr that accepts std::string&
|
3 years ago |
|
Jonathan G Rennison
|
7154f8859d
|
Merge tag '1.11.0-beta1' into jgrpp
# Conflicts:
# src/console_cmds.cpp
# src/gfx_func.h
# src/industry.h
# src/lang/czech.txt
# src/lang/estonian.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/slovak.txt
# src/saveload/saveload.h
# src/station_gui.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/waypoint_gui.cpp
|
3 years ago |
|
Jonathan G Rennison
|
6c3e5642f8
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
|
3 years ago |
Patric Stout
|
98400974a9
|
Codechange: nobody was using "str" parameter, so remove it
|
3 years ago |
Charles Pigott
|
860c270c73
|
Codechange: Replace assert_compile macro with static_assert
|
3 years ago |
|
Jonathan G Rennison
|
0fa37bcad9
|
Add function to get GRF ID of string ID
|
4 years ago |
|
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
5 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
|
Jonathan G Rennison
|
dbc5f1baed
|
Merge branch 'master' into jgrpp-nrt
# Conflicts:
# src/fontcache.cpp
# src/game/game_text.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/station_cmd.cpp
# src/viewport.cpp
|
5 years ago |
Michael Lutz
|
d2ed426077
|
Codechange: [Win32] Pass a native GDI font description around when we have one, instead of repeatedly guessing the font.
|
5 years ago |
|
Jonathan G Rennison
|
bd2fdde759
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
|
5 years ago |
glx
|
8899272614
|
Codechange: use std::vector for _language_dropdown
|
5 years ago |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
|
Jonathan G Rennison
|
a6168dd2f0
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/saveload/company_sl.cpp
|
7 years ago |
frosch
|
2bb80d280c
|
(svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k.
|
7 years ago |
|
frosch
|
ce32ca4dc6
|
(svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k.
|
7 years ago |
|
frosch
|
a56e2bccd0
|
(svn r27756) -Codechange: Add StringTab enum
|
7 years ago |
|
frosch
|
49b940f69c
|
(svn r27756) -Codechange: Add StringTab enum
|
7 years ago |
|
frosch
|
f4da8ece0c
|
(svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently.
|
7 years ago |
|
frosch
|
b54a79f13e
|
(svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently.
|
7 years ago |
|
frosch
|
9ad09627ad
|
(svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs.
|
7 years ago |
|
frosch
|
02967c3c08
|
(svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs.
|
7 years ago |
|
Jonathan G Rennison
|
8ec1b2200e
|
Change tracerestrict weight ratio properties to use decimals, and the weight unit.
Add {POWER_WEIGHT_RATIO} and {FORCE_WEIGHT_RATIO} string codes.
|
8 years ago |
|
frosch
|
5ab39cc651
|
(svn r26238) -Codechange: Use StringParameters::GetDataLeft to check for left space in the param array.
|
11 years ago |
|
frosch
|
68c8aa93cd
|
(svn r26238) -Codechange: Use StringParameters::GetDataLeft to check for left space in the param array.
|
11 years ago |
|
frosch
|
bc86bf9b12
|
(svn r26237) -Cleanup: Remove unused SCC_STRING_ID.
|
11 years ago |
|
frosch
|
cb6aee2f27
|
(svn r26237) -Cleanup: Remove unused SCC_STRING_ID.
|
11 years ago |
|
frosch
|
ce110eed32
|
(svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them.
|
11 years ago |
|
frosch
|
ddf817e8f3
|
(svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them.
|
11 years ago |
|
frosch
|
b533523258
|
(svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations.
|
12 years ago |
|
frosch
|
eb20798aae
|
(svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations.
|
12 years ago |
yexo
|
2f042ea198
|
(svn r24593) -Fix [FS#5333]: crash when a gamescript provided too many parameters to a GSText object
|
12 years ago |
|
yexo
|
c0462c034e
|
(svn r24593) -Fix [FS#5333]: crash when a gamescript provided too many parameters to a GSText object
|
12 years ago |
michi_cc
|
76344163c7
|
(svn r23945) -Fix: Better rounding when converting internal speed to displayed speed.
|
12 years ago |
|
michi_cc
|
b1471b4ec2
|
(svn r23945) -Fix: Better rounding when converting internal speed to displayed speed.
|
12 years ago |
|
rubidium
|
c02aabf1b8
|
(svn r23644) -Fix [FS#4899]: prevent game scripts using StringIDs that are not coming from themselves, so the game script doesn't "accidentally" try to display an invalid string or try to display a town name in from an unknown town name generator
|
13 years ago |
|
rubidium
|
9d7aec3fe7
|
(svn r23644) -Fix [FS#4899]: prevent game scripts using StringIDs that are not coming from themselves, so the game script doesn't "accidentally" try to display an invalid string or try to display a town name in from an unknown town name generator
|
13 years ago |
|
rubidium
|
c06a3555fb
|
(svn r23478) -Codechange: add a method to copy string parameters *and* its raw strings
|
13 years ago |
|
rubidium
|
87045ae4ee
|
(svn r23478) -Codechange: add a method to copy string parameters *and* its raw strings
|
13 years ago |
|
rubidium
|
462b875b4a
|
(svn r23276) -Codechange: add the answer for the question whether we're looking for monospace fonts in the searcher
|
13 years ago |
|
rubidium
|
e82325e5c6
|
(svn r23276) -Codechange: add the answer for the question whether we're looking for monospace fonts in the searcher
|
13 years ago |
|
rubidium
|
0a4a75b0af
|
(svn r23273) -Codechange: allow passing a MissingGlyphSearcher to CheckForMissingGlyphs (default to the language pack strings)
|
13 years ago |