dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,590 Commits 1 Branch 0 Tags
eab98e4808132ef01d0122ccedb2999fc3ad0d2c
Commit Graph

52590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
78ef36ec6a Merge pull request #155 into cargo_type_order 2020-05-27 20:44:17 +01:00
Jonathan G Rennison
2e93ca9409 Increase verbosity of chosen track assert in TrainController 2020-05-27 19:35:36 +01:00
Jonathan G Rennison
42acbbb936 Debug: Show rail type flags in debug window 2020-05-27 19:35:08 +01:00
translators
71e9c2a71b Update: Translations from eints 
chinese (traditional): 2 changes by ww9980
chinese (simplified): 1 change by ww9980
 2020-05-27 19:45:40 +02:00
TechGeekNZ
082404e443 Fix: Vehicle leaves station without loading if there is a per-cargo "no load" order for the currently fitted cargo. 2020-05-27 13:32:11 +12:00
glx
bfa2e4edf0 Fix: Inconsistency in handling of SDL2 in source.list 2020-05-26 22:44:18 +02:00
glx
2b2f60caf5 Fix: VS 2019 16.6 doesn't like newlines in <SettingsCommandLine> 2020-05-26 22:44:18 +02:00
Niels Martin Hansen
800ade7702 Feature: Push-buttons on storybook pages (#7896) 
Allow more direct player-initiated interaction for Game Scripts, by letting the GS put push-buttons on storybook pages. These buttons can either trigger an immediate event, or require the player to first select a tile on the map, or a vehicle.

Additionally this reworks how the storybook pages are layouted and rendered, to allow for slightly more complex layouts, and maybe speeding drawing up a bit.
 2020-05-22 22:22:55 +02:00
Jonathan G Rennison
5243cfd6d0 Use TinyString for custom name fields which are almost always empty 2020-05-22 00:10:09 +01:00
Jonathan G Rennison
81e69fcbbe Add TinyString: SLE_STR compatible c-string wrapper 2020-05-21 23:44:34 +01:00
Jonathan G Rennison
f8d6e781ba Merge branch 'master' into jgrpp 
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
 2020-05-21 22:24:01 +01:00
Michael Lutz
c972a63c8c Codechange: Store info about the dedicated server log file in globals with automatic destruction to simplify control flow in openttd_main. 2020-05-21 20:02:34 +02:00
Michael Lutz
37bc2f8064 Codechange: Use std::string in the driver and blitter selection code. 2020-05-21 20:02:34 +02:00
Michael Lutz
a49fdb7ebb Codechange: Store base set related texts in std::strings. 2020-05-21 20:02:34 +02:00
Michael Lutz
715aa67a9c Codechange: Use std::string in INI file parsing. 2020-05-21 20:02:34 +02:00
Michael Lutz
8aef14386f Add: Optional implementation of std::optional for pre-C++17 compilers. 
Sourced from https://github.com/akrzemi1/Optional, Boost Software License, Version 1.0.
 2020-05-21 20:02:34 +02:00
Michael Lutz
63ccb36ef3 Codechange: Use std::string for most of the user-settable custom names. 2020-05-21 20:02:34 +02:00
Michael Lutz
9b6f5e3bb8 Codechange: Store GS lang texts in std::strings. 2020-05-21 20:02:34 +02:00
Michael Lutz
9c2e47d03c Codechange: Use std::string for storing GRF error messages. 2020-05-21 20:02:34 +02:00
Michael Lutz
c082f570ce Codechange: Use std::string when translating TTDP NewGRF string codes. 2020-05-21 20:02:34 +02:00
Michael Lutz
808c8198d5 Codechange: Consistently use WChar when passing characters around, and also define it as char32_t. 2020-05-21 20:02:34 +02:00
Michael Lutz
43cd892e0c Codechange: Replace custom linked list for GRF texts with STL vectors and strings. 2020-05-21 20:02:34 +02:00
Michael Lutz
f2b40f40aa Codechange: Replace SmallPair with std::pair. 
std::pair is already the smallest possible pair, and it already handles non-POD types correctly.
 2020-05-21 20:02:34 +02:00
translators
7309bdec48 Update: Translations from eints 
latvian: 9 changes by Tranzistors
 2020-05-20 19:45:39 +02:00
dP
82572754dd Fix: Trees disappear completely after a few years when they're not allowed to spread 2020-05-20 13:16:55 +02:00
glx22
6a8b02609f Fix e3511ec: [AzurePipeline] Don't loop infinitely on errors (#8165) 2020-05-19 22:21:11 +02:00
Yexo
587d8e716b Fix #8155: Roadtype speed limit in toolbar dropdown in scenario editor was doubled 2020-05-19 20:01:09 +02:00
glx22
f6223f8ac2 Fix #8161, e31def197: Lang files may have LF EOL (#8163) 2020-05-19 17:42:29 +02:00
Jonathan G Rennison
ea06a0670d Add rail ground type support for rail custom bridge heads 
See: #146
 2020-05-19 00:41:35 +01:00
translators
b8a896d52c Update: Translations from eints 
latvian: 35 changes by Tranzistors
 2020-05-18 19:45:41 +02:00
dP
93d1d8773f Fix: Desync after house replacement 2020-05-18 09:05:39 +01:00
translators
d11bae58a0 Update: Translations from eints 
spanish (mexican): 7 changes by Absay
 2020-05-17 19:45:39 +02:00
glx22
e31def197f Fix: properly support utf-8 in baseset translation vbscript (#8154) 2020-05-17 19:11:53 +02:00
translators
70ccd34fa0 Update: Translations from eints 
latvian: 13 changes by Tranzistors
 2020-05-16 19:45:38 +02:00
translators
edc7ee2cda Update: Translations from eints 
indonesian: 1 change by fanioz
dutch: 1 change by JanWillem
latvian: 39 changes by Tranzistors
spanish (mexican): 1 change by Absay
 2020-05-15 19:45:40 +02:00
Jonathan G Rennison
1f5322de20 Version: Committing version data for tag: jgrpp-0.34.3 2020-05-14 22:22:39 +01:00
Jonathan G Rennison
47a55afe6d findversion.sh: Handle YEAR part of .ottdrev-vc 2020-05-14 22:22:21 +01:00
translators
9b8d5ea074 Update: Translations from eints 
spanish (mexican): 16 changes by Absay
russian: 3 changes by Lone_Wolf
 2020-05-14 19:45:40 +02:00
Jonathan G Rennison
212f6f4dcb Improve link refresher handling of conditional orders 2020-05-14 18:40:25 +01:00
Jonathan G Rennison
d37d08ebb3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/industry_cmd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
 2020-05-14 00:40:16 +01:00
Jonathan G Rennison
a94a8da990 Suppress warning about using operator ^ on bool 2020-05-13 20:23:10 +01:00
translators
83cd040c61 Update: Translations from eints 
latvian: 21 changes by Tranzistors
korean: 5 changes by telk5093
 2020-05-13 19:45:39 +02:00
Jonathan G Rennison
77673b731c Merge branch 'master' into jgrpp 
# Conflicts:
#	src/industry_cmd.cpp
#	src/openttd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
 2020-05-13 11:17:09 +01:00
Jonathan G Rennison
e67669d6ed Add missing include to ini_type.h 2020-05-13 11:10:16 +01:00
dP
f2a9a1e2a5 Fix #8137: New clients can't join (desync) after funding an industry 2020-05-13 08:43:01 +01:00
dP
7bd52970a1 Codechange: Refactor FindStationsAroundTiles to avoid code duplication 2020-05-13 08:43:01 +01:00
Matthijs Kooijman
2d5869fc79 Fix: sdl2-config would always be detected as present 
The presence of sdl2-config is used go determine whether to look for
sdl2 first, or just sdl1. However, when sdl2-config is *not* present,
`which` returns an empty string. Due to lack of quoting, this produces
`[ -x ]`, rather than `[ -x "" ]` and it turns out the former actually
has a succesful exit status for some reason.

This was not a problem when just running configure, because it would
then just fail to detect sdl2 and fall back to sdl1. However, when
passing `--with-sdl` (without specifying a version), this would only
attempt to detect sdl2, even when sdl2-config was not present, but sdl1
is.

Adding quotes makes the check work as intended.
 2020-05-13 08:33:34 +01:00
translators
6dcc99edab Update: Translations from eints 
latvian: 45 changes by Tranzistors
spanish (mexican): 9 changes by Absay
 2020-05-12 19:45:38 +02:00
glx22
cca613e3b8 Fix #8142, 5aa6351: Buoy owner and tile owner can be different (#8143) 2020-05-12 15:22:58 +02:00
glx22
d15c7dbdeb Add: stations_near and industries_near cache check (#8139) 2020-05-12 01:19:52 +02:00