Commit Graph

23050 Commits

Author SHA1 Message Date
Heiko August
aee3b77d99 translate-de: translation for lifetime profit strings 2016-03-13 12:36:36 +00:00
Heiko August
af036f3c52 translate-de: translation for ship collision avoidance patch 2016-03-13 12:36:32 +00:00
Heiko August
aabecf3998 translate-de: add translation for repair cost patch 2016-03-13 12:36:27 +00:00
Heiko August
40985ccb44 translate-de: add first strings of restricted signals patch 2016-03-13 12:36:05 +00:00
Jonathan G Rennison
def24030a4 Merge branch 'crashlog_improvements' into jgrpp 2016-03-10 00:17:43 +00:00
Jonathan G Rennison
320233fc9b Fix VehiclePositionIsAllowed triggering assertions on virtual trains.
This fixes the bug where a bankruptcy/company reset when another
company owned a virtual train caused an assertion failure.
2016-03-10 00:15:52 +00:00
Jonathan G Rennison
910edffee0 Add scope info logging for HandleSharingCompanyDeletion. 2016-03-10 00:15:52 +00:00
Jonathan G Rennison
a609439d98 Add support for enhanced crash log stacktraces using gdb on Linux.
This attempts to use gdb to attach to the current process and print
a full backtrace.
2016-03-10 00:14:26 +00:00
Jonathan G Rennison
f82002cda2 Use likely/__builtin_expect for assertion macros. 2016-03-10 00:13:58 +00:00
Jonathan G Rennison
4e020d4aa2 Increase verbosity of tile_map.h assertions. 2016-03-10 00:10:34 +00:00
Jonathan G Rennison
49988b37b8 Merge branches 'tracerestrict-sx' and 'template_train_replacement-sx' into jgrpp 2016-03-08 19:33:00 +00:00
Jonathan G Rennison
ca9f6411cc Implement adding a vehicle list to a new group. 2016-03-08 19:27:03 +00:00
Jonathan G Rennison
ec65659baf Merge branch 'tracerestrict' into tracerestrict-sx 2016-03-08 19:22:51 +00:00
Jonathan G Rennison
1f7232631f Merge branch 'template_train_replacement' into template_train_replacement-sx 2016-03-08 19:22:17 +00:00
Jonathan G Rennison
cf638e836a TBTR: Clip drawing of template vehicles.
This fixes long templates running off the side of the window and/or
obscuring the train length text.
2016-03-08 19:22:00 +00:00
Jonathan G Rennison
4d94470d08 Update all tracerestrict windows when a restricted signal is removed.
This fixes share counts in any open windows sharing the same program
not being updated.
2016-03-08 19:20:55 +00:00
Jonathan G Rennison
8dc76b0044 Be more strict checking for space in program pool in mgmt actions. 2016-03-03 19:14:10 +00:00
Jonathan G Rennison
2d8fa15f06 Version: Committing version data for tag: jgrpp-0.12.0 2016-03-02 23:19:50 +00:00
Jonathan G Rennison
c0cc72ad96 Implement change timetable waiting time for all stations.
Loosely based on http://www.tt-forums.net/viewtopic.php?f=32&t=50274
2016-03-02 22:36:21 +00:00
Jonathan G Rennison
57cbecb0e0 Merge branch 'master' into jgrpp 2016-03-02 21:44:58 +00:00
Jonathan G Rennison
26fa77c5ee Run animations at the normal rate regardless of day length factor. 2016-03-02 18:36:53 +00:00
Jonathan G Rennison
0ab20d7f5c Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2016-03-01 21:32:33 +00:00
Jonathan G Rennison
83c2103895 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2016-03-01 21:32:23 +00:00
Jonathan G Rennison
dd7f5dca71 Fix route step lines not being updated when cloning a vehicle's orders. 2016-03-01 21:31:17 +00:00
Jonathan G Rennison
5d42d07988 Merge branch 'tracerestrict-sx' into jgrpp 2016-03-01 20:55:19 +00:00
Jonathan G Rennison
df2a1b1bcd Merge branch 'tracerestrict' into tracerestrict-sx 2016-03-01 20:54:28 +00:00
Jonathan G Rennison
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.
2016-03-01 20:54:03 +00:00
frosch
fbd79d88f0 (svn r27518) -Update: Numbers 2016-03-01 20:00:22 +00:00
frosch
a8b5756718 (svn r27516) -Update: Documentation 2016-03-01 19:41:31 +00:00
translators
8284c69a61 (svn r27515) -Update from Eints:
polish: 1 change by lion
thai: 11 changes by ityellow
2016-03-01 18:45:37 +00:00
translators
815fce8bd9 (svn r27514) -Update from Eints:
turkish: 2 changes by wakeup
2016-02-28 18:45:36 +00:00
translators
4a64ced9b5 (svn r27513) -Update from Eints:
spanish: 5 changes by SilverSurferZzZ
2016-02-26 18:45:36 +00:00
Jonathan G Rennison
7bc407e2f8 Merge branch 'infrastructure_sharing-sx' into jgrpp
# Conflicts:
#	src/settings_type.h
#	src/table/settings.ini
2016-02-25 22:31:36 +00:00
Jonathan G Rennison
4722c81e88 Merge branch 'crashlog_improvements' into jgrpp 2016-02-25 22:27:55 +00:00
Jonathan G Rennison
1818a83e63 Add setting to control whether trains can crash with other companies'. 2016-02-25 22:08:27 +00:00
Jonathan G Rennison
66bac3808e Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx 2016-02-25 19:49:58 +00:00
Jonathan G Rennison
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.
2016-02-25 19:21:06 +00:00
translators
d9da47f913 (svn r27512) -Update from Eints:
spanish: 6 changes by SilverSurferZzZ
2016-02-25 18:45:36 +00:00
Jonathan G Rennison
495aa729df Fix VehicleCargoList::Truncate when not all cargo is MTA_KEEP. 2016-02-25 18:39:04 +00:00
Jonathan G Rennison
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.
2016-02-25 00:20:31 +00:00
translators
e7f0902eaf (svn r27511) -Update from Eints:
japanese: 4 changes by nex259
esperanto: 4 changes by polluks
2016-02-24 18:45:38 +00:00
Jonathan G Rennison
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
2016-02-21 12:16:11 +00:00
Jonathan G Rennison
83f6463a6f Bump version, set semaphore/pbs/exit sig state on upgrade. 2016-02-21 12:11:25 +00:00
Jonathan G Rennison
ab071f93b1 Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx 2016-02-21 12:11:22 +00:00
Jonathan G Rennison
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.
2016-02-21 12:09:50 +00:00
Jonathan G Rennison
7e4898ad42 Fix PBS reservation from bridge/tunnel exit when next tile not a junction. 2016-02-21 02:00:52 +00:00
Jonathan G Rennison
35b93a42ac Enable bridge/tunnel exit signals to be one-way PBS.
Add signal conversion support.
2016-02-20 23:49:06 +00:00
Jonathan G Rennison
69c2cf352e Fix drag-convert not updating bridge/tunnel direction correctly. 2016-02-20 23:45:21 +00:00
Jonathan G Rennison
1a2b5e5172 Also draw signals for tunnel exits. 2016-02-20 23:45:07 +00:00
Jonathan G Rennison
3861968765 Enable setting semaphore/electric type of signals on bridges/tunnels. 2016-02-20 23:44:21 +00:00