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

2708 Commits

Author SHA1 Message Date
Jonathan G Rennison
991bde6600 Allow changing max tunnel length and max bridge heights in network games 2024-06-27 17:15:16 +01:00
Jonathan G Rennison
a64a3541fd Debug: Show vehicle progress in vehicle debug info 2024-06-18 17:28:18 +01:00
Jonathan G Rennison
de36e9545e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/cargopacket.h
#	src/cargotype.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/timer/timer_game_common.h
#	src/town.h
 2024-06-13 20:44:49 +01:00
Alistair Lynn
7ef8706ed2 Add: Setting to uniformly slow the acceleration and braking of realistic trains 
This does not affect the maximum speed.
 2024-05-31 23:46:59 +01:00
Jonathan G Rennison
32b8ec34ff Merge branch 'master' into jgrpp 
# Conflicts:
#	src/autoreplace_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/debug.cpp
#	src/engine_gui.h
#	src/error_gui.cpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/saveload/saveload.cpp
#	src/screenshot_gui.cpp
#	src/sound/win32_s.cpp
#	src/statusbar_gui.cpp
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/viewport.cpp
 2024-05-31 22:57:16 +01:00
Jonathan G Rennison
99e6b75337 Move NewGRF sprite dump declarations to new header file 2024-05-30 19:05:32 +01:00
Jonathan G Rennison
853ed272be Merge branch 'master' into jgrpp 
# Conflicts:
#	src/airport_gui.cpp
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/32bpp_simple.cpp
#	src/blitter/32bpp_sse2.cpp
#	src/blitter/8bpp_optimized.cpp
#	src/blitter/8bpp_simple.cpp
#	src/blitter/null.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/dropdown.cpp
#	src/dropdown_type.h
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/main_gui.cpp
#	src/newgrf_debug_gui.cpp
#	src/news_gui.cpp
#	src/news_type.h
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/signs.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/spriteloader/grf.cpp
#	src/texteff.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/opengl.cpp
#	src/viewport.cpp
#	src/waypoint_cmd.cpp
#	src/zoom_type.h
 2024-05-30 17:54:01 +01:00
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
 2024-05-28 20:33:35 +01:00
Jonathan G Rennison
f2f8692fb2 Add setting to allow track editing to ignore realistic braking restrictions 2024-05-28 17:13:09 +01:00
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
 2024-05-27 16:17:10 +01:00
Jonathan G Rennison
18a42664fc Merge branch 'master' into jgrpp 
Remove 'byte' typedef
 2024-05-07 17:21:50 +01:00
Jonathan G Rennison
f1c0f864f5 Add setting to shorten vehicle view status text 2024-05-06 20:00:34 +01:00
Jonathan G Rennison
d90c540f9e Enable economy day length scaling in wallclock timekeeping mode 2024-04-30 18:04:04 +01:00
Jonathan G Rennison
9a07f14f56 Show running costs in calendar years by default 2024-04-29 22:57:02 +01:00
Peter Nelson
96ddabb30c Codechange: Remove write-only spec_id from RoadStopSpec. (#12582) 
Comment is incorrect about its value too.

(cherry picked from commit 72c55128d2129f824a60a35fb5aa601409af4a3d)
 2024-04-29 17:13:11 +01:00
Jonathan G Rennison
3136f08b86 Debug: Fix display of engine cargo age period and reliability decay speed 2024-04-21 19:59:53 +01:00
Jonathan G Rennison
0150f8f570 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/network/network_server.cpp
 2024-04-18 17:37:25 +01:00
ladysadie
727392e0b3 Codechange: Remove per font AA settings. (#12413) 
OpenTTD will use the global AA font setting for all fonts from now on.
 2024-04-15 21:44:33 +02:00
Jonathan G Rennison
28e74005d0 Remove various uses of lengthof on std::array 2024-04-08 19:55:58 +01:00
Rubidium
1fcf1a136d Codechange: use single function returning std::span over two functions that return size and begin 2024-04-07 22:02:16 +02:00
Peter Nelson
7572cfd103 Codechange: Redefine ZOOM_LVL so that ZOOM_LVL_NORMAL is 1x zoom. 
This matches expectations of what normal zoom means.
 2024-04-04 22:27:03 +01:00
Peter Nelson
00e0021e3a Codechange: Don't assume accepted/produced slot exists. 2024-04-01 21:35:20 +01:00
Peter Nelson
3e83dcedfd Codechange: Allocate houses dynamically instead of from a fixed array. 
This uses vectors for HouseSpecs and global/town building counts.
 2024-03-28 23:23:00 +01:00
Rubidium
dd532cbc77 Codechange: add setting for authorized/secret/public keys 2024-03-17 19:09:22 +01:00
Jonathan G Rennison
20b8cb3059 Add setting to use object land ground for purchased land 
Default on
 2024-03-17 12:31:50 +00:00
Patric Stout
a3cfd23cf9 Codechange: rename byte to uint8_t (#12308) 2024-03-16 23:59:32 +01:00
Jonathan G Rennison
3284bd68e3 Debug: Show engine company and climate availability in debug info 2024-03-16 16:53:17 +00:00
Loïc Guilloux
818a57c9af Codechange: Actually use LIT_NONE (#12314) 2024-03-16 16:41:58 +00:00
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
 2024-03-09 21:44:36 +00:00
Jonathan G Rennison
5b88ea6857 Revert "Add setting to disable script parameter randomisation" 
This reverts commit 2bb5c9ac84.
 2024-03-09 20:14:32 +00:00
jcteotonio
63b9284a7e Add: Portuguese Escudo currency (#12108) 2024-03-08 14:25:01 +01:00
Jonathan G Rennison
2bb5c9ac84 Add setting to disable script parameter randomisation 2024-03-02 11:39:41 +00:00
Jonathan G Rennison
e730956213 Re-add "path signals only" mode to the signal cycle setting 2024-03-02 11:39:41 +00:00
Jonathan G Rennison
7e0acd686e Add NewGRF signal style flag to draw on both sides 2024-02-27 19:18:50 +00:00
Jonathan G Rennison
1e0ff41d33 Add UI setting to show speed before destination in vehicle status bar 2024-02-26 20:58:52 +00:00
Jonathan G Rennison
5d7c87f5e4 Add setting for whether to show vehicle running costs per calendar year 
See #660
 2024-02-26 20:50:20 +00:00
Jonathan G Rennison
b38321b9b4 Add setting to only spawn primary industries 2024-02-23 00:10:02 +00:00
Jonathan G Rennison
45b6079899 Add string code for absolute timetable time 2024-02-22 21:12:38 +00:00
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
 2024-02-22 20:40:12 +01:00
Jonathan G Rennison
4469925605 Add missing typename specifier 2024-02-21 00:48:41 +00:00
Jonathan G Rennison
f32eef4f38 Allow changing time-keeping mode in-game 2024-02-20 18:11:03 +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
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
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
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
15be383b93 Fix a253205: remove (now) unused currency separator 2024-02-18 16:56:52 +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