miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,948 Commits 14 Branches 28 Tags
bed585d1ea6bc0eb747d4e2813a17da8fca2d059
Commit Graph

35240 Commits

Author SHA1 Message Date
pelya 3ef1c1baff Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5' 
These merges are becoming more awful every time

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/error_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/signs_gui.cpp
	src/station_gui.cpp
	src/table/settings.ini
	src/terraform_gui.cpp
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/viewport.cpp
	src/widget.cpp
	src/widgets/settings_widget.h
 2016-03-27 22:33:11 +03:00
translators 692458d8f5 (svn r27527) -Update from Eints: 
tamil: 13 changes by aswn
 2016-03-27 17:45:35 +00:00
translators a42832afb7 (svn r27527) -Update from Eints: 
tamil: 13 changes by aswn
 2016-03-27 17:45:35 +00:00
translators 927d1a9490 (svn r27526) -Update from Eints: 
malay: 2 changes by rionix88
 2016-03-26 18:45:36 +00:00
translators 7c15190ec2 (svn r27526) -Update from Eints: 
malay: 2 changes by rionix88
 2016-03-26 18:45:36 +00:00
translators 518eeac55f (svn r27525) -Update from Eints: 
latin: 18 changes by Supercheese
 2016-03-21 18:45:36 +00:00
translators f985aefde4 (svn r27525) -Update from Eints: 
latin: 18 changes by Supercheese
 2016-03-21 18:45:36 +00:00
translators 177c61477a (svn r27524) -Update from Eints: 
esperanto: 3 changes by LaPingvino
 2016-03-20 18:45:37 +00:00
translators 0475afca71 (svn r27524) -Update from Eints: 
esperanto: 3 changes by LaPingvino
 2016-03-20 18:45:37 +00:00
translators fe4d076dd8 (svn r27523) -Update from Eints: 
latvian: 1 change by Jancs
 2016-03-13 18:45:37 +00:00
translators 14be8a4301 (svn r27523) -Update from Eints: 
latvian: 1 change by Jancs
 2016-03-13 18:45:37 +00:00
translators 20373af117 (svn r27522) -Update from Eints: 
slovenian: 72 changes by Necrolyte
 2016-03-08 18:45:36 +00:00
translators 8e2e9fbb23 (svn r27522) -Update from Eints: 
slovenian: 72 changes by Necrolyte
 2016-03-08 18:45:36 +00:00
translators 3912258035 (svn r27521) -Update from Eints: 
malay: 5 changes by rionix88
 2016-03-05 18:45:38 +00:00
translators 8c6bda994e (svn r27521) -Update from Eints: 
malay: 5 changes by rionix88
 2016-03-05 18:45:38 +00:00
frosch fbd79d88f0 (svn r27518) -Update: Numbers 2016-03-01 20:00:22 +00:00
frosch 0c7c0ada78 (svn r27518) -Update: Numbers 2016-03-01 20:00:22 +00:00
frosch a8b5756718 (svn r27516) -Update: Documentation 2016-03-01 19:41:31 +00:00
frosch 56c54dcaec (svn r27516) -Update: Documentation 2016-03-01 19:41:31 +00:00
translators 8284c69a61 (svn r27515) -Update from Eints: 
polish: 1 change by lion
thai: 11 changes by ityellow
 2016-03-01 18:45:37 +00:00
translators 7ea6fddc01 (svn r27515) -Update from Eints: 
polish: 1 change by lion
thai: 11 changes by ityellow
 2016-03-01 18:45:37 +00:00
translators 815fce8bd9 (svn r27514) -Update from Eints: 
turkish: 2 changes by wakeup
 2016-02-28 18:45:36 +00:00
translators 1a49b5e463 (svn r27514) -Update from Eints: 
turkish: 2 changes by wakeup
 2016-02-28 18:45:36 +00:00
translators 4a64ced9b5 (svn r27513) -Update from Eints: 
spanish: 5 changes by SilverSurferZzZ
 2016-02-26 18:45:36 +00:00
translators 42dc467c3c (svn r27513) -Update from Eints: 
spanish: 5 changes by SilverSurferZzZ
 2016-02-26 18:45:36 +00:00
translators d9da47f913 (svn r27512) -Update from Eints: 
spanish: 6 changes by SilverSurferZzZ
 2016-02-25 18:45:36 +00:00
translators 30ff4b113b (svn r27512) -Update from Eints: 
spanish: 6 changes by SilverSurferZzZ
 2016-02-25 18:45:36 +00:00
translators e7f0902eaf (svn r27511) -Update from Eints: 
japanese: 4 changes by nex259
esperanto: 4 changes by polluks
 2016-02-24 18:45:38 +00:00
translators ca884e0fe8 (svn r27511) -Update from Eints: 
japanese: 4 changes by nex259
esperanto: 4 changes by polluks
 2016-02-24 18:45:38 +00:00
translators 9aaad3fa60 (svn r27510) -Update from Eints: 
frisian: 55 changes by BAJansen
 2016-02-19 18:45:35 +00:00
translators 689f42b80c (svn r27510) -Update from Eints: 
frisian: 55 changes by BAJansen
 2016-02-19 18:45:35 +00:00
translators 561c4c2f02 (svn r27509) -Update from Eints: 
frisian: 60 changes by BAJansen
 2016-02-18 18:45:36 +00:00
translators 2c9e500738 (svn r27509) -Update from Eints: 
frisian: 60 changes by BAJansen
 2016-02-18 18:45:36 +00:00
translators 9043cbf9bf (svn r27508) -Update from Eints: 
german: 1 change by mini1025
 2016-02-13 18:45:36 +00:00
translators 3e2b22b419 (svn r27508) -Update from Eints: 
german: 1 change by mini1025
 2016-02-13 18:45:36 +00:00
frosch 9db36bd87a (svn r27507) -Add: [NewGRF] Allow custom sound IDs in RV property 0x12, ship property 0x10 and aircraft property 0x12. 2016-02-08 21:05:57 +00:00
frosch f6577b6ad7 (svn r27507) -Add: [NewGRF] Allow custom sound IDs in RV property 0x12, ship property 0x10 and aircraft property 0x12. 2016-02-08 21:05:57 +00:00
translators 4b8c6983e7 (svn r27506) -Update from Eints: 
french: 13 changes by OliTTD
 2016-02-04 18:45:36 +00:00
translators 8f621dc506 (svn r27506) -Update from Eints: 
french: 13 changes by OliTTD
 2016-02-04 18:45:36 +00:00
translators 4b894775af (svn r27505) -Update from Eints: 
portuguese: 2 changes by neuralshock
 2016-01-26 18:45:36 +00:00
translators 8e3aef8eba (svn r27505) -Update from Eints: 
portuguese: 2 changes by neuralshock
 2016-01-26 18:45:36 +00:00
translators b23f22f0f6 (svn r27504) -Update from Eints: 
catalan: 3 changes by juanjo
 2016-01-25 18:45:36 +00:00
translators 2a375d8cc8 (svn r27504) -Update from Eints: 
catalan: 3 changes by juanjo
 2016-01-25 18:45:36 +00:00
translators 3cc990d0f9 (svn r27503) -Update from Eints: 
persian: 6 changes by Peymanpn
greek: 3 changes by Ferrum
 2016-01-24 18:45:36 +00:00
translators 99b1c54802 (svn r27503) -Update from Eints: 
persian: 6 changes by Peymanpn
greek: 3 changes by Ferrum
 2016-01-24 18:45:36 +00:00
translators da104bee01 (svn r27502) -Update from Eints: 
greek: 54 changes by Ferrum
 2016-01-23 18:45:37 +00:00
translators 3a5c48f681 (svn r27502) -Update from Eints: 
greek: 54 changes by Ferrum
 2016-01-23 18:45:37 +00:00
translators ff0c05f990 (svn r27501) -Update from Eints: 
greek: 4 changes by Ferrum
 2016-01-22 18:45:38 +00:00
translators afa333164b (svn r27501) -Update from Eints: 
greek: 4 changes by Ferrum
 2016-01-22 18:45:38 +00:00
translators 25bda8a417 (svn r27500) -Update from Eints: 
frisian: 16 changes by gjannema
 2016-01-18 18:45:36 +00:00