dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,070 Commits 1 Branch 0 Tags
cbea3b8b461c8b35205dfe9d6b51f855773f02ba
Commit Graph

58070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Koen Bussemaker
69af0e8f26 Codechange: Skip non-water water region patches in neigbor search 
(cherry picked from commit 8a1cea2ab6)
 2024-02-19 23:11:00 +00:00
Jonathan G Rennison
a98a56669b Merge branch 'master' into jgrpp 
# Conflicts:
#	regression/regression/result.txt
#	src/autoreplace_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/network/network_content.cpp
#	src/newgrf_roadstop.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/road_gui.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_gui.cpp
#	src/video/cocoa/cocoa_ogl.h
#	src/video/sdl2_opengl_v.h
#	src/video/video_driver.hpp
#	src/video/win32_v.h
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
 2024-02-19 23:11:00 +00:00
Jonathan G Rennison
4097fc4e33 Saveload: Enable upstream mode SlAutolength 
Use non-upstream implementation for SlCopyBytes
 2024-02-19 18:58:32 +00:00
Jonathan G Rennison
8a85055c68 Saveload: Use std::span for autosave temporary buffer view 2024-02-19 18:58:32 +00:00
translators
f1bf39f38b Update: Translations from eints 
english (au): 12 changes by krysclarke
chinese (simplified): 84 changes by WenSimEHRP
russian: 13 changes by Ln-Wolf
finnish: 12 changes by hpiirai
ukrainian: 12 changes by StepanIvasyn
latvian: 19 changes by lexuslatvia
french: 1 change by ZarTek-Creole
portuguese (brazilian): 169 changes by pasantoro
polish: 12 changes by pAter-exe
 2024-02-19 18:35:28 +00:00
Jonathan G Rennison
75dd135e8d Merge tag '14.0-beta3' into jgrpp 
# Conflicts:
#	regression/regression/result.txt
#	src/industrytype.h
#	src/network/core/config.h
#	src/network/core/network_game_info.cpp
#	src/network/core/network_game_info.h
#	src/network/core/packet.cpp
#	src/network/core/packet.h
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_admin.cpp
#	src/network/core/tcp_content.cpp
#	src/network/core/tcp_coordinator.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/core/tcp_turn.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_admin.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_command.cpp
#	src/network/network_content.cpp
#	src/network/network_internal.h
#	src/network/network_query.cpp
#	src/network/network_query.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_turn.cpp
#	src/network/network_udp.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
 2024-02-19 17:57:05 +00:00
FedelloKirfed
2e3e93fe32 Update Galician Translations 
(cherry picked from commit 10596e84cf7ba41b5b67b5f2972005bf2e1f4123)

#653
 2024-02-19 04:44:03 +00:00
Jonathan G Rennison
1040f9612f Saveload: Tag duplicate detection in SlTableHeader as maybe unused 2024-02-19 04:26:42 +00:00
Jonathan G Rennison
a874bb70b1 Remove unused saveload desc in cheats_sl.cpp 2024-02-19 04:25:44 +00:00
Jonathan G Rennison
6ab1f9a416 Use CargoID instead of CargoSpec in town_production_cargoes 2024-02-19 04:19:09 +00:00
Jonathan G Rennison
19e4895ffd Add cargo mask of town production cargoes 
Use for all non-GUI cases (where display sort order is not required)
 2024-02-19 04:11:25 +00:00
Jonathan G Rennison
8581808952 Merge tag '14.0-beta2' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	src/cargotype.cpp
#	src/console_cmds.cpp
#	src/graph_gui.cpp
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/misc_gui.cpp
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_town.cpp
#	src/object_cmd.cpp
#	src/openttd.cpp
#	src/pathfinder/water_regions.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/table/build_industry.h
#	src/table/engines.h
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
 2024-02-19 03:23:19 +00:00
Jonathan G Rennison
c6893388ab Fix order flags collision in OT_GOTO_DEPOT 
Move depot wait is timetabled flag to xflags
 2024-02-19 00:41:05 +00:00
Jonathan G Rennison
821c5970db Disallow unbunching if auto-separation, scheduled dispatch or per-cargo full load 2024-02-19 00:13:55 +00:00
Jonathan G Rennison
f9e8a49df0 Auto-separation: Do not allow enabling if unbunching is present 
Check for scheduled dispatch/unbunching in enable command
Show in button tooltip
 2024-02-18 23:30:19 +00:00
Jonathan G Rennison
df2d4bd83c Scheduled dispatch: Do not allow enabling if unbunching is present 
Check for auto-separation/unbunching in enable command
Show in enable button tooltip and summary text
 2024-02-18 23:29:38 +00:00
Jonathan G Rennison
0fd3f93310 Debug: Add unbunching state to debug info 2024-02-18 22:22:29 +00:00
Jonathan G Rennison
8f9783e7d3 Debug: Adjust vehicle debug text order/indentation 2024-02-18 22:22:29 +00:00
Jonathan G Rennison
fdd666f66a Merge tag '14.0-beta1' into jgrpp 
# Conflicts:
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/aircraft.h
#	src/animated_tile.h
#	src/base_consist.h
#	src/cargotype.h
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/engine_gui.cpp
#	src/industry_gui.cpp
#	src/lang/english.txt
#	src/music/extmidi.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_industries.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/order_type.h
#	src/os/macosx/misc_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_gui.cpp
#	src/rail_gui.h
#	src/roadveh.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/script/api/script_town.cpp
#	src/settingsgen/settingsgen.cpp
#	src/ship.h
#	src/ship_cmd.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen.h
#	src/table/settings/script_settings.ini
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_cmd.h
#	src/town_gui.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/waypoint_base.h
#	src/widget.cpp
 2024-02-18 22:22:29 +00:00
Rubidium
a4d4301a0c Codechange: We are heading to 15 2024-02-18 21:48:54 +01:00
translators
73bed054b8 Update: Translations from eints 
english (au): 2 changes by krysclarke
korean: 5 changes by telk5093
russian: 2 changes by Ln-Wolf
tamil: 45 changes by Aswn
portuguese: 1 change by azulcosta
hindi: 85 changes by NisheshTyagi
portuguese (brazilian): 119 changes by pasantoro
 2024-02-18 18:35:02 +00:00
Rubidium
15be383b93 Fix a253205: remove (now) unused currency separator 2024-02-18 16:56:52 +01:00
Tyler Trahan
4f1bc39bf7 Change: Show speed before destination in vehicle status bar (#11932) 2024-02-18 10:44:11 -05:00
Tyler Trahan
87a80c7ff2 Change: When adding orders, Ctrl+Click on a depot to unbunch, instead of service if required (#12023) 2024-02-18 10:43:44 -05:00
frosch
555a37930b Fix: Shadows of individual character glyphs could be drawn over other characters (#12115) 2024-02-18 16:30:54 +01:00
Damian Laczak
49c3215751 Fix #10983: [AdminPort] Correct order of messages 2024-02-18 15:11:00 +01:00
Peter Nelson
f20d241e81 Fix a258833: Don't invalidate station list on vehicle load/unload. (#12112) 
a258833 fixed a bug but as a result causes the station list to be rebuilt every time (once per game tick) a vehicle loads/unloads.

Instead just mark the window for redraw.
 2024-02-18 12:20:11 +00:00
Koen Bussemaker
8a1cea2ab6 Codechange: Skip non-water water region patches in neigbor search 2024-02-18 11:46:34 +01:00
Rubidium
360fe8b0b6 Fix a253205: division by zero when attempting to format some short currencies 2024-02-17 22:45:48 +01:00
Jonathan G Rennison
f0fdc882ea Fix town action description texts in wallclock mode 2024-02-17 18:40:53 +00:00
translators
03e3553230 Update: Translations from eints 
estonian: 15 changes by RM87
portuguese (brazilian): 42 changes by pasantoro
polish: 30 changes by pAter-exe
 2024-02-17 18:35:04 +00:00
Peter Nelson
2ecc3c90f7 Change: Improve performance of finding free pool slots. (#12055) 
Add a bitmap of used pool slots which allows finding a free pool slot without having to check if each index is already used or not.

Loosely based on a JGRPP patch.
 2024-02-17 18:29:21 +00:00
Rubidium
1aa9a5c0ab Update: Use proper number formats and abbreviations for Chinese, Japanese, Korean and German 2024-02-17 14:33:16 +01:00
Rubidium
59f56941e5 Update: Number format configuration based on old digitsep and STR_CURRENCY_SHORT_* values 2024-02-17 14:33:16 +01:00
Rubidium
7e2eefb91f Cleanup: Remove digit group separators from strgen and languages 2024-02-17 14:33:16 +01:00
Rubidium
b741b2ba6f Feature: Fully user configurable number format and abbreviations 2024-02-17 14:33:16 +01:00
Rubidium
609d0071d5 Change: Remove saving of digit group and decimal separator configurations from the savegame 2024-02-17 14:33:16 +01:00
Rubidium
e67fc33172 Codechange: Add support for NULL strings in SaveLoadCompat 2024-02-17 14:33:16 +01:00
Rubidium
9f8fd80112 Feature: Fully customisable number abbreviations per translation 2024-02-17 14:33:16 +01:00
Rubidium
a253205b93 Feature: Fully customisable number format per translation 2024-02-17 14:33:16 +01:00
Rubidium
819c6c756e Codechange: Add support for number format and abbreviations pragmas/attributes to strgen 2024-02-17 14:33:16 +01:00
Rubidium
fca8166087 Codechange: Simplify FormatNumber by moving out zero fill and decimal support 2024-02-17 14:33:16 +01:00
Rubidium
a44bd81280 Codechange: Move determining the decimal separator to a separate function 2024-02-17 14:33:16 +01:00
Rubidium
f0c50ad529 Codechange: Add function to get the power of ten for a given number 2024-02-17 14:33:16 +01:00
Jonathan G Rennison
d4d6ad2dfc Debug: Include various speed/acceleration values in vehicle debug window 2024-02-17 12:25:32 +00:00
Jonathan G Rennison
94d326b1e0 Iconv: Ensure that OTTD2FS/FS2OTTD are thread-safe 2024-02-17 12:04:16 +00:00
Jonathan G Rennison
838b166726 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_base.h
#	src/debug.cpp
#	src/debug.h
#	src/economy.cpp
#	src/engine_type.h
#	src/graph_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_cmd.h
#	src/network/core/os_abstraction.cpp
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings_type.h
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/tests/bitmath_func.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
 2024-02-17 11:53:35 +00:00
Jonathan G Rennison
074447138c Add method for whether calendar is frozen 2024-02-17 10:18:09 +00:00
rubidium42
8bccb5805a Fix 0ca4b4e: Ctrl+Click style inconsistency in base language (#12099) 2024-02-17 06:26:09 +00:00
Jonathan G Rennison
7938844d1d Vehicles age at calendar speed in wallclock mode 2024-02-16 20:23:23 +00:00