Commit Graph

48927 Commits (f077c3bf6e8a5589a84a3ba03650d03f47f196be)
 

Author SHA1 Message Date
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
translators 5a31efd98d Update: Translations from eints
finnish: 1 change by hpiirai
5 years ago
Niels Martin Hansen 7413d65c2a Cleanup: Unused music GUI strings 5 years ago
Niels Martin Hansen f02b643a44 Change: Show volume sliders with wedges instead of boxy slider 5 years ago
Niels Martin Hansen 35c55dfe70 Add: Filled polygon drawing function 5 years ago
SamuXarick fa71375ec2 Fix e04ca90: squirrel export script got forgotten 5 years ago
glx 5c10c426fe Fix 196d5868: Always apply filter on town directory rebuild 5 years ago
Jonathan G Rennison 150dfba95b Codechange: Remove std::function from Pool iteration wrapper
Add a separate template wrapper for filtered iteration
5 years ago
Jonathan G Rennison 4cc1420beb Fix: Non-deterministic name sorting in industry directory window
In the case where multiple industries have the same name, sorting
in the industry directory window is non-deterministic.
This results in the order changing on each re-sort, and is noticeable
when the industries have different production or transported values.
5 years ago
Samu a0066ebca1 Cleanup: Remove unused parameter 5 years ago
stormcone eb07e174f1 Fix #7908, b524f1a: "Show the NewGRF name in the build vehicle window" is missing the "On/Off" display. 5 years ago
translators 1812b0cf49 Update: Translations from eints
finnish: 4 changes by hpiirai
english (us): 20 changes by Supercheese
french: 7 changes by glx
korean: 7 changes by telk5093
5 years ago
Jonathan G Rennison 6d326deafe Change: [Linkgraph] Only acquire thread join performance measurements on network clients
Network servers and single player clients do not block on thread joins
due to instead pausing shortly before the join is due.

(cherry picked from commit a5697ddeeb43c64ae6cac25581022efcf8e107bd)
5 years ago
Jonathan G Rennison 741237a94a Remove unused variables: CompanyStationsWindow::last_station, IndustryDirectoryWindow::last_industry 5 years ago
Jonathan G Rennison 964739f235 Industry directory window: Only resort on production change if necessary 5 years ago
Jonathan G Rennison b868ce8605 Town directory window: Only resort on population change if necessary 5 years ago
Jonathan G Rennison 68fa46d351 Remove unused variable TownDirectoryWindow::last_town 5 years ago
Jonathan G Rennison 61934fdfdc Remove std::function from Pool iteration wrapper
Add a separate template wrapper for filtered iteration
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
Jonathan G Rennison 7afa667e66 Use town cached name for town list window filtering 5 years ago
Charles Pigott 5b52f25902 Fix e558aa8: Compiler warning about unused value (and move some variable declarations to where they're used) 5 years ago
glx 39e6247bec Fix #7899, 196d5868: don't trigger filter changes more than expected 5 years ago
Niels Martin Hansen ac3bc30a30 Add: Highlight item under mouse in file browser 5 years ago
Niels Martin Hansen 838117b05e Doc: Missing member description 5 years ago
stormcone 596fb5d54a Change: In the industry directory window an industry will be greyed out if it temporarily does not accept the cargo selected by the acceptance cargo filter. 5 years ago
stormcone 808253c29c Change: Move the filtered cargo to the first place in the industry directory window's cargo lists 5 years ago
stormcone 70f9c3c655 Feature: Industry directory cargo filtering 5 years ago
Charles Pigott ab9042145e Fix #6667: Also recalculate bridge costs for 'spectated' AI companies 5 years ago
Charles Pigott d1cead7f25 Fix: When loading old timetabled saves, also reset cached timetable duration 5 years ago
Charles Pigott cddb8a4605 Fix #7587: Crash when loading saves with waypoints with invalid locations 5 years ago
Jonathan G Rennison 12380fc1bb Fix: Assertion failure when post road-works cleanup removes all road pieces 5 years ago
translators 12f4602f57 Update: Translations from eints
finnish: 3 changes by hpiirai
5 years ago
Jonathan G Rennison b3e46cbe00 Fix crash when post road-works cleanup removes all road pieces 5 years ago
translators 7be9c28037 Update: Translations from eints
korean: 2 changes by telk5093
5 years ago
Niels Martin Hansen f401622149 Feature: Script API to change town rating of companies 5 years ago
stormcone b524f1ae21 Feature: Show the name of the NewGRF in the build vehicle window. 5 years ago
TELK e04ca904a9 Feature: Minimap screenshot 5 years ago
Jonathan G Rennison 6f75d9119d ChillPP: Add support for loading compatible linkgraph settings 5 years ago
Jonathan G Rennison 8176da3f62 Saveload: Add value conversion support to settings xref 5 years ago
translators e7922cd078 Update: Translations from eints
spanish (mexican): 18 changes by Absay
5 years ago
Jonathan G Rennison 7f2e6fb597 Exclude waypoint orders from set timetabled wait time for all orders
See #125
5 years ago
Jonathan G Rennison c9a5b30d39 ChillPP: Fix loading of timetable seperation setting 5 years ago
Jonathan G Rennison c681a9d5de Fix vehicle timetable automate flag from ChillPP v8 savegames 5 years ago
Jonathan G Rennison b8b84a9a0b Fix leftover PBS reservation on signalled tunnel/bridge entrances in ChillPP savegames 5 years ago
Jonathan G Rennison 4936b3ba51 Add support for loading ChillPP v8 savegames 5 years ago
SamuXarick 9e7c5235e8 Fix #7891: Actually check the vehicle type before casting 5 years ago
Jonathan G Rennison 223d542bf1 ChillPP: Remove unnecessary additions to gameopt_settings.ini 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
Jonathan G Rennison 5dc1027c6b Add initial support for loading ChillPP v14.7 savegames 5 years ago
Jonathan G Rennison 71db9ebc3b NewGRF debug window: Add vehicle cargo and last station lines 5 years ago