dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,445 Commits 1 Branch 0 Tags
87acac9700a2f33f327f8acf1aeaf14de48ded2d
Commit Graph

35868 Commits

Author SHA1 Message Date
damfr
1b3ce25c07 Add: Warning in save description when showing a save whith a different id 2018-11-26 10:32:35 +01:00
damfr
5f6858c379 Add: Setting to save a unique id for each savegame 2018-11-26 10:30:49 +01:00
Jonathan G Rennison
c9c3e6f574 Fix use of uint8 for file slot handles 2018-11-26 01:01:50 +00:00
damfr
868c6f924a Add: Filter box to the save and load windows (#6974) 
Save and heightmap names can be filtered.
 2018-11-25 20:54:25 +01:00
translators
af4a21bd82 Update: Translations from eints 
korean: 4 changes by telk5093
spanish: 3 changes by SilverSurferZzZ
russian: 8 changes by Lone_Wolf
 2018-11-25 19:45:41 +01:00
Niels Martin Hansen
9e30fbab34 Fix #6864: Normalise colour use in Frame rate window 2018-11-25 17:27:53 +01:00
Niels Martin Hansen
cb1fcc4765 Doc: More notes for developers adding new PerformanceElements 2018-11-25 00:49:33 +01:00
Niels Martin Hansen
1ee20fac9a Codechange: Wrong name for include guard 2018-11-25 00:49:33 +01:00
Niels Martin Hansen
810887af30 Fix #6498: Use int64 for all company rating calculations 2018-11-25 00:48:34 +01:00
Niels Martin Hansen
c618a7c093 Fix 6298b96: Changing music set did not save new setting 2018-11-25 00:47:56 +01:00
Niels Martin Hansen
c84b9913bd Fix #6676: Prevent helicopters from stopping in midair during some kinds of landing 
This adds a new flag that gets stored in the savegame, but it should still be compatible both ways, hence no save version bump.
 2018-11-25 00:47:34 +01:00
translators
f35a59fd38 Update: Translations from eints 
spanish (mexican): 2 changes by Absay
 2018-11-24 19:45:43 +01:00
Jonathan G Rennison
10320747a9 Allow purchasing a region of tile at once, by dragging 2018-11-23 19:07:13 +00:00
Jonathan G Rennison
46b1ea81e4 Add company rate limit for land area purchasing 2018-11-23 18:47:36 +00:00
Jonathan G Rennison
9608912d29 Merge branch 'newgrf-property-mapping' into jgrpp 2018-11-22 19:29:53 +00:00
Jonathan G Rennison
2e539dfeca Fix typo in static assert message 2018-11-22 19:14:02 +00:00
Jonathan G Rennison
f3c52f1b6c Merge branch 'master' into jgrpp 2018-11-22 19:04:59 +00:00
translators
16a36dffa0 Update: Translations from eints 
spanish: 2 changes by SilverSurferZzZ
 2018-11-21 19:45:42 +01:00
Jonathan G Rennison
c1df63a2eb Merge branch 'master' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/viewport.cpp
 2018-11-19 20:51:16 +00:00
Jonathan G Rennison
df0aa2ed4b Add pillar and station height checks to bridge upgrade command 2018-11-19 20:35:57 +00:00
frosch
1a1204472e Revert: Sprite sorting optimisation sorted incorrectly. 
This reverts commit 25ab9c1997.
 2018-11-18 17:30:28 +01:00
Niels Martin Hansen
68e6b5531a Update: Developer credits 2018-11-17 21:05:07 +01:00
Jonathan G Rennison
8b37e5aac2 Implement custom bridge pillar flag support 
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars

Set values for default bridges and stations
 2018-11-17 19:49:05 +00:00
Jonathan G Rennison
989577d40c Add support for adding a third error line to the error GUI 
Add support for a second error string ID to CommandCost
 2018-11-19 18:59:25 +00:00
Charles Pigott
6accbf9afc Fix #6969: Account for BOM when reading script files 2018-11-17 16:05:10 +01:00
Jonathan G Rennison
6df12e77b6 Refactor/de-duplicate rail station bridge above check methods 2018-11-14 20:23:56 +00:00
translators
278a705bbb Update: Translations from eints 
indonesian: 41 changes by UseYourIllusion
 2018-11-14 19:45:40 +01:00
Jonathan G Rennison
beaddc8a98 Set minimum bridge height clearances for default stations 2018-11-14 00:04:29 +00:00
translators
71cda6ca1d Update: Translations from eints 
spanish: 10 changes by SilverSurferZzZ
 2018-11-13 19:45:42 +01:00
translators
6950ea0ba7 Update: Translations from eints 
indonesian: 18 changes by UseYourIllusion
 2018-11-12 19:45:40 +01:00
Jonathan G Rennison
2c88645bac Merge branch 'newgrf-property-mapping' into jgrpp 2018-11-11 23:51:30 +00:00
Jonathan G Rennison
04536952ee Fix Action 0 mapped property length handling 
Fix case when Num-info != 1
 2018-11-11 23:50:09 +00:00
Jonathan G Rennison
2bb6877f18 Fix syntax of static_assert 2018-11-11 23:49:32 +00:00
Jonathan G Rennison
ceae4516ca Add remappable properties for station min bridge height and bridge menu icon 2018-11-11 11:28:10 +00:00
Jonathan G Rennison
06c458cb19 Merge branch 'newgrf-property-mapping' into jgrpp 
# Conflicts:
#	docs/newgrf-additions.html
#	src/newgrf.cpp
 2018-11-11 11:27:41 +00:00
Jonathan G Rennison
9a6a66a054 Add general NewGRF Action 0 property mapping scheme to Action 14 2018-11-11 11:26:05 +00:00
Jonathan G Rennison
cb459132ac Merge branch 'master' into newgrf-feature-detection 2018-11-10 12:24:53 +00:00
Jonathan G Rennison
c10f6f9abb Fix incorrect method documentation of ChangeGRFFeatureSetPlatformVarBit 2018-11-10 12:24:32 +00:00
translators
16cc482d57 Update: Translations from eints 
croatian: 2 changes by VoyagerOne
 2018-11-08 19:45:43 +01:00
Greg-21
4ba73dac95 Doc: Changed several files to unificate them... (#6964) 
...with those from release 1.8 branch.
 2018-11-06 00:38:42 +01:00
Jonathan G Rennison
e735c1a51a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
 2018-11-05 12:53:36 +00:00
Jonathan G Rennison
83a063f51c Add train is in slot conditional order 2018-11-05 04:21:08 +00:00
Jonathan G Rennison
c632539bb7 Prevent adding train slot state conditional orders to non-train vehicles 2018-11-05 04:01:41 +00:00
translators
ccd9d77b94 Update: Translations from eints 
italian: 2 changes by lorenzodv
 2018-11-04 19:45:42 +01:00
Niels Martin Hansen
9b560eaa51 Fix: Industry chain window layout no more unnecessarily large when the number of cargoes in/out isn't large either 2018-11-03 21:43:54 +01:00
Niels Martin Hansen
e66cec8f86 Add: NewGRF support for 16-in-16-out industries 2018-11-03 21:43:54 +01:00
Niels Martin Hansen
8859381d30 Add: Industries can produce and accept up to 16 different cargoes 2018-11-03 21:43:54 +01:00
translators
32b9ee7063 Update: Translations from eints 
latvian: 3 changes by krixis02
 2018-11-03 19:45:42 +01:00
Jonathan G Rennison
91e08c6cea Merge branch 'cpp-btree' into jgrpp 2018-11-01 18:56:02 +00:00
Jonathan G Rennison
7690fe8572 cpp-btree: Update to match upstream 
minor optimization: minimize calls to end()

Minor optimization: increase the chances that the compiler will inline calls to end().
Has been observed to make a difference with gcc 4.9.3.

Fix build and warnings on MSVC (2017)
Uses static_assert, a C++11 feature. Also adds some explicit uses of
static_cast in order to suppress warnings about lossy type conversion.
 2018-11-01 18:54:24 +00:00