e7f0902eaf
(svn r27511) -Update from Eints:
...
japanese: 4 changes by nex259
esperanto: 4 changes by polluks
9 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
9 years ago
83f6463a6f
Bump version, set semaphore/pbs/exit sig state on upgrade.
9 years ago
ab071f93b1
Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx
9 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.
9 years ago
7e4898ad42
Fix PBS reservation from bridge/tunnel exit when next tile not a junction.
9 years ago
35b93a42ac
Enable bridge/tunnel exit signals to be one-way PBS.
...
Add signal conversion support.
9 years ago
69c2cf352e
Fix drag-convert not updating bridge/tunnel direction correctly.
9 years ago
1a2b5e5172
Also draw signals for tunnel exits.
9 years ago
3861968765
Enable setting semaphore/electric type of signals on bridges/tunnels.
9 years ago
2b4dbf582a
Show tunnel/bridge exit signal facing correct way with correct colour.
9 years ago
a25ac7a161
Enable signals on bridges/tunnels to work with PBS.
9 years ago
9aaad3fa60
(svn r27510) -Update from Eints:
...
frisian: 55 changes by BAJansen
9 years ago
561c4c2f02
(svn r27509) -Update from Eints:
...
frisian: 60 changes by BAJansen
9 years ago
1e9ab8e64e
Template replacement usage of scope guard logging.
9 years ago
5dba89c783
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# source.list
# src/openttd.cpp
# src/stdafx.h
# src/vehicle.cpp
9 years ago
ae6e43c5fa
Initial uses of scope guard logging.
9 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.
9 years ago
e89efa8581
Add a function to test whether the current thread is the main thread.
9 years ago
48e4c35fdc
Add support for verbose asserts.
...
Use for test/exec DoCommand mismatches.
9 years ago
f86b5c58cb
Merge branch 'master' into crashlog_improvements
9 years ago
ead72b7753
Strip colour codes when writing debug msgs to terminal.
9 years ago
199c04fb44
Enable build and refit for template virtual trains.
9 years ago
0779c7b7a9
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/build_vehicle_gui.cpp
# src/saveload/afterload.cpp
9 years ago
f3e01f4c6d
Merge branch 'template_train_replacement' into template_train_replacement-sx
9 years ago
4f052d3cad
Fix clone template from vehicle validation for artic vehicles.
9 years ago
d688039a42
TBTR: Update template veh sprite IDs when loading savegame/GRFs.
9 years ago
77ca326997
TBTR: Fix main window in double scale mode, and misc alignment issues.
9 years ago
89aeb973f8
TBTR: Fix create window not being redrawn when selling vehs in MP.
9 years ago
5b6560b73b
TBTR: Handle template being deleted during edit.
9 years ago
98fc4493c8
TBTR: Delete duplicated build vehicle window.
...
Add a virtual train mode to the existing build vehicle window.
Simplify some of the inter-window notify logic.
Disable all buttons when a new template/edit is in progress.
9 years ago
9132707eb9
TBTR: Fix refitting of template vehicles failing.
...
Fix from KeldorKatarn's tree.
9 years ago
5850bcf699
TBTR: Fix crash and issues when using a no longer available engine type.
...
Show error messages when cloning a vehicle to a template
or virtual vehicle fails.
Handle failed clones gracefully.
Bypass engine availability check when doing a template edit action.
Show correct error message if template replacement fails for
a non-money reason.
9 years ago
d9a48a2b5e
TBTR: Raise clone buttons when vehicle pick aborted.
9 years ago
b87957c9db
Fix crash when attempting to refit template vehicle.
...
This is due to infra sharing tile ownership tests.
9 years ago
580b2f7584
Merge branch 'template_train_replacement-sx' into jgrpp
...
Remove a duplicated declaration.
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/group_gui.cpp
# src/lang/english.txt
# src/network/network_command.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/window_type.h
9 years ago
99509acd1d
Extended version info for TBTR.
9 years ago
671c12999e
Merge branch 'template_train_replacement' into template_train_replacement-sx
...
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
9 years ago
de7f1c1168
Show cost text effect and failure advice messages for TBTR replacement.
...
Minor whitespace/formatting changes.
9 years ago
7ae0c6de5a
Remove TBTR replace all files, they are not used.
9 years ago
a1d6c3ad64
Merge branch 'master' into save_ext
9 years ago
2258fdac3f
Disable new template refit button when no train.
9 years ago
a92268a25c
Attach reuse/refit/etc text to right edge of TBTR main window.
9 years ago
e8301b1bb1
Disable/enable buttons as selections change in TBTR main window.
9 years ago
b74790187a
Fix tbtr refit button crashing if new template window is empty.
9 years ago
faa72e9615
Only show template replacement menu item where sensible.
...
Fix drop-down not being sized for template replacement item to fit.
9 years ago
1ebd0af2c6
Only include TBTR debug functions when debugging enabled.
...
Add an initial prefix for clarity.
Fix log print format codes.
9 years ago
a31e7ac87d
Initial whitespace, formatting, file headers and NULL usage fixes.
9 years ago
6be2efc084
Update from KeldorKatarn branch
...
This approximately corresponds to 971ba4928a5c7c7916fea55d91a3b6dd5bba140c,
excluding the different virtual train build GUI, but including the basic
changes to the original train build GUI for multiplayer to work.
Fixup
9 years ago
1f5535c0b1
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
9 years ago
translators
Jonathan G Rennison