Commit Graph

1222 Commits (fe730bce316520cb84c4e0594a337a64ac21ddb2)

Author SHA1 Message Date
Jonathan G Rennison fe730bce31 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/codeql.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows.yml
#	src/map.cpp
#	src/music/midifile.hpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/pbs.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_text.cpp
#	src/ship_cmd.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_func.h
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/viewport.cpp
#	src/waypoint_cmd.cpp
3 months ago
Rubidium 2f0fe22d63 Fix #12255: inconsistent punctuation in English 3 months ago
Jonathan G Rennison 0e76f774eb Merge branch 'master' into jgrpp
# Conflicts:
#	src/landscape.cpp
#	src/landscape.h
#	src/misc_gui.cpp
#	src/newgrf_commons.cpp
#	src/order_cmd.cpp
#	src/pathfinder/yapf/yapf_base.hpp
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/water_cmd.cpp
#	src/window.cpp
3 months ago
jcteotonio 63b9284a7e
Add: Portuguese Escudo currency (#12108) 3 months ago
Kuhnovic 1a2b54498b
Change: Show tile index as decimal number in land info window (#12104) 3 months ago
Loïc Guilloux 845b894fd8
Remove: [Script] random_deviation from setting description table (#12221) 3 months ago
Jonathan G Rennison 828d2146eb Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/ai/ai_info.cpp
#	src/company_base.h
#	src/economy.cpp
#	src/game/game_info.cpp
#	src/gfx_type.h
#	src/linkgraph/linkgraph_gui.cpp
#	src/palette.cpp
#	src/palette_func.h
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/ship_cmd.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
#	src/window.cpp
#	src/window_func.h
3 months ago
Tyler Trahan 677ec70b0e
Fix fd9e72a: Helptext for timekeeping unit setting erroneously refers to vehicle movement (#12172) 3 months ago
Rubidium 4c117dd2d8 Revert #11993: new number format system does not and cannot work for CJK languages
There are too many intricacies that I am unaware of that are popping up after
asking whether things are right or not.
I do not want to keep playing whack-a-mole, so just revert the whole thing.

This reverts:
15be383b93
360fe8b0b6
1aa9a5c0ab
59f56941e5
7e2eefb91f
b741b2ba6f
609d0071d5
9f8fd80112
a253205b93
819c6c756e
3 months ago
merni-ns 7bab2c1cc3 Fix #12119: Remove red warning text when maximum loan is zero 3 months ago
Rubidium 15be383b93 Fix a253205: remove (now) unused currency separator 3 months ago
Tyler Trahan 4f1bc39bf7
Change: Show speed before destination in vehicle status bar (#11932) 3 months ago
Tyler Trahan 87a80c7ff2
Change: When adding orders, Ctrl+Click on a depot to unbunch, instead of service if required (#12023) 3 months ago
Rubidium 7e2eefb91f Cleanup: Remove digit group separators from strgen and languages 3 months ago
Rubidium 819c6c756e Codechange: Add support for number format and abbreviations pragmas/attributes to strgen 3 months ago
rubidium42 8bccb5805a
Fix 0ca4b4e: Ctrl+Click style inconsistency in base language (#12099) 3 months ago
Tyler Trahan f5126cba08
Fix: Accurately describe Ctrl+Clicking on a waypoint in Go To tooltip (#12081) 4 months ago
Patric Stout 48e7dceb3c
Revert: Build signals to the next junction when dragging regardless of the Ctrl state (#12034)
This reverts commit b370ae1212.
4 months ago
Peter Nelson 2c78146da5 Change: Limit cargo types in station cargo filter, with "More..." option to show all. 4 months ago
Peter Nelson 46da56b191 Change: Replace long list of cargo filter buttons with a multi-select dropdown list.
As before, hold ctrl while clicking on an item to toggle selections.
4 months ago
Tyler Trahan d0c753465d Fix f6dd505: Remove unneeded error when switching between depot actions 4 months ago
Tyler Trahan 80a704ba11 Fix f6dd505: Split depot action tooltip by vehicle type 4 months ago
Tyler Trahan f6dd5053a3
Feature: Order flag to unbunch vehicles at depot (#11945) 4 months ago
Patric Stout 849fd5ae03
Change: [Script] replace easy/medium/hard values with default value (#11959) 4 months ago
Tyler Trahan 6f6f09910d
Fix #10118: Cycle through current signal group, not just path signals (#11798) 4 months ago
Loïc Guilloux 4e26e33805
Change: Improve ScriptSettings windows (#11958) 4 months ago
dP 9a2f247de9 Fix: Display rank correcly with more than 15 companies in a league table 4 months ago
Tyler Trahan 41f2eed425
Feature: Settings to scale cargo production of towns and industries (#10606) 4 months ago
dP b370ae1212
Change: Build signals to the next junction when dragging regardless of the Ctrl state (#9637) 4 months ago
merni-ns 5a88027a19
Feature: Infinite money mode (#11902) 4 months ago
Tyler Trahan 2b1f78d2ca
Fix: Use alternate timekeeping units in savegame title (#11912) 4 months ago
Patric Stout f1842f9144
Add: {CURRENCY_SHORT} only did k / m suffix. Add bn / tn and make translatable. (#11921)
64bit numbers are REALLY large, but our compact method was build
for 32bit numbers. Extend it to 64bit.
4 months ago
frosch 9344b50435 Codechange: Remove TKM from settings texts. 4 months ago
frosch a9d1078434 Codechange: Remove TKM from town action tooltips. 4 months ago
frosch abfeeea849 Codechange: Compose engine preview text from multiple strings. 4 months ago
frosch 68c64d2511 Codechange: Remove TKM string codes by duplicating strings. 4 months ago
frosch 69f47caf3f Codechange: Remove TKM from vehicle list sorting dropdowns. 4 months ago
frosch 9741510396 Fix: Wallclock setting should not affect percent-based service interval increments. 4 months ago
Patric Stout 89520f5665
Add: show in multiplayer the amount of hours a game has been unpaused (#11886) 4 months ago
Patric Stout 80ebcc72fb
Change: rebrand Cheats as Sandbox Options (#11874) 4 months ago
Tyler Trahan 21581b6ab3
Feature: Setting for minutes per calendar year (#11428) 4 months ago
Tyler Trahan fd9e72a7e7
Feature: Use real-time "wallclock" timekeeping units (#11341) 4 months ago
Tyler Trahan 76499b96fb
Fix fa479c4: Typo in vehicle list tooltip (#11871) 4 months ago
Patric Stout d3b2a576de
Feature: Plugin framework for Social Integration with Steam, Discord, GOG, etc (#11628) 4 months ago
Tyler Trahan fa479c4a7c
Cleanup: Describe modifier keys more consistently in tooltips (#11716) 4 months ago
Tyler Trahan 500870627d
Change: Rewrite a few main toolbar tooltips (#11717) 4 months ago
Tyler Trahan 4a194482ea
Fix e1f5be6: Typo when selecting traditional sprite font (#11789) 5 months ago
Michael Lutz e1f5be6244 Add: GUI options to select sprite font and AA mode for all fonts. 5 months ago
Tyler Trahan 60da6b992e
Fix #4415: Land info build date is also renovation date (#11759)
Co-authored-by: Gadg8eer <64449092+Gadg8eer@users.noreply.github.com>
5 months ago
Tyler Trahan 56dd8497e0
Fix: Use consistent wording on waypoint button tooltip (#11700) 5 months ago