Commit Graph

59118 Commits

Author SHA1 Message Date
Jeremy Gao
f9a289670c
Update: Simplified Chinese translation (#752) 2024-09-18 18:20:01 +01:00
Jonathan G Rennison
27c06f9737 Merge branch 'master' into jgrpp
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/disaster_vehicle.cpp
#	src/music/dmusic.cpp
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_spritegroup.h
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/saveload/saveload.cpp
#	src/saveload/settings_sl.cpp
#	src/settings_table.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/string.cpp
#	src/string_func.h
#	src/table/newgrf_debug_data.h
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/video/win32_v.cpp
2024-09-18 18:07:23 +01:00
Jonathan G Rennison
c674bd931a Fix: Crash when pressing arrow keys in bootstrap mode
See: f5f488e7
2024-09-18 00:10:24 +01:00
Jonathan G Rennison
3b7b1c583c Fix: Relative paths passed to -c were not made absolute 2024-09-17 23:28:24 +01:00
Jonathan G Rennison
7eddb72585 Exclude parent item from directory sort in FiosGetFileList 2024-09-17 22:24:54 +01:00
Jonathan G Rennison
d13b28c34c Ensure path always ends with path separator when moving to parent in GUI 2024-09-17 22:03:10 +01:00
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
2024-09-17 18:23:30 +01:00
Jonathan G Rennison
800536e4c3 Add company allow list non-upstream save/load 2024-09-16 19:51:19 +01:00
Jonathan G Rennison
10d16757ab Codechange: No longer allow saving of incorrect string container table fields
See: 1250ce8f
(cherry picked from commit 2a5a0b0990)
2024-09-16 19:39:06 +01:00
Jonathan G Rennison
05b55fd12f Fix #12901: Savegame format of company allow lists
(cherry picked from commit c277ff121e)

# Conflicts:
#	src/saveload/saveload.h
2024-09-16 19:27:46 +01:00
Jonathan G Rennison
3ec25ffc9a Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-emscripten.yml
#	cmake/scripts/FindVersion.cmake
#	src/main_gui.cpp
#	src/road_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/table/sprites.h
#	src/table/station_land.h
#	src/viewport_gui.cpp
#	src/widgets/smallmap_widget.h
2024-09-16 18:29:36 +01:00
Jonathan G Rennison
99aaffd99d Fix changelog typo 2024-09-14 10:59:59 +01:00
Jonathan G Rennison
c9e955a606 Version: Committing version data for tag: jgrpp-0.62.0 2024-09-14 10:06:56 +01:00
Jonathan G Rennison
631e546914 Fix strict aliasing/alignment violation in FiosIsValidFile 2024-09-14 10:05:25 +01:00
Peter Nelson
99f8989f0c Codefix: Implement explicit ByteReader::PeekDWord() instead of type-punning pointer. (#12928)
(cherry picked from commit 9631c68ce6)

# Conflicts:
#	src/newgrf.cpp
2024-09-14 09:10:16 +01:00
Jonathan G Rennison
c08ced0662 Lang: String code adjustments 2024-09-13 19:43:06 +01:00
Qwest8K
80f315b18f
Update: Russian localization (#749) 2024-09-13 19:41:34 +01:00
TELK
5e7d5e7d74
Update: Korean translation (#748) 2024-09-13 19:40:20 +01:00
Peter Nelson
d91853bb6d Fix: Train curve detection did not take shortened parts into account. (#12910)
Only the number of parts between curves was counted, which with shortened parts would be higher than full length parts and fail to limit as expected.

(cherry picked from commit 6deee5e5e2)
2024-09-13 19:03:41 +01:00
Jonathan G Rennison
b5c64354fb Departures: Fix unnecessary operator= for struct CallAt 2024-09-11 22:37:23 +01:00
Jonathan G Rennison
df2c33c0b0 Departures: Fix OrderDateQueueItem operator< not being const 2024-09-11 22:37:09 +01:00
Jonathan G Rennison
7fd1d5e54d Departures: Allow timetabled depot orders to be calling points 2024-09-10 19:56:03 +01:00
Jonathan G Rennison
27f8cfba22 Departures: Enable showing calling times for arrivals 2024-09-10 19:11:56 +01:00
Jonathan G Rennison
d61e6ee488 Departures: Increase maximum number of live departure entries 2024-09-10 01:24:22 +01:00
Jonathan G Rennison
7387a53947 Departures: Set show as no load for arrivals with no load orders 2024-09-10 01:24:22 +01:00
Jonathan G Rennison
9c8ca01c2b Departures: Fix non-deterministic sorting in scheduled dispatch mode 2024-09-10 01:24:22 +01:00
Jonathan G Rennison
d8e011d17f Departures: Support waypoints with wait times as calling points 2024-09-10 01:24:22 +01:00
Jonathan G Rennison
1859b4a059 Departures: Add button to show running empty departures/arrivals/calling stations
Replace show all stops regardless of load/unload setting
2024-09-09 22:17:26 +01:00
Jonathan G Rennison
7ed92ee903 Departures: Fix handling of unload and leave empty orders in arrival mode 2024-09-09 22:03:56 +01:00
Jonathan G Rennison
18545f3e53 Departures: Show waypoint departures as via or no loading, depot as no loading 2024-09-09 22:03:56 +01:00
Jonathan G Rennison
7814e7e69f Departures: Refactor ordering of some order load/unload type tests 2024-09-09 22:03:56 +01:00
Jonathan G Rennison
c3902b862d Fix ed9a5392: Wrong string code for Korean 2024-09-09 22:02:49 +01:00
Jonathan G Rennison
3813dc3698 Departures: Use silver for via departures, yellow for no load/unload 2024-09-09 19:49:08 +01:00
Jonathan G Rennison
e7bd85926c Departures: Use enum for departure show as type
Tidy up struct Departure field init
2024-09-09 19:31:29 +01:00
Jonathan G Rennison
db9e2e545c Departures: Only do smart terminus detection for station departures 2024-09-09 17:45:20 +01:00
Jonathan G Rennison
e964e1a9d3 Departures: Simplify struct CallAt operators 2024-09-09 17:39:10 +01:00
Jonathan G Rennison
8e0a1fa8ae Always enable public roads button in scenario editor 2024-09-09 17:25:50 +01:00
Jonathan G Rennison
0badb27b7c Use enum type for build public roads setting 2024-09-09 17:25:22 +01:00
Jonathan G Rennison
7b1f6b81b1 Departures: Show no date at all in date mode with a frozen calendar 2024-09-08 22:51:07 +01:00
Jonathan G Rennison
ed9a5392ed Departures: Add button to show destination arrival times 2024-09-08 22:04:34 +01:00
Jonathan G Rennison
9ce255d706 Departures: Fix width of departure time and status columns 2024-09-08 22:04:34 +01:00
Jonathan G Rennison
de972cd48f Departures: Enable smart terminus detection for scheduled dispatch source mode 2024-09-08 22:00:02 +01:00
Jonathan G Rennison
0d8f9d7630 Departures: Fix calling at times when shifting departure times 2024-09-08 20:30:24 +01:00
Jonathan G Rennison
0ea17452f6 Departures: Fix handling of departure tick with conditional orders after source order 2024-09-08 20:29:50 +01:00
Jonathan G Rennison
9d590d1fa7 Departures: Turn on smart terminus detection by default 2024-09-08 18:26:12 +01:00
Jonathan G Rennison
714adbd070 Departures: Handle smart terminus detection in a single pass at the end 2024-09-08 18:25:37 +01:00
Jonathan G Rennison
85668549a3 Departures: Don't include via departures in smart terminus detection 2024-09-08 13:08:32 +01:00
Jonathan G Rennison
c9ad1aec51 Departures: Show station via departures using yellow text for the time 2024-09-08 13:05:19 +01:00
Jonathan G Rennison
1fd1c77586 Add an AssignBit function, use instead of SB for single bit assignments 2024-09-08 12:44:16 +01:00
Jonathan G Rennison
d544d98c72 Set default hotkey for switch viewport vehicle route overlay mode 2024-09-08 10:34:48 +01:00