dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,238 Commits 1 Branch 0 Tags
0ee812b5a91eb84efb740cee82e0067a084470a2
Commit Graph

3391 Commits

Author SHA1 Message Date
Jonathan G Rennison
388dab7390 Merge branch 'master' into enhanced_viewport_overlay 
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
 2015-08-11 21:41:41 +01:00
translators
a9200aa69a (svn r27364) -Update from WebTranslator v3.0: 
czech - 1 changes by Eskymak
dutch - 12 changes by TheTycoonist
 2015-08-08 17:45:27 +00:00
translators
f95759139b (svn r27359) -Update from WebTranslator v3.0: 
swedish - 1 changes by planetmaker
 2015-08-07 17:45:12 +00: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
translators
163c30570b (svn r27358) -Update from WebTranslator v3.0: 
catalan - 25 changes by juanjo
 2015-08-02 17:45:14 +00:00
translators
e6782df9ba (svn r27357) -Update from WebTranslator v3.0: 
catalan - 181 changes by juanjo
 2015-08-01 17:45:15 +00:00
translators
66418db43e (svn r27352) -Update from WebTranslator v3.0: 
catalan - 134 changes by juanjo
 2015-07-31 17:45:18 +00:00
translators
18e7b67864 (svn r27347) -Update from WebTranslator v3.0: 
slovenian - 15 changes by matej1245
 2015-07-30 17:45:14 +00:00
translators
932aaa8cb5 (svn r27339) -Update from WebTranslator v3.0: 
frisian - 42 changes by BAJansen
 2015-07-25 17:45:15 +00:00
translators
55c177c26d (svn r27338) -Update from WebTranslator v3.0: 
frisian - 8 changes by BAJansen
 2015-07-24 17:45:18 +00:00
translators
f6a3faf927 (svn r27337) -Update from WebTranslator v3.0: 
simplified_chinese - 1 changes by Gavin
 2015-07-21 17:45:18 +00:00
translators
28f9637aed (svn r27336) -Update from WebTranslator v3.0: 
greek - 36 changes by Jubilee
 2015-07-17 17:45:14 +00:00
translators
28e885dd51 (svn r27335) -Update from WebTranslator v3.0: 
greek - 24 changes by Jubilee
 2015-07-16 17:45:15 +00:00
translators
99ed8df797 (svn r27333) -Update from WebTranslator v3.0: 
greek - 7 changes by Jubilee
 2015-07-13 17:45:17 +00:00
translators
d25934580f (svn r27327) -Update from WebTranslator v3.0: 
korean - 1 changes by telk5093
 2015-07-09 17:45:08 +00:00
translators
81ec32199f (svn r27326) -Update from WebTranslator v3.0: 
simplified_chinese - 6 changes by Gavin
 2015-07-08 17:45:12 +00:00
translators
b50eddaea2 (svn r27325) -Update from WebTranslator v3.0: 
catalan - 4 changes by juanjo
 2015-06-30 17:45:15 +00:00
translators
1d9c78ef6b (svn r27321) -Update from WebTranslator v3.0: 
korean - 2 changes by telk5093
 2015-06-27 17:45:18 +00:00
translators
d3bfb5422f (svn r27319) -Update from WebTranslator v3.0: 
frisian - 1 changes by BAJansen
 2015-06-26 17:45:13 +00:00
translators
d9f8045255 (svn r27318) -Update from WebTranslator v3.0: 
frisian - 9 changes by BAJansen
 2015-06-25 17:45:13 +00:00
translators
d64d56b5a8 (svn r27317) -Update from WebTranslator v3.0: 
frisian - 458 changes by BAJansen
 2015-06-24 17:45:14 +00:00
frosch
a1ca479a65 (svn r27315) -Fix: Norwegian bokmal 2015-06-21 17:52:18 +00:00
translators
8f84989389 (svn r27314) -Update from WebTranslator v3.0: 
norwegian_bokmal - 4 changes by eirik174
 2015-06-21 17:45:13 +00:00
translators
a2f13f0fe2 (svn r27310) -Update from WebTranslator v3.0: 
norwegian_bokmal - 79 changes by eirik174
 2015-06-20 17:45:17 +00:00
translators
3ed9f24d19 (svn r27296) -Update from WebTranslator v3.0: 
estonian - 93 changes by Jaropower
 2015-06-01 17:45:13 +00:00
frosch
7f5e63324d (svn r27294) -Fix: Invalid plural references in various translations. 2015-05-28 17:25:46 +00:00
translators
25b87fe4a9 (svn r27293) -Update from WebTranslator v3.0: 
traditional_chinese - 4 changes by siu238X
danish - 4 changes by beruic
 2015-05-27 17:53:35 +00:00
frosch
5053ba6a6e (svn r27292) -Codechange: Unify language file range comments. 2015-05-26 21:11:12 +00:00
translators
ffb6f3cea0 (svn r27284) -Update from WebTranslator v3.0: 
latin - 1 changes by Supercheese
 2015-05-12 17:45:19 +00:00
translators
a976ec28b4 (svn r27283) -Update from WebTranslator v3.0: 
belarusian - 4 changes by KorneySan
brazilian_portuguese - 20 changes by Tucalipe
 2015-05-11 17:45:26 +00:00
translators
c348ebfeb1 (svn r27269) -Update from WebTranslator v3.0: 
latvian - 20 changes by Parastais
 2015-05-07 17:45:13 +00:00
translators
e7fa640566 (svn r27268) -Update from WebTranslator v3.0: 
hebrew - 1 changes by oofnik
 2015-05-06 17:45:15 +00:00
translators
cf629bfb97 (svn r27264) -Update from WebTranslator v3.0: 
korean - 1 changes by telk5093
 2015-05-02 17:45:18 +00:00
translators
8803df32aa (svn r27262) -Update from WebTranslator v3.0: 
croatian - 97 changes by UnderwaterHesus
 2015-04-30 17:45:17 +00:00
translators
be00f631da (svn r27261) -Update from WebTranslator v3.0: 
swedish - 1 changes by abbedabb
 2015-04-28 17:45:14 +00:00
translators
edad1a1ce5 (svn r27257) -Update from WebTranslator v3.0: 
korean - 4 changes by telk5093
 2015-04-27 17:45:15 +00:00
translators
e09d7e6fe4 (svn r27242) -Update from WebTranslator v3.0: 
lithuanian - 17 changes by Stabilitronas
 2015-04-22 17:45:15 +00:00
translators
dbc025798d (svn r27241) -Update from WebTranslator v3.0: 
latin - 5 changes by Supercheese
 2015-04-20 17:45:16 +00:00
translators
7fbcc64801 (svn r27240) -Update from WebTranslator v3.0: 
lithuanian - 31 changes by Stabilitronas
 2015-04-19 17:45:18 +00:00
translators
5d6ee8da6c (svn r27239) -Update from WebTranslator v3.0: 
latin - 3 changes by Supercheese
lithuanian - 92 changes by Stabilitronas
 2015-04-18 17:45:30 +00:00
translators
9c8fb872aa (svn r27238) -Update from WebTranslator v3.0: 
latin - 2 changes by Supercheese
 2015-04-15 17:45:15 +00:00
translators
9508b96bc0 (svn r27237) -Update from WebTranslator v3.0: 
latin - 7 changes by Supercheese
 2015-04-14 17:45:15 +00:00
glx
abe409db89 (svn r27236) -Fix (r27235): WT3 string validation 2015-04-13 23:20:23 +00:00
translators
9e2d0f4322 (svn r27235) -Update from WebTranslator v3.0: 
latin - 123 changes by Supercheese
slovak - 54 changes by andrej
ukrainian - 130 changes by Fixer
 2015-04-13 17:45:39 +00:00
translators
9f7545368d (svn r27234) -Update from WebTranslator v3.0: 
ukrainian - 67 changes by Fixer
 2015-04-12 17:45:17 +00:00
translators
31f8ef4c15 (svn r27226) -Update from WebTranslator v3.0: 
latin - 10 changes by Supercheese
 2015-04-11 17:45:16 +00:00
translators
78d590aab9 (svn r27220) -Update from WebTranslator v3.0: 
simplified_chinese - 2 changes by Gavin
 2015-04-05 17:45:14 +00:00
translators
55f5a83fbc (svn r27219) -Update from WebTranslator v3.0: 
simplified_chinese - 13 changes by xiangyigao
 2015-04-04 17:45:16 +00:00
translators
4dbabbd9e2 (svn r27218) -Update from WebTranslator v3.0: 
luxembourgish - 361 changes by Phreeze
 2015-04-02 17:45:16 +00:00