dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,001 Commits 1 Branch 0 Tags
43f847cebb71bd9403301e48475f222d40fe8ba3
Commit Graph

3992 Commits

Author SHA1 Message Date
Jonathan G Rennison
072915f2c7 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape_grid.html
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
 2017-02-05 20:43:56 +00:00
Jonathan G Rennison
9782d70c53 Merge branch 'house_placing' into jgrpp 
# Conflicts:
#	src/lang/korean.txt
 2017-02-05 19:05:09 +00:00
Jonathan G Rennison
e97a393a0f Merge branch 'master' into house_placing 2017-02-05 19:00:22 +00:00
Jonathan G Rennison
1f727e9029 Custom bridge heads: Add savegame version and setting. 2017-02-05 18:01:31 +00:00
translators
31d4b1e8d6 (svn r27742) -Update from Eints: 
spanish (mexican): 1 change by Absay
 2017-02-03 18:45:39 +00:00
translators
0fc88ade9f (svn r27741) -Update from Eints: 
luxembourgish: 26 changes by Phreeze
russian: 1 change by Lone_Wolf
 2017-01-26 18:45:36 +00:00
translators
cd18f2c10c (svn r27740) -Update from Eints: 
korean: 1 change by telk5093
 2017-01-25 18:45:36 +00:00
translators
3245922407 (svn r27738) -Update from Eints: 
croatian: 1 change by VoyagerOne
 2017-01-20 18:45:37 +00:00
translators
1d6f3fda80 (svn r27737) -Update from Eints: 
czech: 27 changes by djst
 2017-01-18 18:45:37 +00:00
Jonathan G Rennison
f5e4d8e73a Merge branch 'master' into tracerestrict 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
 2017-01-17 19:20:46 +00:00
Jonathan G Rennison
90cd312428 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios.h
 2017-01-17 19:11:09 +00:00
translators
2335acdc16 (svn r27736) -Update from Eints: 
italian: 1 change by lorenzodv
 2017-01-16 18:45:36 +00:00
translators
140bb8409a (svn r27735) -Update from Eints: 
catalan: 1 change by juanjo
 2017-01-15 18:45:39 +00:00
Jonathan G Rennison
42a4bd63e0 Adjust setting texts for pay for repair, and move within settings GUI. 2017-01-15 01:06:26 +00:00
frosch
050271ed2d (svn r27732) -Change: Turn the message about 'missing baseset sprites' from a popup into a static message that only shows in non-release versions, just like the 'missing translations' message. 2017-01-14 18:30:26 +00:00
translators
9f858cefd1 (svn r27728) -Update from Eints: 
latin: 1 change by Supercheese
 2017-01-08 18:45:37 +00:00
translators
43ee8e8d38 (svn r27720) -Update from Eints: 
turkish: 25 changes by barisdemirdelen
 2017-01-07 18:45:37 +00:00
Jonathan G Rennison
d361120fa0 Merge branch 'master' into jgrpp 2017-01-05 22:42:51 +00:00
Jonathan G Rennison
dcbde21f18 Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/train_cmd.cpp
 2017-01-02 18:13:45 +00:00
translators
12d17ed62b (svn r27719) -Update from Eints: 
polish: 25 changes by nouwak
 2016-12-31 18:45:36 +00:00
translators
a8496153d6 (svn r27718) -Update from Eints: 
spanish (mexican): 25 changes by Absay
 2016-12-30 18:45:38 +00:00
translators
151956d471 (svn r27717) -Update from Eints: 
spanish: 2 changes by SilverSurferZzZ
 2016-12-29 18:45:38 +00:00
translators
9bbc6e7ab5 (svn r27716) -Update from Eints: 
catalan: 1 change by juanjo
 2016-12-27 18:45:39 +00:00
translators
db6e65f4f3 (svn r27715) -Update from Eints: 
spanish: 2 changes by SilverSurferZzZ
 2016-12-26 18:45:38 +00:00
Jonathan G Rennison
5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp 
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
 2016-12-26 15:38:56 +00:00
Jonathan G Rennison
0d1e08ed75 Merge branch 'save_ext' into enhanced_viewport_overlay 
# Conflicts:
#	src/clear_cmd.cpp
 2016-12-26 15:35:01 +00:00
translators
1c7e978b09 (svn r27714) -Update from Eints: 
catalan: 2 changes by juanjo
russian: 1 change by Lone_Wolf
 2016-12-25 18:45:37 +00:00
translators
c917ed2112 (svn r27708) -Update from Eints: 
catalan: 26 changes by juanjo
russian: 9 changes by Lone_Wolf
 2016-12-24 18:45:38 +00:00
translators
2507487877 (svn r27704) -Update from Eints: 
welsh: 29 changes by kazzie
spanish: 2 changes by SilverSurferZzZ
russian: 13 changes by Lone_Wolf
 2016-12-22 18:45:38 +00:00
translators
6de1225894 (svn r27702) -Update from Eints: 
russian: 16 changes by Lone_Wolf
 2016-12-21 18:45:40 +00:00
translators
ca65ea003d (svn r27701) -Update from Eints: 
russian: 37 changes by Lone_Wolf
 2016-12-20 18:45:37 +00:00
translators
be21109989 (svn r27699) -Update from Eints: 
russian: 1 change by Lone_Wolf
 2016-12-19 18:45:38 +00:00
translators
2171a56c15 (svn r27698) -Update from Eints: 
spanish: 3 changes by SilverSurferZzZ
russian: 3 changes by Lone_Wolf
 2016-12-18 18:45:38 +00:00
translators
37b6bd5702 (svn r27697) -Update from Eints: 
urdu: 9 changes by siphr
spanish: 3 changes by SilverSurferZzZ
 2016-12-17 18:45:36 +00:00
translators
5d5d020103 (svn r27696) -Update from Eints: 
urdu: 11 changes by siphr
spanish: 6 changes by SilverSurferZzZ
russian: 10 changes by Lone_Wolf
 2016-12-16 18:45:36 +00:00
translators
8a41b36cd8 (svn r27695) -Update from Eints: 
spanish: 4 changes by SilverSurferZzZ
french: 26 changes by glx
 2016-12-14 18:45:37 +00:00
translators
1808557b45 (svn r27694) -Update from Eints: 
spanish: 4 changes by SilverSurferZzZ
 2016-12-13 18:45:35 +00:00
Jonathan G Rennison
cea0d42548 Merge branch 'master' into jgrpp 2016-12-12 19:21:33 +00:00
translators
01059a7f75 (svn r27693) -Update from Eints: 
korean: 2 changes by telk5093
spanish: 21 changes by SilverSurferZzZ
russian: 14 changes by Lone_Wolf
 2016-12-12 18:45:37 +00:00
translators
3f78d271b2 (svn r27692) -Update from Eints: 
croatian: 25 changes by VoyagerOne
english (us): 2 changes by Supercheese
russian: 1 change by Lone_Wolf
latin: 25 changes by Supercheese
 2016-12-11 18:45:39 +00:00
translators
7c7913c986 (svn r27691) -Update from Eints: 
italian: 9 changes by lorenzodv
 2016-12-10 18:45:38 +00:00
Jonathan G Rennison
478ff2538e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/lang/korean.txt
 2016-12-09 23:42:54 +00:00
frosch
4753097c3d (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 2016-12-09 21:27:22 +00:00
frosch
f294258b18 (svn r27685) -Change: Preemptively invalidate translation changes of next commit for eints. 2016-12-09 21:26:37 +00:00
translators
cf04ca5db3 (svn r27684) -Update from Eints: 
italian: 1 change by lorenzodv
 2016-12-09 18:45:36 +00:00
Jonathan G Rennison
58381a3ea2 Merge branch 'master' into jgrpp 2016-12-09 00:01:03 +00:00
Jonathan G Rennison
20a090b077 Show warning dialog if NewGRFs use too many string IDs. 
Show when reloading/changing NewGRF config, or starting new game.
 2016-12-08 23:48:53 +00:00
frosch
da76191afc (svn r27683) -Change: Rearrange the autoreplace GUI for trains, and do not filter it by railtype by default. 2016-12-08 20:21:39 +00:00
kiwitreekor
a30e15d683 Korean Translation Update 2016-12-06 20:18:10 +00:00
Jonathan G Rennison
eae7334ac0 Lang: Korean: Adjust a string/string2 and trailing whitespace. 2016-12-01 21:38:10 +00:00