dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,938 Commits 1 Branch 0 Tags
d4ed08849855b99b39fd95a83faad3c7cec4f2e0
Commit Graph

55938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
d4ed088498 Version: Committing version data for tag: jgrpp-0.55.3 2023-09-24 11:55:12 +01:00
Daniel Robinson
ef91136633 Fix #10600: 'Replace Vehicles' didn't show numbers >999 (#10680) 
(cherry picked from commit 71c2878799)
 2023-09-23 21:43:57 +01:00
PeterN
3ef6eccf90 Fix #11230: Widget layout also failed for group-less vehicle list window. (#11310) 
(cherry picked from commit 6580ff1adb)
 2023-09-23 21:40:18 +01:00
Jonathan G Rennison
90192f9537 TBTR: Implement cost estimation for template replacement 
Simplified operation, CMD_NO_TEST is still in use
 2023-09-23 19:05:10 +01:00
Jonathan G Rennison
1e7f31b807 Fix conditional order wait loops not ignoring label orders 2023-09-23 17:30:27 +01:00
Jonathan G Rennison
9ad2f44ab7 Fix conditional order subtype not being reset when changing to time/date 2023-09-23 16:41:38 +01:00
arikover
81c66f79aa Fix d42a78f: Show correct road speed in construction dropdowns (#11196) 
(cherry picked from commit 5d3f7939e2)
 2023-09-23 12:57:10 +01:00
Jonathan G Rennison
ad3980e596 Add setting for whether non-leading train engines keep custom names 2023-09-23 12:19:52 +01:00
Jonathan G Rennison
59ea48c541 Scheduled dispatch: Allow moving dispatch schedules in schedule list 2023-09-23 12:05:05 +01:00
PeterN
df7fc5a79a Fix: #11329: Don't assert vehicle list length is non-zero when only asked to set string parameter. (#11330) 
Since #11321, the vehicle list is not yet initialized when SetStringParameters is called, so a test that the vehicle list size is zero is triggered. However, doing this check in the SetStringParameters function is a bit out of its remit, so just remove it.

(cherry picked from commit 6d675c8acf)
 2023-09-22 18:05:30 +01:00
Jonathan G Rennison
338dff09a7 Add chicken bit to allow test/exec mismatch for all commands 2023-09-22 17:00:33 +01:00
Jonathan G Rennison
ed75592979 Fix crash attempting to remove sprite zoom level from empty entry 2023-09-22 16:56:19 +01:00
Jonathan G Rennison
e1606934ae Ignore test/exec cmd mismatch in CmdDepotMassAutoReplace 
Due to use of CmdTemplateReplaceVehicle
 2023-09-22 16:00:14 +01:00
Jonathan G Rennison
579082a075 Add missing road/tram extra flags to dump road types console command 2023-09-21 18:57:21 +01:00
PeterN
c2ef54525a Fix #11326: Update autoreplace scrollbar count after clearing engine list. (#11327) 
(cherry picked from commit cef6a5f79c)
 2023-09-21 18:42:57 +01:00
Jonathan G Rennison
b70f8020e6 Fix right-click viewport scroll after using change viewport buttons 
See: #597
 2023-09-21 18:42:22 +01:00
Jonathan G Rennison
d663c05a4f Version: Committing version data for tag: jgrpp-0.55.2 2023-09-20 20:40:37 +01:00
Jonathan G Rennison
e04fe06a7b Fix window closing in HideDropDownMenu 2023-09-19 23:19:08 +01:00
Jonathan G Rennison
22a3a6d3c4 Add missing c_str() in font_osx.cpp 2023-09-19 22:45:30 +01:00
Jonathan G Rennison
06139c26a9 Add missing override specifiers to struct DropdownWindow 2023-09-19 22:44:23 +01:00
Jonathan G Rennison
e5e1adad8a Fix graphical issues with scrolling viewport overlays 2023-09-18 23:10:30 +01:00
Jonathan G Rennison
290822d150 Update viewport positions in two stages 2023-09-18 21:44:17 +01:00
Jonathan G Rennison
96ed5b5cad Remove _vp_move_offs global 2023-09-18 19:38:13 +01:00
Jonathan G Rennison
57e4929137 Fix viewport sign invisibility check 2023-09-18 19:34:23 +01:00
Jonathan G Rennison
68c0fd63dd Avoid window iterations when marking viewports dirty 2023-09-18 19:10:58 +01:00
Jonathan G Rennison
b93503bb21 Avoid window iterations when no windows of desired class present 2023-09-18 19:05:55 +01:00
Jonathan G Rennison
52e4688851 Use Window iterate instead of from front/back when no order required 2023-09-18 18:34:50 +01:00
Jonathan G Rennison
cd2a368d77 Fix #11307: Incorrect GroupStatistics after selling leading wagon 
When this results in a countable consist
 2023-09-17 17:40:32 +01:00
Jonathan G Rennison
f5d1b1d8f8 Change window close/deallocation to match upstream 2023-09-17 13:10:21 +01:00
Jonathan G Rennison
79cfc3e8bd Merge branch 'master' into jgrpp 2023-09-17 13:09:48 +01:00
Jonathan G Rennison
a18f3274b4 Rename close window functions to match upstream 2023-09-15 21:17:25 +01:00
Jonathan G Rennison
ed1b842ad3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console.cpp
#	src/console_func.h
#	src/network/network_server.cpp
#	src/os/unix/unix.cpp
#	src/spritecache.cpp
#	src/viewport.cpp
 2023-09-15 20:44:22 +01:00
Loïc Guilloux
cb5a132b0c Fix: marked text was not updated during text deletion (#11293) 
(cherry picked from commit b4ff06b6ef)
 2023-09-14 18:35:40 +01:00
Loïc Guilloux
4c4fe8cf64 Fix: IConsoleWindow:GetTextBoundingRect() is incorrect (#11292) 
(cherry picked from commit 220f93f552)
 2023-09-14 18:35:20 +01:00
Jonathan G Rennison
6be4708131 cpp-btreee: Fix alloc/dealloc size mismatch (struct padding) 
Between new_leaf_node and delete_leaf_node
This is mostly harmless, but triggers AddressSanitizer

When alignof(value_type) is less than alignof(base_fields)
and kNodeValues * sizeof(value_type) is not an integral multiple
of alignof(base_fields), such that leaf_fields has padding
 2023-09-12 23:25:14 +01:00
Jonathan G Rennison
c8817d7f4e Merge branch 'master' into jgrpp 
# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h
 2023-09-12 20:06:47 +01:00
Jonathan G Rennison
3e3e083770 Merge branch 'master' into jgrpp 
Hostile takeover feature

# Conflicts:
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/economy.cpp
#	src/script/api/script_event_types.cpp
 2023-09-12 19:04:03 +01:00
Jonathan G Rennison
1b61dfabe3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_gui.cpp
#	src/core/math_func.hpp
#	src/highscore.cpp
#	src/tests/math_func.cpp
 2023-09-12 18:25:49 +01:00
Jonathan G Rennison
627eb1effc Fix multiplayer desync when adding a track piece of a different railtype 
Undoing a CMD_CONVERT_RAIL did not undo changes to the
infrastructure totals
Defer CMD_CONVERT_RAIL until all checks have succeeded instead

In the case where:
* The addition would have resulted in the tile changing railtype
* The addition fails because of slope restrictions, a train is present,
  or auto-removing signals fails
* The command test did not fail (e.g. because the train has moved)
 2023-09-11 23:40:34 +01:00
Jonathan G Rennison
56ecbb5574 Add missing flags in build/remove rail command comments 2023-09-11 23:09:27 +01:00
PeterN
89b84222d3 Fix: NewGRF house class mappings were not reset between games. (#11279) 
(cherry picked from commit 6643c010bd)
 2023-09-10 20:50:57 +01:00
Michael Lutz
1637f6f6b0 Feature: [NewGRF] Related Act2 objects for airports and airport tiles. 
Airports are similar two stations and industries, both of which have the town as related object.
Airport tiles are similar to industry tiles, which have the industry as related object.
This seems a sensible structure, so let's make it Airport Tile -> Airport -> Town.

(cherry picked from commit 1c620b349f)
 2023-09-10 20:50:57 +01:00
Michael Lutz
5cc623cb3c Add: [NewGRF] Inspection window for airports. 
As as the station window combines all station types, accessing the
debug view is via the parent of the airport tile only.

(cherry picked from commit a6f2f3c042)
 2023-09-10 20:50:57 +01:00
Jonathan G Rennison
f6eadf19c6 Replace vehicle tile hash 
Use robin hood hash of TileIndex
Retain linked list of vehicles on the same tile
 2023-09-10 16:19:19 +01:00
Jonathan G Rennison
b09894db4f Show total cargo packets in dump_cpdp_stats console command output 2023-09-10 16:19:19 +01:00
Jonathan G Rennison
c6ce9ce687 Add road vehicle flags for whether any part is on level crossing 2023-09-10 13:43:13 +01:00
Jonathan G Rennison
18a40df10e Adjust types in EnumCheckRoadVehClose 2023-09-10 12:44:22 +01:00
Peter Nelson
7cc1ed9594 Codechange: Allow using more than 65536 NewGRF string IDs. 
NewGRF string allocation allowed up to 524288 strings, however stringid was passed as uint16_t which limits to 2^16.

(cherry picked from commit e4613fc04c)
 2023-09-06 21:56:20 +01:00
Peter Nelson
2178ff1e80 Change: Replace fixed length _grf_text array with vector. 
Additionally reshuffle GRFTextEntry for better alignment.

This removes a mostly-unused static 20MB allocation.

(cherry picked from commit 3e762af2d1)
 2023-09-06 21:56:20 +01:00
Jonathan G Rennison
85b20068a8 Merge PR #595 into jgrpp 2023-09-05 18:40:47 +01:00