57cbecb0e0
Merge branch 'master' into jgrpp
8 years ago
26fa77c5ee
Run animations at the normal rate regardless of day length factor.
8 years ago
0ab20d7f5c
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
8 years ago
83c2103895
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
8 years ago
dd7f5dca71
Fix route step lines not being updated when cloning a vehicle's orders.
8 years ago
5d42d07988
Merge branch 'tracerestrict-sx' into jgrpp
8 years ago
df2a1b1bcd
Merge branch 'tracerestrict' into tracerestrict-sx
8 years ago
1bb3024534
Fix unreserving through a green PBS signal not setting the state to red.
...
This also had the side effect of failed reservation attempts through
a reserve-through signal leaving the signal erroneously set to green.
8 years ago
fbd79d88f0
(svn r27518) -Update: Numbers
8 years ago
a8b5756718
(svn r27516) -Update: Documentation
8 years ago
8284c69a61
(svn r27515) -Update from Eints:
...
polish: 1 change by lion
thai: 11 changes by ityellow
8 years ago
815fce8bd9
(svn r27514) -Update from Eints:
...
turkish: 2 changes by wakeup
8 years ago
4a64ced9b5
(svn r27513) -Update from Eints:
...
spanish: 5 changes by SilverSurferZzZ
8 years ago
7bc407e2f8
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
# Conflicts:
# src/settings_type.h
# src/table/settings.ini
8 years ago
4722c81e88
Merge branch 'crashlog_improvements' into jgrpp
8 years ago
1818a83e63
Add setting to control whether trains can crash with other companies'.
8 years ago
66bac3808e
Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx
8 years ago
cbc35e8aae
Try to make scope info logging more robust.
...
Add checks for validity of Vehicle ptrs in scope_dumper::VehicleInfo.
In Unix mode, try to handle SIGSEGVs when dumping scope info.
8 years ago
d9da47f913
(svn r27512) -Update from Eints:
...
spanish: 6 changes by SilverSurferZzZ
8 years ago
495aa729df
Fix VehicleCargoList::Truncate when not all cargo is MTA_KEEP.
8 years ago
0062881a46
Avoid using malloc in scope guard logger.
...
Use a temporary object with its own buffer, which lives on the stack.
Reformat SCOPE_INFO_FMT to not be all on one line.
Other minor reformatting.
8 years ago
e7f0902eaf
(svn r27511) -Update from Eints:
...
japanese: 4 changes by nex259
esperanto: 4 changes by polluks
8 years ago
d08b162119
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/signal.cpp
# src/train_cmd.cpp
8 years ago
83f6463a6f
Bump version, set semaphore/pbs/exit sig state on upgrade.
8 years ago
ab071f93b1
Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx
8 years ago
891fd08e9d
Handle case where a non-PBS tun/bridge exit is followed by a PBS signal.
...
Prevent the entrance being reserved if an attempt is made to reverse
on the exit tile.
8 years ago
7e4898ad42
Fix PBS reservation from bridge/tunnel exit when next tile not a junction.
8 years ago
35b93a42ac
Enable bridge/tunnel exit signals to be one-way PBS.
...
Add signal conversion support.
8 years ago
69c2cf352e
Fix drag-convert not updating bridge/tunnel direction correctly.
8 years ago
1a2b5e5172
Also draw signals for tunnel exits.
8 years ago
3861968765
Enable setting semaphore/electric type of signals on bridges/tunnels.
8 years ago
2b4dbf582a
Show tunnel/bridge exit signal facing correct way with correct colour.
8 years ago
a25ac7a161
Enable signals on bridges/tunnels to work with PBS.
8 years ago
9aaad3fa60
(svn r27510) -Update from Eints:
...
frisian: 55 changes by BAJansen
8 years ago
561c4c2f02
(svn r27509) -Update from Eints:
...
frisian: 60 changes by BAJansen
8 years ago
1e9ab8e64e
Template replacement usage of scope guard logging.
8 years ago
5dba89c783
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# source.list
# src/openttd.cpp
# src/stdafx.h
# src/vehicle.cpp
8 years ago
ae6e43c5fa
Initial uses of scope guard logging.
8 years ago
5cf2b04f6a
Initial implementation of scope guard logging for including in crash logs.
...
This adds a mechanism to create scope guards with an associated std::function
which is called to output diagnostic info in the event of a crash.
Add a macro to make it easy to efficiently capture variables on the stack
and output a formatted message.
Requires C++11, #ifdefed out for legacy compilers.
8 years ago
e89efa8581
Add a function to test whether the current thread is the main thread.
8 years ago
48e4c35fdc
Add support for verbose asserts.
...
Use for test/exec DoCommand mismatches.
8 years ago
f86b5c58cb
Merge branch 'master' into crashlog_improvements
8 years ago
ead72b7753
Strip colour codes when writing debug msgs to terminal.
8 years ago
199c04fb44
Enable build and refit for template virtual trains.
8 years ago
0779c7b7a9
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/build_vehicle_gui.cpp
# src/saveload/afterload.cpp
8 years ago
f3e01f4c6d
Merge branch 'template_train_replacement' into template_train_replacement-sx
8 years ago
4f052d3cad
Fix clone template from vehicle validation for artic vehicles.
8 years ago
d688039a42
TBTR: Update template veh sprite IDs when loading savegame/GRFs.
8 years ago
77ca326997
TBTR: Fix main window in double scale mode, and misc alignment issues.
8 years ago
89aeb973f8
TBTR: Fix create window not being redrawn when selling vehs in MP.
8 years ago
Jonathan G Rennison
frosch
translators