translators
f95759139b
(svn r27359) -Update from WebTranslator v3.0:
...
swedish - 1 changes by planetmaker
2015-08-07 17:45:12 +00:00
translators
ccad47f6dd
(svn r27359) -Update from WebTranslator v3.0:
...
swedish - 1 changes by planetmaker
2015-08-07 17:45:12 +00:00
Jonathan G Rennison
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
2015-08-06 23:11:49 +01:00
Jonathan G Rennison
b3ebb1f729
Infrastructure sharing patch: save/load changes.
2015-08-06 23:02:47 +01:00
Jonathan G Rennison
037cce3b38
Merge branch 'save_ext' into infrastructure_sharing-sx
...
Conflicts:
src/saveload/saveload.cpp
2015-08-06 23:01:01 +01:00
Jonathan G Rennison
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
2015-08-06 22:55:09 +01:00
patch-import
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
2015-08-06 22:24:28 +01:00
Jonathan G Rennison
44ed3cb3bd
Merge branch 'town-rating-label' into jgrpp
...
Conflicts:
src/lang/english.txt
src/town_cmd.cpp
2015-08-06 01:25:11 +01:00
patch-import
33d395ad59
Import town rating label patch
...
http://www.tt-forums.net/viewtopic.php?p=1118282#p1118282
2015-08-06 00:19:40 +01:00
Jonathan G Rennison
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
2015-08-05 21:54:11 +01:00
Jonathan G Rennison
44d3c84a11
Save/load changes for enhanced viewport patch: plans.
2015-08-05 21:33:47 +01:00
Jonathan G Rennison
174779e371
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
...
Conflicts:
src/saveload/saveload.cpp
2015-08-05 21:31:57 +01:00
Jonathan G Rennison
03b6c41c67
Add shorthand flag in SlxiSubChunkFlags for XSCF_IGNORABLE_UNKNOWN | XSCF_IGNORABLE_VERSION.
2015-08-05 21:31:17 +01:00
Jonathan G Rennison
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
2015-08-05 21:25:13 +01:00
patch-import
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
2015-08-05 21:24:30 +01:00
Jonathan G Rennison
20e2f363f1
Merge branch 'vehicle_repair_costs-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_type.h
2015-08-04 23:59:12 +01:00
Jonathan G Rennison
6bb8d5087d
Vehicle repair costs patch: implement save/load changes.
2015-08-04 23:56:37 +01:00
Jonathan G Rennison
0a7441e56c
Merge branch 'save_ext' into vehicle_repair_costs-sx
...
Conflicts:
src/saveload/saveload.cpp
src/settings_gui.cpp
2015-08-04 23:56:05 +01:00
Jonathan G Rennison
938babfe7b
Vehicle repair costs patch: whitespace fixes.
2015-08-04 23:39:02 +01:00
patch-import
7537ae2a7e
Import vehicle repair costs patch
...
Strip trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1093268#p1093268
2015-08-04 23:38:35 +01:00
Jonathan G Rennison
7a3fb02d5a
Merge branch 'house_placing' into jgrpp
2015-08-04 22:29:55 +01:00
Jonathan G Rennison
3ec3842ad4
Fix town_gui.h header file not being in imported diff
...
Use copy from http://www.tt-forums.net/viewtopic.php?p=1099696#p1099696
2015-08-04 22:29:16 +01:00
Jonathan G Rennison
ba4e5dd62f
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_gui.cpp
src/vehicle.cpp
2015-08-04 22:08:59 +01:00
Jonathan G Rennison
2e45dac18a
Auto timetables patch: save/load changes, document rationale for
...
moving addition to VehicleFlags
2015-08-04 22:07:02 +01:00
Jonathan G Rennison
33854a138f
Merge branch 'save_ext' into auto_timetables-sx
2015-08-04 21:30:30 +01:00
Jonathan G Rennison
0ebf8b6b0b
Fixes to auto timetable patch: move new VehicleFlags to end,
...
whitespace & style, fix lang strings.
2015-08-04 21:29:19 +01:00
patch-import
80deb3c01d
Import auto timetable separation patch
...
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
2015-08-04 21:27:23 +01:00
Jonathan G Rennison
163423e7b5
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
2015-08-04 19:16:37 +01:00
Jonathan G Rennison
a38c98d10a
Bump SLXI tracerestrict version due to PBS entry and PF penalty new features.
2015-08-04 19:15:54 +01:00
Jonathan G Rennison
c4565f6bb0
Merge branch 'tracerestrict' into tracerestrict-sx
2015-08-04 19:14:57 +01:00
Jonathan G Rennison
76707fb72a
Change pf penalty restriction value button to preset values and a custom option.
...
Preset values are 'small', 'medium' and 'large'.
Change default to 'small' preset.
2015-08-04 19:09:40 +01:00
Jonathan G Rennison
c7f4b3fe6f
Merge branch 'smallmap-screenshot' into jgrpp
2015-08-04 02:03:31 +01:00
Jonathan G Rennison
948b4e1d5e
Implement taking smallmap screenshots.
...
This is largely based on this patch:
http://www.tt-forums.net/viewtopic.php?p=849533#p849533
with the following changes:
* this uses a button in the smallmap window instead of a console command
* screenshot now uses zoom level and mode of smallmap window
2015-08-04 01:26:32 +01:00
Jonathan G Rennison
ce34225b0e
Merge branch 'house_placing' into jgrpp
2015-08-03 21:29:22 +01:00
patch-import
19dcbb1cb9
Import Picking and placing single houses in scenario editor patch
...
Minor whitespace fixes
http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
2015-08-03 21:29:13 +01:00
Jonathan G Rennison
675993805b
Merge branch 'tracerestrict-sx' into jgrpp
2015-08-03 20:41:00 +01:00
Jonathan G Rennison
09f8ff420f
Merge branch 'tracerestrict' into tracerestrict-sx
...
Conflicts:
src/tracerestrict_gui.cpp
2015-08-03 20:40:42 +01:00
Jonathan G Rennison
a0520b8937
Initial implementation of PBS entry signal condition variable.
...
TODO: see how the efficiency of this can be improved.
2015-08-03 20:28:42 +01:00
Jonathan G Rennison
116bd41101
Initial support for multi-item instructions.
...
This involves various changes to instruction modification actions,
and the GUI code.
2015-08-03 20:03:42 +01:00
Jonathan G Rennison
e4ccea350b
Merge branch 'wait_in_depot-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
2015-08-03 01:12:16 +01:00
Jonathan G Rennison
1fbd4a9d1d
Timetable wait in depot: Add info to SLXI chunk.
2015-08-03 01:10:22 +01:00
Jonathan G Rennison
a3b0057011
Merge branch 'save_ext' into wait_in_depot-sx
2015-08-03 01:07:51 +01:00
Jonathan G Rennison
2f9ebebf02
Merge branch 'master' into wait_in_depot
2015-08-03 01:06:55 +01:00
Jonathan G Rennison
4d1c4d18be
Timetable wait in depot: minor whitespace/style changes.
2015-08-03 01:06:42 +01:00
patch-import
d8c5de188f
Import timetabling wait time in depots patch
...
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
2015-08-03 01:06:12 +01:00
Jonathan G Rennison
a2eac188de
Merge branches 'save_ext', 'tracerestrict-sx', 'departure-boards-sx', 'town_cargo_adj-sx', 'signal_tunnels_bridges-sx', 'adjacent_crossings-sx' and 'progsig-sx' into jgrpp
2015-08-03 00:39:01 +01:00
Jonathan G Rennison
bc8b2d9826
Merge branch 'save_ext' into tracerestrict-sx
2015-08-03 00:14:51 +01:00
Jonathan G Rennison
77ec2aac58
Merge branch 'save_ext' into progsig-sx
2015-08-03 00:14:12 +01:00
Jonathan G Rennison
8fe9a7430c
Merge branch 'save_ext' into departure-boards-sx
2015-08-03 00:12:38 +01:00
Jonathan G Rennison
012ce322d5
Merge branch 'save_ext' into town_cargo_adj-sx
2015-08-03 00:12:21 +01:00
