Jonathan G Rennison
|
5b78090a61
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# src/saveload/town_sl.cpp
# src/screenshot.h
# src/script/api/ai/ai_date.hpp.sq
# src/script/api/ai/ai_marine.hpp.sq
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_date.hpp.sq
# src/script/api/game/game_marine.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/game/game_window.hpp.sq
# src/script/api/script_window.hpp
# src/script/api/template/template_window.hpp.sq
# src/signal.cpp
# src/statusbar_gui.cpp
# src/toolbar_gui.cpp
# src/viewport.cpp
# src/viewport_func.h
|
4 years ago |
TechGeekNZ
|
a10013dd00
|
Codechange: Spell 'Viewport' consistently
Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.
|
4 years ago |
|
Jonathan G Rennison
|
7467051331
|
Merge branch 'master' into jgrpp
# Conflicts:
# .gitignore
# src/network/network_server.cpp
# src/vehicle_gui.cpp
|
4 years ago |
TrevorShelton
|
c39d62c245
|
Update: Disuse of STR_ERROR_INCOMPATIBLE_ROAD
|
4 years ago |
|
Jonathan G Rennison
|
f8d6e781ba
|
Merge branch 'master' into jgrpp
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
|
4 years ago |
translators
|
d11bae58a0
|
Update: Translations from eints
spanish (mexican): 7 changes by Absay
|
4 years ago |
|
translators
|
edc7ee2cda
|
Update: Translations from eints
indonesian: 1 change by fanioz
dutch: 1 change by JanWillem
latvian: 39 changes by Tranzistors
spanish (mexican): 1 change by Absay
|
4 years ago |
|
translators
|
9b8d5ea074
|
Update: Translations from eints
spanish (mexican): 16 changes by Absay
russian: 3 changes by Lone_Wolf
|
4 years ago |
|
Jonathan G Rennison
|
77673b731c
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/industry_cmd.cpp
# src/openttd.cpp
# src/station_cmd.cpp
# src/station_func.h
|
4 years ago |
|
translators
|
6dcc99edab
|
Update: Translations from eints
latvian: 45 changes by Tranzistors
spanish (mexican): 9 changes by Absay
|
4 years ago |
|
translators
|
48c61c1da1
|
Update: Translations from eints
latvian: 54 changes by Tranzistors
spanish (mexican): 4 changes by Absay
|
4 years ago |
|
Jonathan G Rennison
|
763a2826b6
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/gamelog.cpp
|
4 years ago |
|
translators
|
3ba34a72aa
|
Update: Translations from eints
latvian: 80 changes by Tranzistors
spanish (mexican): 10 changes by Absay
|
4 years ago |
|
translators
|
61e1a45100
|
Update: Translations from eints
latvian: 8 changes by Tranzistors
spanish (mexican): 1 change by Absay
|
4 years ago |
|
Jonathan G Rennison
|
07c9621fcf
|
Merge branch 'master' into jgrpp
|
4 years ago |
glx
|
f0747c8c51
|
Update: Lang files
|
4 years ago |
|
Jonathan G Rennison
|
b96e7f78fb
|
Merge branch 'master' into jgrpp
|
4 years ago |
|
translators
|
183c2a35bd
|
Update: Translations from eints
dutch: 2 changes by JanWillem
spanish (mexican): 2 changes by Absay
|
4 years ago |
|
Jonathan G Rennison
|
dd99fd646d
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/base_station_base.h
# src/industry.h
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/station_cmd.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
|
5 years ago |
|
translators
|
b144258bf0
|
Update: Translations from eints
finnish: 19 changes by ln
dutch: 17 changes by JanWillem
danish: 109 changes by nielsmh
spanish (mexican): 1 change by Absay
korean: 1 change by telk5093
|
5 years ago |
|
translators
|
34b7cb6c03
|
Update: Translations from eints
finnish: 3 changes by ln
spanish (mexican): 7 changes by Absay
|
5 years ago |
|
Jonathan G Rennison
|
4adfe0c9ae
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/industry_gui.cpp
# src/lang/korean.txt
# src/town.h
# src/town_gui.cpp
|
5 years ago |
Niels Martin Hansen
|
7413d65c2a
|
Cleanup: Unused music GUI strings
|
5 years ago |
|
Jonathan G Rennison
|
7960db35f2
|
Merge branch 'master' into jgrpp
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
|
5 years ago |
|
translators
|
e7922cd078
|
Update: Translations from eints
spanish (mexican): 18 changes by Absay
|
5 years ago |
|
translators
|
9e4533dc8f
|
Update: Translations from eints
luxembourgish: 131 changes by Phreeze
french: 6 changes by arikover
spanish (mexican): 20 changes by Absay
|
5 years ago |
|
translators
|
3a557b0336
|
Update: Translations from eints
finnish: 11 changes by hpiirai
korean: 6 changes by telk5093
|
5 years ago |
pnda
|
e558aa8ff4
|
Feature: Screenshot window
|
5 years ago |
|
translators
|
e18f1703d2
|
Update: Translations from eints
spanish (mexican): 1 change by Absay
russian: 4 changes by Lone_Wolf
|
5 years ago |
|
translators
|
dbe44e80f1
|
Update: Translations from eints
|
5 years ago |
|
Jonathan G Rennison
|
ab3a373c73
|
Merge branch 'master' into jgrpp
|
5 years ago |
|
translators
|
b533c66f42
|
Update: Translations from eints
finnish: 5 changes by hpiirai
galician: 183 changes by Michi
polish: 5 changes by azabost
dutch: 6 changes by JanWillem
spanish (mexican): 5 changes by Absay
|
5 years ago |
|
glx
|
9fc6329066
|
Cleanup: Remove unused strings
|
5 years ago |
|
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
5 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
|
Jonathan G Rennison
|
ca3c72438e
|
Merge branch 'master' into jgrpp
# Conflicts:
# Makefile.bundle.in
# src/os/macosx/string_osx.cpp
# src/station_cmd.cpp
|
5 years ago |
|
translators
|
90682f8623
|
Update: Translations from eints
spanish (mexican): 2 changes by Absay
|
5 years ago |
|
Jonathan G Rennison
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
5 years ago |
|
translators
|
2e30601b9c
|
Update: Translations from eints
czech: 91 changes by djst, 6 changes by belaseoci
spanish (mexican): 2 changes by Absay
|
5 years ago |
|
translators
|
b18a58d5e1
|
Update: Translations from eints
spanish (mexican): 9 changes by Absay
|
5 years ago |
|
Jonathan G Rennison
|
dbc5f1baed
|
Merge branch 'master' into jgrpp-nrt
# Conflicts:
# src/fontcache.cpp
# src/game/game_text.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/station_cmd.cpp
# src/viewport.cpp
|
5 years ago |
|
Jonathan G Rennison
|
ba8ed880c1
|
Merge branch 'master' into jgrpp-nrt
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
|
5 years ago |
|
Jonathan G Rennison
|
36eb4165b8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
|
5 years ago |
|
translators
|
ef74af6766
|
Update: Translations from eints
finnish: 32 changes by hpiirai
spanish (mexican): 16 changes by Absay
|
5 years ago |
peter1138
|
a1de834104
|
Cleanup: Remove unused string.
|
5 years ago |
|
translators
|
6b49205745
|
Update: Translations from eints
spanish (mexican): 16 changes by Absay
russian: 18 changes by Lone_Wolf
|
5 years ago |
|
translators
|
3469a2a445
|
Update: Translations from eints
dutch: 27 changes by JanWillem
french: 29 changes by glx
hungarian: 3 changes by Brumi
korean: 71 changes by telk5093
|
5 years ago |
|
peter1138
|
672c857e37
|
Cleanup: Update modified and removed strings in language files.
|
5 years ago |
|
translators
|
ead5b55119
|
Update: Translations from eints
spanish (mexican): 3 changes by Absay
russian: 3 changes by Lone_Wolf
|
5 years ago |
|
Jonathan G Rennison
|
f5747bf753
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
|
5 years ago |