dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,278 Commits 1 Branch 0 Tags
04ef407ddff18c0984eea99a4739a6ee01bbad57
Commit Graph

48278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
e3b85f617b Merge branch 'master' into jgrpp 
# Conflicts:
#	src/station_cmd.cpp
 2019-03-13 18:36:36 +00:00
peter1138
b00a861467 Codechange: Make FindStationsAroundTile() out-parameter stations const to prevent incorrect modification. 2019-03-13 08:40:25 +00:00
peter1138
6b92b83128 Fix #7372: FindStationsAroundTiles() with caching returns no result for industry tiles. 
Currently this can only be triggered by NewGRF house tiles querying for cargo acceptance history
of nearby stations (var 0x64) with a tile offset, and providing an offset that happens to point
to an industry tile. This serves no useful purpose.
 2019-03-13 08:40:25 +00:00
Johannes E. Krause
43ced57794 Cleanup: Remove questionable syntax in track drawing 2019-03-13 07:47:32 +00:00
Johannes E. Krause
e6798ffdca Cleanup: Remove questionable syntax in town rating display 2019-03-13 07:47:32 +00:00
Johannes E. Krause
21ec3e5531 Cleanup: Remove questionable syntax in GetOrderCmdFromTile 2019-03-13 07:47:32 +00:00
Johannes E. Krause
234f1007f7 Cleanup: Remove questionable syntax in HQ size calculation 2019-03-13 07:47:32 +00:00
Johannes E. Krause
ba3d7122df Cleanup: Remove questionable syntax in station rating calculation 2019-03-13 07:47:32 +00:00
Jonathan G Rennison
290471c70f Use btree_set for IndustryList and StationList 2019-03-13 03:39:11 +00:00
Jonathan G Rennison
5e6d283463 Merge branch 'master' into jgrpp 
Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
 2019-03-13 03:38:26 +00:00
Gabda
dea7f078f4 Codechange: Update town sign on population change only when population is shown (#7368) 2019-03-12 19:12:34 +00:00
Jonathan G Rennison
63203c2395 Add GUI/client setting to save zoning overlay state 2019-03-12 18:44:40 +00:00
Jonathan G Rennison
828a4399f9 Fix tunnel build viewport length tooltip when hover mode is right click 2019-03-11 20:01:29 +00:00
Jonathan G Rennison
2bd33c1869 Fix viewport hovering when hover mode is set to right-click 2019-03-11 19:19:54 +00:00
translators
776fbda324 Update: Translations from eints 
finnish: 110 changes by hpiirai
ukrainian: 149 changes by nsergiy
 2019-03-11 19:45:41 +01:00
Jonathan G Rennison
1a115e1cc8 Change: Include _current_company in crashlog AI config line 
_current_company is not currently logged anywhere in the crashlog.
_local_company is logged, despite being much less useful than
_current_company.
This change logs _current_company alongside _local_company.
 2019-03-11 12:47:46 +00:00
Patric Stout
6a897a2a9b Fix: don't include xaudio2 if you are not going to compile it 
This is more in trend with other files, where if the driver is not
selected, we don't even attempt to compile it.
 2019-03-11 10:16:00 +01:00
Patric Stout
aea1726f45 Fix: MingW and MSVC compiled strgen had different path separator behaviour 
If it was compiled with MingW, both / and \ were accepted as
path separator. On MSVC, only \ was. This is an unexpected
difference between binaries for the same platform. Remove this
discrepancy by accepting both / and \ on all platforms.
 2019-03-11 10:16:00 +01:00
Patric Stout
45fbaa64c2 Codechange: check if a define is set directly, instead of indirectly 
config.lib happens to set GLOBAL_DATA_DIR in case it is not DOS
and not OS2, but this kind of deduction is annoying to maintain.
It is better to just check if the define you want to use is set,
and leave it to config.lib to set it or not depending on the OS.
 2019-03-11 10:16:00 +01:00
Patric Stout
1f57150d80 Codechange: "basedir.h" is a system include, not a local 2019-03-11 10:16:00 +01:00
Patric Stout
36105841b9 Codechange: ICU_SORT is in reality ICU_I18N (according to their CMake files) 
By naming it in a different way, things get a bit confusing.
Especially if we are switching to CMake, which autodetects these
things, we need to use the name the authors of ICU gave it; not
our interpertation of that name.
 2019-03-11 10:16:00 +01:00
Patric Stout
52d7e7d45e Codechange: ICU_LAYOUT is in reality ICU_LX (according to their CMake files) 
By naming it in a different way, things get a bit confusing.
Especially if we are switching to CMake, which autodetects these
things, we need to use the name the authors of ICU gave it; not
our interpertation of that name.
 2019-03-11 10:16:00 +01:00
Patric Stout
7adae09897 Codechange: liblzma is called liblzma, how ever strange that might be 
It is the only library we use that calls itself with 'lib' in the
name. This might be confusing, but with the arrival of cmake a lot
of these things are automated. And detection will find 'liblzma',
not 'lzma', like with 'lzo', 'zlib', ..
 2019-03-11 10:16:00 +01:00
Patric Stout
dcc5183dd0 Codechange: make clear that SSE is a flag you can switch 2019-03-11 10:16:00 +01:00
Patric Stout
75a86d8460 Codechange: the flag is not if you have threads, but if you want to use them 2019-03-11 10:16:00 +01:00
Patric Stout
634d1f16b2 Codechange: fix indentation of source.list 2019-03-11 10:16:00 +01:00
translators
c09c94378c Update: Translations from eints 
finnish: 214 changes by hpiirai
norwegian (bokmal): 10 changes by Leifbk
russian: 2 changes by Lone_Wolf
croatian: 6 changes by VoyagerOne
 2019-03-10 19:45:53 +01:00
glx
bfbe9ccc45 Fix: [AzurePipelines] run commit checker only for PRs 2019-03-10 15:35:22 +01:00
glx22
a1d028ea60 Fix: [AzurePipelines] Run commit checker only for PRs and pass it the target branch (#7356) 2019-03-10 10:42:53 +00:00
peter1138
9cb84a1bad Feature: Add road icon to road construction drop down list. 2019-03-10 10:31:37 +00:00
peter1138
9c8b7b5efc Feature: Add rail icon to rail construction drop down list. 2019-03-10 10:31:37 +00:00
peter1138
b56ea5ca27 Add: Generic drop down list string item with icon. 2019-03-10 10:31:37 +00:00
peter1138
fb35cb5ed2 Remove: Unnecessary virtual destructors on drop down list items. 2019-03-10 09:20:11 +00:00
peter1138
303cfd86a3 Remove: Unnecessary specialization of NewGRF preset list item. 2019-03-10 09:20:11 +00:00
peter1138
811bf22620 Codechange: Use Colours type instead of byte. 2019-03-10 09:20:11 +00:00
Michael Lutz
cc5f175615 Feature: Railtype flags to allow/disallow 90 degree curves. (#7352) 2019-03-10 08:12:47 +00:00
glx
26b0615c47 Fix e4cc06f67: [AzurePipelines] rebase only for PRs 2019-03-10 01:02:59 +01:00
glx
e4cc06f67e Fix: [AzurePipelines] don't assume master as target branch when rebasing PRs 2019-03-09 22:30:19 +00:00
Niels Martin Hansen
e8d397e4ee Codechange: Make a merged k-d tree index of all viewport signs 2019-03-09 20:27:11 +01:00
Niels Martin Hansen
d84b67e54d Codechange: Make a k-d tree index of stations 2019-03-09 20:27:11 +01:00
Niels Martin Hansen
7b56be0f3a Codechange: Make a k-d tree index of towns 2019-03-09 20:27:11 +01:00
Niels Martin Hansen
d7522e5e8f Codechange: Add a k-d tree generic data structure 2019-03-09 20:27:11 +01:00
translators
3a54c71041 Update: Translations from eints 
finnish: 46 changes by hpiirai
danish: 10 changes by nielsmh
hungarian: 2 changes by Brumi
 2019-03-09 19:45:44 +01:00
Peter Nelson
943c58e468 Fix: Show industry name in Land Area Information window for oil-rig type stations instead of just 'Oil Rig' 2019-03-09 18:16:33 +00:00
Peter Nelson
8b1b3fd0f9 Feature: Non-rectangular sparse station catchment area. 2019-03-09 16:33:47 +00:00
Peter Nelson
3542ed53d4 Add: BitmapTileArea and Iterator to handle sparse tile areas. 2019-03-09 16:33:47 +00:00
peter1138
94b40fd530 Codechange: Convert IndustryVector to a std::set. 2019-03-09 16:33:47 +00:00
peter1138
ed6084523d Codechange: Convert StationList from SmallVector to std::set. 2019-03-09 16:33:47 +00:00
Andy
46aca9377b Add: windowshade for rail station construction window 2019-03-09 11:04:35 +00:00
PeterN
42046af933 Add: Add flag and railtype sprite type to draw pre-combined ground sprites. (#7231) 2019-03-09 02:53:43 +00:00