Jonathan G Rennison
b59f1be235
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
2016-03-22 22:10:19 +00:00
Jonathan G Rennison
7caebc2a77
Avoid aircraft leaving the state machine in the event of a breakdown.
...
This can result in airport state machine blocks being left
erroneously occupied, blocking the airport.
2016-03-22 22:08:26 +00:00
Jonathan G Rennison
6890e0af35
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
2016-02-01 00:21:57 +00:00
Jonathan G Rennison
5b2dc8bcd8
Fix vehicle needs repair speed limits being incorrect in vehicle details.
2016-02-01 00:21:51 +00:00
Jonathan G Rennison
fe2277dfbc
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
...
# Conflicts:
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
2016-01-31 23:40:17 +00:00
Jonathan G Rennison
e03d97eab6
Improved breakdowns: Fix string parameter count issues.
...
Fix whitespace.
2016-01-31 23:24:17 +00:00
Jonathan G Rennison
5eed9865d6
Improved breakdowns: Various changes and fixes.
...
* Revert breakdown_chance to (mostly) its original behaviour.
* Create a new breakdown_chance_factor to hold breakdown_chance
from improved breakdowns logic.
* Revert airport crash probabilities back to original behaviour, with
modified behaviour only during emergency landings.
* Low power breakdowns now only reduce the power of the engine which
has broken down.
* Low power breakdowns no longer reduce speed directly.
* Add callback function to run whenever improved breakdowns setting
is changed. Reset breakdown_chance_factor where required.
* More whitespace/formatting...
2016-01-31 22:55:25 +00:00
Jonathan G Rennison
9742300a1e
Fix some more whitespace/formatting issues.
2016-01-31 15:22:46 +00:00
Jonathan G Rennison
1678415aff
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
...
Update feature version.
2016-01-18 23:05:11 +00:00
Jonathan G Rennison
5e924262f4
Fix speed reduction after critical breakdowns.
...
Previous code set vcache.cached_max_speed directly (and incorrectly),
which did not survive across save/load or network joins.
Instead add a struct Train field to store the number
of critical breakdowns since last service and do the speed reduction
properly in Train::ConsistChanged.
Slightly tweak algorithm for speed reduction.
2016-01-18 18:27:51 +00:00
Jonathan G Rennison
417f51db8a
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
2016-01-08 18:26:52 +00:00
Jonathan G Rennison
b652d1c42a
Limit low speed breakdowns to lower of 1/4 max speed or 28km/h.
2016-01-07 23:04:12 +00:00
Jonathan G Rennison
6ffb9c24c5
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
2015-12-15 00:01:49 +00:00
Jonathan G Rennison
3ee8c76fa8
Fix desync caused by "train too heavy" advice message.
...
_current_company was changed in an unsafe and non-deterministic way.
2015-12-15 00:01:32 +00:00
Jonathan G Rennison
cc79a4d0f8
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
2015-09-27 23:17:58 +01:00
Jonathan G Rennison
eed722c777
Improved breakdowns: Remove non-deterministic changes to breakdown_chance.
...
These cause desyncs in multiplayer.
2015-09-27 23:16:43 +01:00
Jonathan G Rennison
44ecaaff01
Improved breakdowns: Fix smoke persisting long after vehicles have gone.
...
Fix animation_state not being set for limited speed/power breakdowns,
such that the smoke lasted for a randomly long amount of time,
instead show a short burst of smoke.
Fix smoke for limited speed/power breakdowns only being shown 1/32 of
the time.
Make sure that a breakdown has non-zero delay before showing smoke.
2015-09-09 21:58:18 +01:00
Jonathan G Rennison
4c506a8fc8
Fix EF_NO_BREAKDOWN_SMOKE vehicle flag being ignored.
...
This is due to a bad merge/import in commit
9f5164b403
2015-09-09 21:25:38 +01:00
Jonathan G Rennison
876a21b3c1
Fix indentation/whitespace issues in breakdown code.
2015-09-07 00:54:46 +01:00
Jonathan G Rennison
1ead315e42
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
2015-08-15 23:39:45 +01:00
Jonathan G Rennison
0650568aee
Improved breakdowns: Fix setting string being in the middle of a string range.
...
Looking at or selecting the gui.stop_location setting triggered
an assertion failure.
Move the string out of the setting range.
2015-08-15 23:39:35 +01:00
Jonathan G Rennison
6d695a1426
Merge branch 'master' into improved_breakdowns
2015-08-15 23:34:48 +01:00
translators
8cfc1e9d23
(svn r27386) -Update from WebTranslator v3.0:
...
dutch - 3 changes by TheTycoonist
2015-08-14 17:45:16 +00:00
rubidium
3b8aabdd9e
(svn r27385) -Fix: compilation failure due #define-ing enum name of a system library before including the system library
2015-08-13 18:13:24 +00:00
translators
70322bce59
(svn r27384) -Update from WebTranslator v3.0:
...
catalan - 35 changes by juanjo
2015-08-13 17:45:15 +00:00
rubidium
8f711aca53
(svn r27383) -Fix: win32 sound driver would not catch the exception due to constness difference
2015-08-12 20:50:10 +00:00
michi_cc
f4cd0198f4
(svn r27382) -Add: [Win32] Project files for Visual Studio 2015.
2015-08-10 20:36:57 +00:00
michi_cc
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
2015-08-10 20:24:13 +00:00
michi_cc
0cd198c798
(svn r27380) -Fix: [Win32] Compilation with MSVC2015.
2015-08-10 20:21:29 +00:00
frosch
63aa9f4ea8
(svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode.
2015-08-10 20:04:31 +00:00
alberth
438d7a26cc
(svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum.
2015-08-10 10:04:14 +00:00
Jonathan G Rennison
15f3abf47d
Fix typo in save/load ext feature enum name for improved breakdown.
2015-08-09 23:58:24 +01:00
rubidium
eb4b6a08d0
(svn r27377) -Codechange: use the pkg-config files of ICU as well. Since they are split into separate libraries it becomes possible to split RTL support for natural sorting, although the effect will be minimal
2015-08-09 13:54:17 +00:00
rubidium
cc5b8ea6cb
(svn r27376) -Codechange: let libtimidity detection and configuration make use of pkg-config
2015-08-09 12:43:52 +00:00
rubidium
2011c24502
(svn r27375) -Fix-ish: update help parameter for png configuration (it has used pkg-config for a long time)
2015-08-09 12:42:52 +00:00
rubidium
36f77b1aa7
(svn r27374) -Codechange: make zlib detection and configuration make use of pkg-config
2015-08-09 12:42:21 +00:00
rubidium
c3715a025d
(svn r27373) -Codechange: make sdl detection and configuration use pkg-config
2015-08-09 12:41:54 +00:00
rubidium
f05d71a9a6
(svn r27372) -Codechange: make allegro detection and configuration use pkg-config
2015-08-09 12:41:35 +00:00
rubidium
f179a92007
(svn r27371) -Codechange: make freetype detection and configuration use pkg-config
2015-08-09 12:41:12 +00:00
rubidium
2aee2899e8
(svn r27370) -Codechange: move the "dedicated server" check into the pkg-config check routine
2015-08-09 12:40:17 +00:00
rubidium
a08d1a044f
(svn r27369) -Cleanup: there's no need to do dependency checking of libraries in OpenTTD; zlib should always be installed if libpng is because it links to zlib
2015-08-09 12:39:26 +00:00
rubidium
625bc2e0e7
(svn r27368) -Cleanup: undo the special case of OSX; it works fine without it
2015-08-09 12:37:20 +00:00
rubidium
ee700fd3b1
(svn r27367) -Codechange: make a distinction between the layouting part of ICU (lx) or the sorting/collation part of ICU (i18n)
2015-08-09 12:33:27 +00:00
frosch
9f72662ecc
(svn r27366) -Fix [FS#6358]: Clickareas in settings tree were misaligned when the filter warning was displayed, if the setting height was defined by the icons instead of the font.
2015-08-09 10:22:51 +00:00
frosch
c9120cd714
(svn r27365) -Fix: Center settings filter warning also vertically, and also in case of multiple lines.
2015-08-09 10:21:06 +00:00
translators
a9200aa69a
(svn r27364) -Update from WebTranslator v3.0:
...
czech - 1 changes by Eskymak
dutch - 12 changes by TheTycoonist
2015-08-08 17:45:27 +00:00
alberth
894f69e1fd
(svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs.
2015-08-08 13:19:38 +00:00
alberth
48485a6a5a
(svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods.
2015-08-08 10:06:24 +00:00
rubidium
bc199a4fe1
(svn r27361) -Fix-ish: when attempting to find a host, try gcc/g++ but also CC/CXX appended to the host triple. This to make cross compilation with clang alone easier
2015-08-08 08:54:49 +00:00
rubidium
501ee2105a
(svn r27360) -Feature: allow configuring pkg-config in one go for all libraries
2015-08-08 08:52:21 +00:00
