Commit Graph

769 Commits (jgrpp)

Author SHA1 Message Date
Jonathan G Rennison c3b05c5346 Add console command to find objects with missing specs 3 days ago
Jonathan G Rennison 63758e412c Exclude non-default style only GRFs when determining default style lookahead 5 days ago
Jonathan G Rennison 015d599213 Merge branch 'master' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/depot_gui.cpp
#	src/genworld_gui.cpp
#	src/group_gui.cpp
#	src/landscape.cpp
#	src/main_gui.cpp
#	src/network/core/tcp_admin.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/newgrf_class.h
#	src/newgrf_debug_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station_gui.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/tree_cmd.cpp
#	src/tree_map.h
#	src/vehicle_gui.cpp
#	src/waypoint_gui.cpp
6 days ago
Jonathan G Rennison f7de298042 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release-macos.yml
#	os/macosx/Info.plist.in
#	src/base_media_base.h
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/null.hpp
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cheat_gui.cpp
#	src/command_type.h
#	src/company_cmd.cpp
#	src/company_cmd.h
#	src/date_gui.cpp
#	src/dropdown.cpp
#	src/error_gui.cpp
#	src/fontcache/truetypefontcache.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/gfx_layout.cpp
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_debug_gui.cpp
#	src/newgrf_text.h
#	src/news_gui.cpp
#	src/openttd.cpp
#	src/order_base.h
#	src/order_gui.cpp
#	src/os/macosx/font_osx.cpp
#	src/pathfinder/yapf/yapf_costcache.hpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/roadstop_base.h
#	src/screenshot.cpp
#	src/script/api/script_cargolist.cpp
#	src/script/api/script_order.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/spritecache.h
#	src/station_gui.cpp
#	src/table/settings/gui_settings.ini
#	src/tests/mock_spritecache.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/opengl.cpp
#	src/video/opengl.h
#	src/widget.cpp
#	src/widget_type.h
#	src/window.cpp
#	src/window_gui.h
3 weeks ago
Jonathan G Rennison a6537accf9 Use label dumper wrapper for printing NewGRF labels 3 weeks ago
Jonathan G Rennison c40ba9782c Add more information to getfulldate console command 1 month ago
Jonathan G Rennison 37b129c3c0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/effectvehicle.cpp
#	src/fileio.cpp
#	src/gfx.cpp
#	src/newgrf_commons.h
#	src/road_gui.cpp
#	src/saveload/gamelog_sl.cpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_table.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/sortlist_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/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/video/opengl.cpp
#	src/viewport.cpp
2 months ago
Rubidium 3094b0ce1d Feature: admin support for password authentication without sending password
Using either password authenticated key exchange (PAKE) or authorized keys
3 months ago
Michal Charemza c4b1596c97
Add: [Console] schedule command to execute a script file next in-game month (#12761) 3 months ago
Jonathan G Rennison e2dc3a9ac4 Viewport: Use column-aligned block data type for dirty block tracking
Use bit operations to reduce looping over individual bits where possible
3 months ago
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
3 months ago
Jonathan G Rennison c67f14dc88 Merge branch 'master' into jgrpp
# Conflicts:
#	src/fileio.cpp
#	src/fileio_func.h
#	src/industry_cmd.cpp
#	src/ini.cpp
#	src/openttd.cpp
#	src/os/windows/win32_main.cpp
#	src/settingsgen/settingsgen.cpp
#	src/strgen/strgen.cpp
#	src/strings.cpp
4 months ago
Jonathan G Rennison 556722399a Move EngineOverrideManager to separate header 4 months ago
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
4 months ago
Jonathan G Rennison cbea3b8b46 Add console command to merge two companies 4 months ago
Jonathan G Rennison 7874fb7a12 Add public key auth support for settings_access console command 4 months 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
4 months ago
Peter Nelson f6c5da4cad
Fix: Incorrect dump_info output with labels outside of ascii range. (#12723)
An unspecified cargo label is 0x00000000, which terminates C-strings.
4 months ago
Rubidium b2f1a06def Change: support listing/updating authorized keys of companies by the admin in the console 4 months ago
Jonathan G Rennison 8907b9aa31 Reduce diff with upstream for console command functionality 4 months ago
Jonathan G Rennison 18a42664fc Merge branch 'master' into jgrpp
Remove 'byte' typedef
5 months ago
Rubidium a9318cf653 Cleanup: remove UI for changing the password 5 months ago
Rubidium 9dc1fdc385 Cleanup: remove client side password checks when moving to a different company 5 months ago
Rubidium a002803d1c Remove: autoclean_unprotected settings; all companies will be protected 5 months ago
Peter Nelson e20f48799e
Codechange: Make StringToContentType() clearer. (#12566)
Decouples string to ContentType mapping from position within enum.

Slightly less efficient, but removes lengthof, array indices, and casting.
5 months ago
ladysadie 727392e0b3
Codechange: Remove per font AA settings. (#12413)
OpenTTD will use the global AA font setting for all fonts from now on.
5 months ago
Peter Nelson 4eaeccdaeb
Codechange: Introduce FioRemove() to remove files. (#12491)
New function FioRemove() handles OTTD2FS conversion, and uses std::filesystem::remove instead of unlink, all in one location.
5 months ago
merni-ns 92a171c3e0
Doc: Improve the output and documentation of the font command. (#12392)
Now that the default font =/= sprite font, there is a different way to invoke the sprite font, and default size applies to default (not sprite).
Also, interface scaling now affects the font size.
6 months ago
Rubidium a12f166815 Fix: crash to desktop when attempting to join a company while not joined (yet)
(cherry picked from commit 0f25eaa271)

# Conflicts:
#	src/console_cmds.cpp
6 months ago
Rubidium 0f25eaa271 Fix: crash to desktop when attempting to join a company while not joined (yet) 6 months ago
Rubidium 7580eac2d5 Codechange: create helper class for useful NetworkAuthorizedKeys functions 6 months ago
Rubidium 4af089b9be Feature: console command to change authorized keys 6 months ago
Rubidium b7dfa3eb90 Feature: authorized key authentication for rcon 6 months ago
Patric Stout a3cfd23cf9
Codechange: rename byte to uint8_t (#12308) 6 months ago
Jonathan G Rennison 3fcfe5b53e Fix `help dump_version` console command also executing command
See: #668
6 months ago
Jonathan G Rennison ba79f7b2ba Merge branch 'master' into jgrpp
# Conflicts:
#	src/base_station_base.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/object_gui.cpp
#	src/saveload/settings_sl.cpp
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/timer/timer_game_calendar.cpp
7 months ago
Rubidium aff09306de Fix #12076: Do not allow 'join' command on dedicated servers 7 months ago
Jonathan G Rennison 7e0acd686e Add NewGRF signal style flag to draw on both sides 7 months ago
Jonathan G Rennison 090656bd7f Adjust handling of year display in wallclock mode and company inauguration years
See: #657
7 months ago
Jonathan G Rennison bbd34bb6db Increase information shown in getfulldate console command 7 months ago
Jonathan G Rennison ea0fa2194a Add debug console command to unblock bay road stops with incorrect occupancy state 7 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
7 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
7 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
7 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
7 months ago
Jonathan G Rennison 58f8971f17 Add console command to get version information
See: #652
7 months ago
Jonathan G Rennison 1f5b35fac4 Change link graph join and compression times to use scaled tick counter 7 months ago
Jonathan G Rennison 7ce06e22b8 Split date types into calendar and economy dates
See: 735abfe1
7 months ago
Loïc Guilloux 79374bc003
Fix #12074: Don't allow "part" command for dedicated servers (#12075) 7 months ago
Peter Nelson 2fd9096070
Change: Decouple and remove landscape-dependent cargo types. (#11719)
Cargo types of default engines, industries and houses are now specified in terms of label.
8 months ago