Jonathan G Rennison
|
1e9fb74451
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/release-windows.yml
# src/autoreplace_gui.cpp
# src/cargotype.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/company_gui.cpp
# src/currency.h
# src/date_gui.cpp
# src/dropdown.cpp
# src/dropdown_func.h
# src/dropdown_type.h
# src/game/game_gui.cpp
# src/genworld.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/house.h
# src/industry_gui.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_type.h
# src/newgrf_class_func.h
# src/newgrf_house.cpp
# src/newgrf_roadstop.h
# src/openttd.cpp
# src/order_gui.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/screenshot_gui.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/slider.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/survey.cpp
# src/tile_map.h
# src/town_cmd.cpp
# src/town_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
|
1 month ago |
|
Jonathan G Rennison
|
f2f8692fb2
|
Add setting to allow track editing to ignore realistic braking restrictions
|
1 month ago |
|
Jonathan G Rennison
|
84a0dd326f
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_cmds.cpp
# src/network/core/config.h
# src/network/core/packet.h
# src/network/core/tcp.cpp
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_gui.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/table/settings/network_secrets_settings.ini
|
1 month ago |
|
Jonathan G Rennison
|
18a42664fc
|
Merge branch 'master' into jgrpp
Remove 'byte' typedef
|
2 months ago |
|
Jonathan G Rennison
|
f1c0f864f5
|
Add setting to shorten vehicle view status text
|
2 months ago |
|
Jonathan G Rennison
|
d90c540f9e
|
Enable economy day length scaling in wallclock timekeeping mode
|
2 months ago |
|
Jonathan G Rennison
|
9a07f14f56
|
Show running costs in calendar years by default
|
2 months ago |
Peter Nelson
|
96ddabb30c
|
Codechange: Remove write-only spec_id from RoadStopSpec. (#12582)
Comment is incorrect about its value too.
(cherry picked from commit 72c55128d2)
|
2 months ago |
|
Jonathan G Rennison
|
3136f08b86
|
Debug: Fix display of engine cargo age period and reliability decay speed
|
2 months ago |
|
Jonathan G Rennison
|
0150f8f570
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/network/network_server.cpp
|
2 months ago |
|
Jonathan G Rennison
|
28e74005d0
|
Remove various uses of lengthof on std::array
|
3 months ago |
|
Peter Nelson
|
3e83dcedfd
|
Codechange: Allocate houses dynamically instead of from a fixed array.
This uses vectors for HouseSpecs and global/town building counts.
|
3 months ago |
Rubidium
|
dd532cbc77
|
Codechange: add setting for authorized/secret/public keys
|
4 months ago |
|
Jonathan G Rennison
|
20b8cb3059
|
Add setting to use object land ground for purchased land
Default on
|
4 months ago |
Patric Stout
|
a3cfd23cf9
|
Codechange: rename byte to uint8_t (#12308)
|
4 months ago |
|
Jonathan G Rennison
|
3284bd68e3
|
Debug: Show engine company and climate availability in debug info
|
4 months ago |
Loïc Guilloux
|
818a57c9af
|
Codechange: Actually use LIT_NONE (#12314)
|
4 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
|
4 months ago |
|
Jonathan G Rennison
|
5b88ea6857
|
Revert "Add setting to disable script parameter randomisation"
This reverts commit 2bb5c9ac84.
|
4 months ago |
jcteotonio
|
63b9284a7e
|
Add: Portuguese Escudo currency (#12108)
|
4 months ago |
|
Jonathan G Rennison
|
2bb5c9ac84
|
Add setting to disable script parameter randomisation
|
4 months ago |
|
Jonathan G Rennison
|
e730956213
|
Re-add "path signals only" mode to the signal cycle setting
|
4 months ago |
|
Jonathan G Rennison
|
7e0acd686e
|
Add NewGRF signal style flag to draw on both sides
|
4 months ago |
|
Jonathan G Rennison
|
1e0ff41d33
|
Add UI setting to show speed before destination in vehicle status bar
|
4 months ago |
|
Jonathan G Rennison
|
5d7c87f5e4
|
Add setting for whether to show vehicle running costs per calendar year
See #660
|
4 months ago |
|
Jonathan G Rennison
|
b38321b9b4
|
Add setting to only spawn primary industries
|
4 months ago |
|
Jonathan G Rennison
|
45b6079899
|
Add string code for absolute timetable time
|
4 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
|
4 months ago |
|
Jonathan G Rennison
|
4469925605
|
Add missing typename specifier
|
4 months ago |
|
Jonathan G Rennison
|
f32eef4f38
|
Allow changing time-keeping mode in-game
|
4 months ago |
|
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
|
4 months ago |
|
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
|
4 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
|
4 months ago |
|
Jonathan G Rennison
|
0fd3f93310
|
Debug: Add unbunching state to debug info
|
4 months ago |
|
Jonathan G Rennison
|
8f9783e7d3
|
Debug: Adjust vehicle debug text order/indentation
|
4 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
|
4 months ago |
|
Rubidium
|
15be383b93
|
Fix a253205: remove (now) unused currency separator
|
4 months ago |
|
Rubidium
|
b741b2ba6f
|
Feature: Fully user configurable number format and abbreviations
|
4 months ago |
|
Rubidium
|
609d0071d5
|
Change: Remove saving of digit group and decimal separator configurations from the savegame
|
4 months ago |
|
Jonathan G Rennison
|
d4d6ad2dfc
|
Debug: Include various speed/acceleration values in vehicle debug window
|
4 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
|
4 months ago |
|
Jonathan G Rennison
|
bd74340416
|
Disable settings inapplicable for the current timekeeping mode
|
5 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
|
5 months ago |
|
Jonathan G Rennison
|
a48e15dce0
|
Add wallclock time settings
|
5 months ago |
|
Jonathan G Rennison
|
b13b2781bd
|
Add string codes for upstream wallclock mode, add upstream language changes
|
5 months ago |
|
Jonathan G Rennison
|
e98d9a1d1d
|
Strings: Remove DATE_WALLCLOCK_* string codes, add TT_TIME
|
5 months ago |
|
Jonathan G Rennison
|
7ce06e22b8
|
Split date types into calendar and economy dates
See: 735abfe1
|
5 months ago |
|
Peter Nelson
|
1e82d75fa2
|
Fix f1144de: "knots" missing from settings units list. (#12082)
Knots were added as a setting but not included in the settings list so were saved as a number instead of string.
|
5 months ago |
|
Jonathan G Rennison
|
5b38b874c5
|
Allow StrongType types in settings tables
|
5 months ago |
|
Jonathan G Rennison
|
f02d04fa12
|
Debug: Add vehicle engine cargo load speed and cargo ageing factors
|
5 months ago |