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
|
3 months ago |
FedelloKirfed
|
2e3e93fe32
|
Update Galician Translations
(cherry picked from commit 10596e84cf)
#653
|
3 months ago |
|
Jonathan G Rennison
|
1040f9612f
|
Saveload: Tag duplicate detection in SlTableHeader as maybe unused
|
3 months ago |
|
Jonathan G Rennison
|
a874bb70b1
|
Remove unused saveload desc in cheats_sl.cpp
|
3 months ago |
|
Jonathan G Rennison
|
6ab1f9a416
|
Use CargoID instead of CargoSpec in town_production_cargoes
|
3 months ago |
|
Jonathan G Rennison
|
19e4895ffd
|
Add cargo mask of town production cargoes
Use for all non-GUI cases (where display sort order is not required)
|
3 months ago |
|
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
|
3 months ago |
|
Jonathan G Rennison
|
c6893388ab
|
Fix order flags collision in OT_GOTO_DEPOT
Move depot wait is timetabled flag to xflags
|
3 months ago |
|
Jonathan G Rennison
|
821c5970db
|
Disallow unbunching if auto-separation, scheduled dispatch or per-cargo full load
|
3 months ago |
|
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
|
3 months ago |
|
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
|
3 months ago |
|
Jonathan G Rennison
|
0fd3f93310
|
Debug: Add unbunching state to debug info
|
3 months ago |
|
Jonathan G Rennison
|
8f9783e7d3
|
Debug: Adjust vehicle debug text order/indentation
|
3 months ago |
|
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
|
3 months ago |
|
Jonathan G Rennison
|
f0fdc882ea
|
Fix town action description texts in wallclock mode
|
3 months ago |
|
Jonathan G Rennison
|
d4d6ad2dfc
|
Debug: Include various speed/acceleration values in vehicle debug window
|
3 months ago |
|
Jonathan G Rennison
|
94d326b1e0
|
Iconv: Ensure that OTTD2FS/FS2OTTD are thread-safe
|
3 months ago |
|
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
|
3 months ago |
|
Jonathan G Rennison
|
074447138c
|
Add method for whether calendar is frozen
|
3 months ago |
|
Jonathan G Rennison
|
7938844d1d
|
Vehicles age at calendar speed in wallclock mode
|
4 months ago |
|
Jonathan G Rennison
|
b940fa9466
|
Do not scale shown running costs by the day length factor
Show in original years
|
4 months ago |
|
Jonathan G Rennison
|
3ec77973df
|
Fix setting callbacks when using setting_newgame console command
See: https://github.com/OpenTTD/OpenTTD/issues/12059
|
4 months ago |
|
Jonathan G Rennison
|
bd74340416
|
Disable settings inapplicable for the current timekeeping mode
|
4 months ago |
|
Jonathan G Rennison
|
75645b8563
|
Allow disabling a setting via guiproc
|
4 months ago |
|
Jonathan G Rennison
|
c45bfccc2e
|
Always use 27ms/tick in wallclock timing mode
|
4 months ago |
|
Jonathan G Rennison
|
450c6b76d6
|
Ensure tile loop counts and cargo scalers updated when day length changed
|
4 months ago |
|
Jonathan G Rennison
|
86a6f63e2f
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/commit-checker.yml
# .github/workflows/release-linux-legacy.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows-store.yml
# .github/workflows/release-windows.yml
# .github/workflows/upload-cdn.yml
# .github/workflows/upload-gog.yml
# .github/workflows/upload-steam.yml
# src/console_cmds.cpp
# src/core/math_func.hpp
# src/fios.cpp
# src/fios.h
# src/intro_gui.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/settings_type.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/difficulty_settings.ini
# src/table/settings/economy_settings.ini
# src/table/settings/game_settings.ini
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/table/settings/locale_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/multimedia_settings.ini
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/table/settings/news_display_settings.ini
# src/table/settings/old_gameopt_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/table/settings/script_settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
# src/table/settings/world_settings.ini
# src/viewport.cpp
# src/viewport_func.h
# src/window.cpp
|
4 months ago |
|
Jonathan G Rennison
|
cbde4b00ab
|
Crashlog: Change ordering to put settings and command log before gamelog
|
4 months ago |
|
Jonathan G Rennison
|
a48e15dce0
|
Add wallclock time settings
|
4 months ago |
|
Jonathan G Rennison
|
58f8971f17
|
Add console command to get version information
See: #652
|
4 months ago |
|
Jonathan G Rennison
|
53f86b3aab
|
Allow using strong type with SetDParamMaxValue
|
4 months ago |
Tyler Trahan
|
b5b12da91b
|
Add: AI/GS Time Mode to choose between economy (default) and calendar time (#11603)
(cherry picked from commit bbdbf9a589)
|
4 months ago |
|
Jonathan G Rennison
|
1f5b35fac4
|
Change link graph join and compression times to use scaled tick counter
|
4 months ago |
|
Jonathan G Rennison
|
edbbaeb5d9
|
Add ScaledTickCounter type
|
4 months ago |
|
Jonathan G Rennison
|
c5f026ba66
|
Fix multi-cargo ship capacity display in autoreplace and available ships windows
|
4 months ago |
|
Jonathan G Rennison
|
b13b2781bd
|
Add string codes for upstream wallclock mode, add upstream language changes
|
4 months ago |
|
Jonathan G Rennison
|
fc40f485ff
|
Fix changing the day length setting not immediately taking effect
|
4 months ago |
|
Jonathan G Rennison
|
e98d9a1d1d
|
Strings: Remove DATE_WALLCLOCK_* string codes, add TT_TIME
|
4 months ago |
|
Jonathan G Rennison
|
7ce06e22b8
|
Split date types into calendar and economy dates
See: 735abfe1
|
4 months ago |
|
Jonathan G Rennison
|
fad5ee56e7
|
Update fmt StrongType adapter
|
4 months ago |
|
Jonathan G Rennison
|
5b38b874c5
|
Allow StrongType types in settings tables
|
4 months ago |
|
Jonathan G Rennison
|
f02d04fa12
|
Debug: Add vehicle engine cargo load speed and cargo ageing factors
|
4 months ago |
|
Jonathan G Rennison
|
5bf478a902
|
Zoning: Disable company-only overlay modes in spectator
|
4 months ago |
|
Jonathan G Rennison
|
7460e73252
|
SaveLoad: Fix crash when joining network server which used GRF custom town zones
|
4 months ago |
|
Jonathan G Rennison
|
7234cdd9fd
|
Advance state ticks in the title menu game
|
4 months ago |
|
Jonathan G Rennison
|
2f1d2a9f4b
|
Survey: Don't transmit invalid realtime duration
|
4 months ago |
|
Jonathan G Rennison
|
903adceab5
|
Maintain map of targeted road vehicles to small UFO disaster vehicle
|
4 months ago |
|
Jonathan G Rennison
|
1e2834a422
|
Use upstream/table format for game log chunk
|
4 months ago |
|
Jonathan G Rennison
|
0f7eb3d8d5
|
Add road vehicle direction to order window manage order dropdown
|
4 months ago |
|
Jonathan G Rennison
|
b05738284b
|
Windows: Avoid destruction of unjoined std::thread on ExitProcess
See: #649
|
4 months ago |