Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,390 Commits 12 Branches 180 Tags 450 MiB
c0d47da4a7
Commit Graph

55390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
3a47b421b0 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_cmd.cpp
#	src/core/overflowsafe_type.hpp
#	src/economy.cpp
#	src/engine_base.h
#	src/ground_vehicle.cpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/newgrf_commons.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_industries.cpp
#	src/newgrf_object.cpp
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/rail_gui.cpp
#	src/road_cmd.h
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/script/api/script_log.cpp
#	src/script/api/script_log.hpp
#	src/settings_gui.cpp
#	src/settingsgen/settingsgen.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_gui.cpp
#	src/strgen/strgen.cpp
#	src/string_func.h
#	src/string_type.h
#	src/table/settings/network_private_settings.ini
#	src/tests/math_func.cpp
#	src/textfile_gui.cpp
#	src/timetable_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
#	src/waypoint_cmd.h
#	src/widgets/dropdown.cpp
 2023-06-03 19:16:57 +01:00
Jonathan G Rennison
69c118a2cb Documentation: Update info on road stop and object extended byte format 2023-06-03 11:07:13 +01:00
Jonathan G Rennison
36fadb5424 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/base_station_base.h
#	src/newgrf.cpp
#	src/newgrf_class.h
#	src/newgrf_class_func.h
#	src/newgrf_commons.cpp
#	src/newgrf_commons.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_station.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
 2023-06-03 11:07:01 +01:00
Jonathan G Rennison
fc80a93672 Fix object town variables when no town is present 2023-06-02 22:19:54 +01:00
Jonathan G Rennison
3d4133cadb Debug: Fix debug window parent scope button with missing town 2023-06-02 22:18:40 +01:00
Jonathan G Rennison
5615cee503 Show town count in town directory window 2023-06-02 18:47:58 +01:00
Jonathan G Rennison
819b9fcdd9 Include 'perfect' mode in tree placer setting helptext 2023-06-02 18:41:52 +01:00
Jonathan G Rennison
58c0aac15f Fix re-opening GRF/script settings windows not closing drop down windows 
Causing assertion failure on drop down item selection

See: #527
 2023-06-01 21:12:16 +01:00
Jonathan G Rennison
e3bd8966fc Debug: Allow setting parameters for extended vars in debug window 
Reafctor handling of set parameters
 2023-06-01 20:36:00 +01:00
Jonathan G Rennison
a10c5a62c9 Factor out function to get value with broadest digits 2023-06-01 20:36:00 +01:00
Jonathan G Rennison
18a79a35d0 Fix truncation of GetDebugString output string 
See: #525
 2023-06-01 20:36:00 +01:00
Jonathan G Rennison
f7964cb3aa Add function to get name of extended variable ID 
Add table for internal variable IDs which aren't mappable externally
 2023-06-01 20:36:00 +01:00
Jonathan G Rennison
bdb9a72aa4 NewGRF: Add/extend station variables for station info of nearby tiles 
In preparation for support of more than 255 stations per GRF
 2023-06-01 18:51:51 +01:00
Jonathan G Rennison
1dbbbed9e5 NewGRF: Only extend value of road stops variable 68 if feature tested for 2023-06-01 18:14:23 +01:00
Jonathan G Rennison
5989edab8d Documentation: Fix table HTML in roadstops doc 2023-06-01 18:12:10 +01:00
Jonathan G Rennison
2450705aa0 Use btree map for tracerestrict GUI drop down list mapping 2023-06-01 17:48:24 +01:00
Jonathan G Rennison
ec6f9478ee Improve efficiency of station docking tiles check in CheckCaches 2023-06-01 17:41:34 +01:00
Jonathan G Rennison
24ffc5233c Remove CapacitiesMap typedef 2023-06-01 17:40:24 +01:00
Jonathan G Rennison
326d0c329c Remove some unnecessary colour strings 2023-06-01 00:14:37 +01:00
Jonathan G Rennison
40a9f19c20 Implement text filtering in dual pane train build window 2023-05-31 23:50:09 +01:00
Jonathan G Rennison
2ed248a61d Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	src/aircraft_cmd.cpp
#	src/airport_gui.cpp
#	src/articulated_vehicles.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_engine.cpp
#	src/news_gui.cpp
#	src/order_gui.cpp
#	src/roadveh_cmd.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/ship_cmd.cpp
#	src/statusbar_gui.cpp
#	src/table/settings/network_private_settings.ini
#	src/table/settings/network_settings.ini
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
 2023-05-31 23:21:38 +01:00
Jonathan G Rennison
6880cf24a0 Fix crash in template replacement failure news if autorenew succeeds 2023-05-30 23:41:51 +01:00
Jonathan G Rennison
13183d3f13 Add command result flag for whether SetResultData was called 
Use for tracerestrict validation result fail offset
 2023-05-30 23:41:19 +01:00
Jonathan G Rennison
5dcbd9271b Hide min_years_for_shares setting when shares are disabled 2023-05-30 19:19:41 +01:00
Jonathan G Rennison
bac8f032da Re-add company shares 2023-05-30 18:57:42 +01:00
Jonathan G Rennison
6297abdb3b Remove str_fmt and str_vfmt 2023-05-30 00:55:24 +01:00
Jonathan G Rennison
94c422499f Use last pointer in std::string returning GetString 2023-05-30 00:49:59 +01:00
Jonathan G Rennison
7aef72b946 Add static_assert for length of _command_proc_table 2023-05-30 00:49:35 +01:00
Jonathan G Rennison
02fe4af934 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-windows.yml
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/economy.cpp
#	src/economy_cmd.h
#	src/fios.h
#	src/goal.cpp
#	src/group_gui.cpp
#	src/network/core/config.h
#	src/network/network_admin.cpp
#	src/newgrf_config.cpp
#	src/os/windows/win32.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/story.cpp
#	src/story_base.h
#	src/string.cpp
#	src/table/settings/economy_settings.ini
#	src/tests/CMakeLists.txt
#	src/tests/math_func.cpp
 2023-05-30 00:49:24 +01:00
Jonathan G Rennison
3ec66e5fb5 Fix not being able to reload GS in script debug window 
See: #523
 2023-05-29 20:21:07 +01:00
Jonathan G Rennison
d6b8fc9fe8 Github: Fix CI build checkout with workflow dispatch ref 2023-05-29 00:23:52 +01:00
Jonathan G Rennison
bf1e66b2f3 Add missing <functional> header to src/timer/timer.h 2023-05-28 23:51:37 +01:00
Jonathan G Rennison
6091d7470c Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-macos.yml
#	src/company_gui.cpp
#	src/linkgraph/linkgraph.cpp
#	src/newgrf_debug_gui.cpp
#	src/strgen/strgen_base.cpp
#	src/timetable_gui.cpp
 2023-05-28 10:20:52 +01:00
translators
90fdf17e39 Update: Translations from eints 
esperanto: 28 changes by legoscia
 2023-05-27 18:40:39 +00:00
Loïc Guilloux
c880157518
Fix: Check max member count in squirrel classes (#10883) 
Manual cherry-pick from 23a0620658
 2023-05-27 16:09:21 +00:00
Jonathan G Rennison
b02817f262 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/newgrf.cpp
 2023-05-27 01:12:47 +01:00
Jonathan G Rennison
ef03d44fb3 Use std::unique_ptr for GRFLineToSpriteOverride 2023-05-27 00:47:27 +01:00
Jonathan G Rennison
f00e0e195f cpp-btree: Add support for uncopyable/move-only map/multimap value types 2023-05-27 00:47:27 +01:00
PeterN
8ea9c1a133
Fix #10880: Crash in object window due to incorrect parameter order. (#10881) 2023-05-26 21:29:52 +00:00
Jonathan G Rennison
b381a30d2d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/base_media_func.h
#	src/cargopacket.h
#	src/gfxinit.cpp
#	src/industry_cmd.cpp
#	src/window_gui.h
 2023-05-26 20:08:05 +01:00
PeterN
876871157f
Fix: Ask FontConfig for the face index when opening fonts. (#10878) 
This allows selection of the correct face in truetype fonts containing
multiple faces.
 2023-05-26 18:56:13 +00:00
Jonathan G Rennison
42b3c5fe25 Fix highlight of adjacent rail/road waypoints when only one waypoint type 2023-05-26 19:38:17 +01:00
Jonathan G Rennison
fd4d4d341d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/animated_tile.cpp
#	src/cargopacket.h
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/date.cpp
#	src/disaster_vehicle.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/error_gui.cpp
#	src/fontcache/spritefontcache.cpp
#	src/game/game_gui.cpp
#	src/game/game_text.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/highscore_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/italian.txt
#	src/lang/portuguese.txt
#	src/lang/russian.txt
#	src/lang/turkish.txt
#	src/lang/vietnamese.txt
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_generic.cpp
#	src/news_gui.cpp
#	src/openttd.cpp
#	src/os/unix/unix.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spritecache.cpp
#	src/spritecache.h
#	src/spriteloader/grf.cpp
#	src/station_cmd.cpp
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen_base.cpp
#	src/subsidy.cpp
#	src/table/settings/difficulty_settings.ini
#	src/texteff.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/townname.cpp
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window.cpp
 2023-05-26 19:36:48 +01:00
PeterN
101e4e54a1
Fix d9a04ba446: Ensure MD5Hash is initialized. (#10876) 
Not all instances need to be initialized as often they are copied or
written to, but doing all ensures no surprises.

Move the ^= operator to MD5Hash while we're at it.
 2023-05-26 18:17:54 +00:00
Jonathan G Rennison
ba11467c02 Fix: Rail waypoint selection window not closed 
When rail toolbar or rail waypoint build windows closed
 2023-05-26 08:41:13 +02:00
Jonathan G Rennison
7615c831aa Avoid unnecessary checks when removing adjacent level crossing tile 2023-05-26 00:52:33 +01:00
Jonathan G Rennison
0b9b080aa6 Fix closing build waypoint window not closing waypoint selection window 2023-05-25 23:11:18 +01:00
Jonathan G Rennison
a419674157 Add coverage button to waypoint window 2023-05-25 22:35:05 +01:00
Jonathan G Rennison
df5ca1d7fb Highlight waypoint tiles when adjacent or distant joining 2023-05-25 22:34:54 +01:00
PeterN
584faaf064
Change: Reorganise industry accept/produce arrays. (#10853) 
Use a array of struct for each cargo instead of an array for each statistic.
This makes iterating for acceptance and production much simpler.
pct_transported is now calculated when needed.
 2023-05-25 21:25:46 +01:00