dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,599 Commits 1 Branch 0 Tags
6b0dfff39d1c06842b6f7e41bef210b9a2ba137b
Commit Graph

37734 Commits

Author SHA1 Message Date
frosch
e94656b5a5 Fix: [NewGRF] Action 7/9 conditions 0x0F to 0x12 failed, if 'param' was 0x88. (#8382) 
Fix: [NewGRF] Action 7/9 conditions 0x0B to 0x12 failed, if 'param' was 0x85.
These conditions are supposed to ignore 'param' entirely.

(cherry picked from commit d5f05fb781)
 2020-12-27 20:36:31 +00:00
SamuXarick
aaeb36e95d Fix: for original terrain generator, keep a single gap of water at the borders (#7883) 
This means that for NE/NW, it should have one more in case of
freeform-edges, and in case of SE/SW it should have one less.

Reminder: freeform-edges only adds VOID tiles on X=0 and Y=0.
(cherry picked from commit 1d85d71d29)
 2020-12-27 20:36:22 +00:00
Patric Stout
cc5ccc3b45 Fix: a cargos sneaked in; should be cargoes for consistency (#8383) 
(cherry picked from commit e07afaeffb)
 2020-12-27 20:36:13 +00:00
Tyler Trahan
4714fea258 Change: set the default setting for autorenew to on for new games (#8352) 
(cherry picked from commit f2a93dba0d)
 2020-12-27 20:33:34 +00:00
jostephd
3088d41ac8 Feature: new velocity unit "tiles/day" (#8278) 
(cherry picked from commit b1cf79da5b)
 2020-12-27 20:33:24 +00:00
Pavel Stupnikov
ba4626d450 Add: new economy "frozen" that stops production changes and industry closures (#8282) 
(cherry picked from commit c9fd85528a)
 2020-12-27 20:32:34 +00:00
Patric Stout
488187a423 Fix: next 67 savegame versions are used in PatchPacks; skip them (#8411) 
Various of PatchPacks (Spring 2013, Joker, ChillPP) used versions
slightly higher than ours. Of course, as time went by, this
caught up with us, and we are now almost pushing a new version
that would conflict with them. To avoid users creating unneeded
issues about "why can I not load my savegame", lets be ahead of
the curve and flat-out refuse to load them.

Version-wise, this is totally fine. We have ~32k versions to go
before we run out (0x8000 is masked by JGRPP; we should avoid
using that). At the rate we bump savegames, this is not going to
happen in any sane reality.

(cherry picked from commit d8c8f4e72d)
 2020-12-27 20:29:25 +00:00
Jonathan G Rennison
483ed2f468 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/openttd.cpp
 2020-12-27 20:16:16 +00:00
J0anJosep
edbb5f4f73 Doc: Remove some SmallVector references from documentation. 2020-12-27 18:40:18 +00:00
Charles Pigott
e0161cf8da Fix b408fe7: Don't try to construct a std::string from nullptr 2020-12-27 18:30:53 +00:00
translators
1bb0e6ed8c Update: Translations from eints 
russian: 19 changes by lexuslatvia
finnish: 1 change by hpiirai
latvian: 19 changes by lexuslatvia
 2020-12-27 18:18:16 +00:00
Michael Lutz
4f8e7b2a2b Fix 65f65ad2: Missing path separator that fell over a cliff. 2020-12-27 15:07:06 +01:00
SamuXarick
dc5b8020cc Fix #6452: Reset only editable and visible settings from GUI (#7890) 
Also enables the Reset button while in-game for AI configs.
 2020-12-27 15:05:47 +01:00
Michael Lutz
b408fe77f7 Codechange: Use std::string in file scanners. 2020-12-27 13:19:25 +01:00
Michael Lutz
358056ec42 Codechange: Keep filenames of loaded Fio files in std::strings. 2020-12-27 13:19:25 +01:00
Michael Lutz
024a3f6259 Codechange: Use automatic memory management for language pack reading. 2020-12-27 13:19:25 +01:00
Michael Lutz
5cbb2da794 Codechange: Even more std::string usage in file IO. 2020-12-27 13:19:25 +01:00
Michael Lutz
65f65ad2ad Codechange: Convert some more FIO functions to take std::string. 2020-12-27 13:19:25 +01:00
Michael Lutz
f3326d34e7 Codechange: Use std::string in FIO search path handling. 2020-12-27 13:19:25 +01:00
Michael Lutz
0c6e8a8123 Codechange: Store file search paths as std::string. 2020-12-27 13:19:25 +01:00
Michael Lutz
dd138fc460 Codechange: Stringify config file paths. 2020-12-27 13:19:25 +01:00
Charles Pigott
860c270c73 Codechange: Replace assert_compile macro with static_assert 2020-12-27 10:55:42 +00:00
cirdan
395a5d9991 Cleanup: Remove unused ChunkType flag CH_AUTO_LENGTH 
CH_AUTO_LENGTH is no longer used anywhere, so remove all code
that depends on it.
 2020-12-27 10:30:55 +00:00
cirdan
46ff7d918b Cleanup: Remove save-only autolength flag from economy chunk handlers 
CH_AUTO_LENGTH is only used when saving chunks; it makes no sense
to set it for chunks without a save handler.
 2020-12-27 10:30:55 +00:00
Jonathan G Rennison
0e017f6233 Codechange: Enable FINAL, (un)likely, __attribute__ when building with clang 2020-12-27 10:30:55 +00:00
Jonathan G Rennison
fc52d3df50 Codechange: Use likely/__builtin_expect for assertion macros 2020-12-27 10:30:55 +00:00
Jonathan G Rennison
5cf28be742 Codechange: Add support for verbose asserts 2020-12-27 10:30:55 +00:00
Jonathan G Rennison
eb74179c6d Codechange: Unconditionally use static_assert 
We're well past having to support non-C++11 compliant compilers now.
 2020-12-27 10:30:55 +00:00
Charles Pigott
52f3abba6e Cleanup: Remove unnecessary assert_tcompile macro 2020-12-27 10:30:55 +00:00
glx22
d8605ad18d Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops 2020-12-27 10:28:46 +00:00
Michael Lutz
1478fa93b3 Add: [NewGRF] Patch flag to test if inflation is on or off. 2020-12-27 10:28:39 +00:00
Michael Lutz
5a5d613ee3 Change: Disable changing the inflation setting in network games. 2020-12-27 10:28:39 +00:00
Jonathan G Rennison
aefefb61c2 Fix GetSpriteMainColour with non-default zoom sprites 
This fixes viewport map mode with extra zoom ground tile sets
 2020-12-27 03:03:05 +00:00
Jonathan G Rennison
ad5a97b7a1 Add console command to dump cargo types 2020-12-27 00:44:55 +00:00
Jonathan G Rennison
9906916b7b Debug: Include aircraft fields and station XY in debug window 2020-12-27 00:43:39 +00:00
Niels Martin Hansen
2d9fa81bd0 Feature: Plant clumps of trees in editor by dragging on the landscape 2020-12-27 01:03:27 +01:00
Niels Martin Hansen
e0ee2d530a Change: Switch tree GUI to use dynamically generated buttons 
This makes it look a bit better in climates with fewer tree types.
 2020-12-27 01:03:27 +01:00
Niels Martin Hansen
4d0f19406b Fix: Wrong tree sprite in tree toolbar 2020-12-27 01:03:27 +01:00
Jonathan G Rennison
e5d4fab138 Debug: Fix disabling auto-refresh not updating button 2020-12-26 20:12:22 +00:00
translators
2c8c6d423c Update: Translations from eints 
korean: 18 changes by telk5093
 2020-12-26 18:16:26 +00:00
Patric Stout
8fa2a67f6b Fix f66baa44: for-loop is no longer increasing "i" 
During conversion it was overlooked that the for-loop used to do
this. Oops.
 2020-12-26 13:32:25 +00:00
Jonathan G Rennison
3f3d5c106f Console: Add commands for conditional execution from game date 2020-12-26 12:06:31 +00:00
Jonathan G Rennison
5fe5884613 Debug: Add experimental command to switch baseset 2020-12-26 10:54:01 +00:00
Jonathan G Rennison
78b06ddc40 TBTR: Fix palette recolouring of templates 
Fix group overrides affecting template image when cloning vehicle
Update template when changing company colours

Update template images on demand instead of at load
 2020-12-26 09:37:26 +00:00
Jonathan G Rennison
369c98e3e0 TBTR: Fix editing a template not refitting the head and artic/dual parts 2020-12-26 09:08:43 +00:00
Jonathan G Rennison
7b445cd436 Debug: Show vehicle cargo subtype in debug window 2020-12-26 08:51:37 +00:00
Patric Stout
6aef1164a4 Fix: [Emscripten] using TIC/TOC on this platform is silly 
Stop throwing a warning about this, as it is not likely we will
ever implement it.
 2020-12-25 20:56:25 +01:00
Michael Lutz
79cb9efa7f Change: Always apply inflation from 1920 to 2090, no matter the game start year. (#7589) 2020-12-25 20:36:14 +01:00
Patric Stout
e6e91a345c Fix f66baa44: index was off by one (#8433) 
i++ in the 3rd part of a for() is post, not pre. Oops.
 2020-12-25 19:57:13 +01:00
Patric Stout
f66baa444f Codechange: use C++11 constructs for for-each loops (#8432) 2020-12-25 19:38:18 +01:00