bd10b0fb0b
Merge branch 'departure-boards-sx' into jgrpp
9 years ago
365f1c237f
Merge branch 'auto_timetables-sx' into jgrpp
9 years ago
d5f9709c56
Merge branch 'departure-boards' into departure-boards-sx
9 years ago
1795fb5953
Fix departure boards with orders with timetabled 0 travel times,
...
e.g. those with depot service orders.
9 years ago
346cebab43
Merge branch 'master' into departure-boards
9 years ago
f820bbe0c5
Merge branch 'auto_timetables' into auto_timetables-sx
9 years ago
d24f7763cc
Fix auto timetable separation to handle non-station orders sensibly.
9 years ago
34e41a2e26
Timetable GUI: Allow clearing of timetable time fields which are at 0.
...
Allow explicitly setting timetable time fields to 0 without clearing them.
9 years ago
15c2327fd4
Merge branch 'master' into auto_timetables
9 years ago
9565e5b9b1
Merge branch 'day_length-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/timetable_cmd.cpp
9 years ago
41062cf78e
Save/load changes for variable day length patch.
9 years ago
454b3c61b0
Merge branch 'save_ext' into day_length-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
45d060f46f
Day length patch: minor tweak to timetable lateness calculation.
...
_date_fract should also be multiplied by day length factor.
9 years ago
d70dbda351
Merge branch 'master' into day_length
9 years ago
e0bc6e0cf6
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
a48652ac6f
Merge branch 'save_ext' into tracerestrict-sx
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
9 years ago
316b3a4acc
Merge branch 'master' into save_ext
9 years ago
d86a56cbef
Import day length patch
...
Minor whitespace fixes.
http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
9 years ago
a9200aa69a
(svn r27364) -Update from WebTranslator v3.0:
...
czech - 1 changes by Eskymak
dutch - 12 changes by TheTycoonist
9 years ago
894f69e1fd
(svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs.
9 years ago
48485a6a5a
(svn r27362) -Codechange: Codestyle fixes for reference var declarations, static cast type, operator methods.
9 years ago
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
9 years ago
501ee2105a
(svn r27360) -Feature: allow configuring pkg-config in one go for all libraries
9 years ago
135d159fc1
Merge branch 'infrastructure_sharing-sx' into jgrpp
9 years ago
e1defe24c7
Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx
...
Conflicts:
src/table/settings.ini
9 years ago
65b1586f98
Infra sharing: Fix sharing fee settings not being shown as currency.
...
Settings were shown as (invalid string).
Fix water/dock sharing fee setting using wrong string.
9 years ago
6c971f9a55
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
9 years ago
8386cc3c1b
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
9 years ago
5540374227
Enhanced viewports: Fix crash when looking at aqueducts in viewport map mode.
...
Don't use water tile accessors on aqueduct bridge heads.
9 years ago
6d6d2f2f0a
Merge branches 'town-rating-label', 'departure-boards-sx', 'infrastructure_sharing-sx' and 'improved_breakdowns-sx' into jgrpp
9 years ago
bde8f04f73
Town rating label: Fix viewport tiny strings having wrong colour for
...
"very good" and "excellent" ratings.
9 years ago
b7f1019dc7
Merge branch 'master' into town-rating-label
...
Conflicts:
src/town_cmd.cpp
9 years ago
84f9274640
Merge branch 'save_ext' into departure-boards-sx
9 years ago
0055e283f1
Merge branch 'save_ext' into improved_breakdowns-sx
9 years ago
2f8d330307
Merge branch 'save_ext' into infrastructure_sharing-sx
9 years ago
e30d7c2164
Save/load ext: Fix SlXvSetCurrentState being called before AfterLoadGame().
9 years ago
f95759139b
(svn r27359) -Update from WebTranslator v3.0:
...
swedish - 1 changes by planetmaker
9 years ago
4c6dc11c16
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/signal.cpp
src/table/settings.ini
src/vehicle.cpp
9 years ago
b3ebb1f729
Infrastructure sharing patch: save/load changes.
9 years ago
037cce3b38
Merge branch 'save_ext' into infrastructure_sharing-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
a4ad4130a6
Merge branch 'master' into infrastructure_sharing
...
Conflicts:
src/aircraft_cmd.cpp
src/economy.cpp
src/lang/english.txt
src/order_gui.cpp
src/roadveh_cmd.cpp
src/saveload/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/train_cmd.cpp
9 years ago
ee791055f9
Import infrastructure sharing patch
...
Strip trailing whitespace
Remove a leftover line form settings.ini
http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
44ed3cb3bd
Merge branch 'town-rating-label' into jgrpp
...
Conflicts:
src/lang/english.txt
src/town_cmd.cpp
9 years ago
33d395ad59
Import town rating label patch
...
http://www.tt-forums.net/viewtopic.php?p=1118282#p1118282
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
44d3c84a11
Save/load changes for enhanced viewport patch: plans.
9 years ago
174779e371
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
03b6c41c67
Add shorthand flag in SlxiSubChunkFlags for XSCF_IGNORABLE_UNKNOWN | XSCF_IGNORABLE_VERSION.
9 years ago
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
Jonathan G Rennison
patch-import
translators
alberth
rubidium