Jonathan G Rennison
|
eda50ef6a5
|
Use std::vector for extra station name strings
|
2024-06-19 20:03:42 +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 |
|
Jonathan G Rennison
|
f9b75ed304
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/scripts/FindVersion.cmake
# src/airport_gui.cpp
# src/industry_gui.cpp
# src/newgrf.cpp
# src/newgrf_class_func.h
# src/newgrf_object.h
# src/newgrf_roadstop.cpp
# src/newgrf_roadstop.h
# src/object_gui.cpp
# src/rail_gui.cpp
# src/road_cmd.h
# src/road_gui.cpp
# src/station_cmd.h
# src/strings.cpp
# src/waypoint_cmd.h
|
2024-06-05 21:13:55 +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
|
18a42664fc
|
Merge branch 'master' into jgrpp
Remove 'byte' typedef
|
2024-05-07 17:21:50 +01:00 |
|
Jonathan G Rennison
|
ce40e85ccc
|
Fix ROADSTOP_DRAW_MODE_WAYP_GROUND when used with RSF_DRAW_MODE_REGISTER
|
2024-04-23 22:30:13 +01:00 |
|
Jonathan G Rennison
|
d5b8f51bf9
|
Rename variable to fix Windows header name collision
|
2024-04-20 21:01:43 +01:00 |
|
Jonathan G Rennison
|
d52d447603
|
Update station/industry nearby lists in BuildOilRig
See: https://github.com/OpenTTD/OpenTTD/issues/12506
|
2024-04-17 17:07:00 +01:00 |
|
Rubidium
|
b2218e75d4
|
Codefix: missing space between close parenthesis and open curly brace
|
2024-04-16 19:28:09 +02:00 |
|
Jonathan G Rennison
|
28e74005d0
|
Remove various uses of lengthof on std::array
|
2024-04-08 19:55:58 +01:00 |
|
Peter Nelson
|
9854553e10
|
Codechange: ZOOM_LVL_SHIFT/BASE are not actually ZOOM_LVLs.
Rename to ZOOM_BASE_SHIFT and ZOOM_BASE respectively, and derive from ZOOM_LVL instead of numeric value.
|
2024-04-04 22:27:03 +01:00 |
|
Peter Nelson
|
d683ec0183
|
Codechange: Move dropdown and slider out of widgets directory. (#12403)
Also shuffle headers to place widget includes near end.
This leaves the widgets directory solely for defining Widget IDs.
|
2024-03-31 19:37:16 +01:00 |
|
Peter Nelson
|
8746be8bf2
|
Codechange: Use FindVehiclesWithOrder when removing a road stop. (#12144)
|
2024-03-28 23:22:37 +01:00 |
|
Michael Lutz
|
8fb7d74dfe
|
Fix eabb9db: Drag building of road stops should not allow mixing z levels.
|
2024-03-28 22:28:48 +01:00 |
|
Michael Lutz
|
69acc132ca
|
Fix #12387, eabb9db: [NewGRF] Wrong tile offset passed to rail station CB 149 (slope check)
|
2024-03-28 22:28:48 +01:00 |
|
Peter Nelson
|
ab94c8b511
|
Codechange: Iterate order lists instead of vehicles to find if any vehicle visits a station. (#12315)
This reduces the search time as shared orders are only searched once and non-front vehicles are skipped.
|
2024-03-17 09:34:28 +00:00 |
|
Patric Stout
|
a3cfd23cf9
|
Codechange: rename byte to uint8_t (#12308)
|
2024-03-16 23:59:32 +01: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 |
|
Michael Lutz
|
8b9f59d320
|
Codechange: Use references for non-optional in/out values of slope functions
|
2024-03-08 18:08:55 +01:00 |
|
Michael Lutz
|
8dda387f82
|
Codechange: Use std::tuple for slope functions with two return values
|
2024-03-08 18:08:55 +01:00 |
|
merni-ns
|
b8b80cb42e
|
Fix #12134: Use correct error messages if clearing drive-through road stops fails (#12139)
|
2024-03-08 14:29:04 +01:00 |
|
Jonathan G Rennison
|
93bf033107
|
Add whether the vehicle is non-front to the vehicle pool pointer tag
Add iteration filters which check this
|
2024-02-25 14:51:59 +00:00 |
|
Jonathan G Rennison
|
ff0d212705
|
Fix incorrect assert of LinkGraph LastCompression date
|
2024-02-21 00:17:16 +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
|
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 |
|
Jonathan G Rennison
|
1f5b35fac4
|
Change link graph join and compression times to use scaled tick counter
|
2024-02-15 02:05:27 +00:00 |
|
Jonathan G Rennison
|
7ce06e22b8
|
Split date types into calendar and economy dates
See: 735abfe1
|
2024-02-13 21:34:09 +00:00 |
|
Joan Josep
|
1b33b4058e
|
Fix: Redraw orders when a station feature is added/removed. (#12061)
|
2024-02-11 12:47:49 -05:00 |
|
Jonathan G Rennison
|
25e100a465
|
Calculate airport noise level in permissive mode as same as lenient
|
2024-02-10 12:47:25 +00:00 |
|
Jonathan G Rennison
|
2ef2142d95
|
Disable non-noise town airport limit in local authority permissive mode
|
2024-02-10 12:43:27 +00:00 |
|
Jonathan G Rennison
|
516e8defb5
|
Add wrappers to get and update the current effective day length factor
|
2024-02-09 19:39:58 +00:00 |
|
Jonathan G Rennison
|
0ea57528c9
|
Rename DateTicksScaled to StateTicks
Rename various other related/derived types and variables
|
2024-02-07 18:36:47 +00:00 |
|
frosch
|
b1718478c8
|
Codechange: Replace old non-standard attributes with C++17/20 standard attributes.
|
2024-02-02 22:29:28 +01:00 |
|
Jonathan G Rennison
|
ced17a74e8
|
Do not update viewport signs when running headlessly
|
2024-01-24 23:26:02 +00:00 |
|
Tyler Trahan
|
735abfe111
|
Codechange: Split dates and timers into Economy and Calendar time (#10700)
|
2024-01-22 09:04:34 -05:00 |
|
Jonathan G Rennison
|
f1073d20e9
|
Fix various narrowing cast warnings
|
2024-01-22 02:23:59 +00:00 |
|
Jonathan G Rennison
|
81c2c4a881
|
Slightly speed up unordered iteration of FlowStatMap
|
2024-01-16 23:15:56 +00:00 |
|
Jonathan G Rennison
|
3050620189
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/autoreplace_cmd.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.cpp
# src/economy.cpp
# src/engine_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/linkgraph/refresh.cpp
# src/linkgraph/refresh.h
# src/newgrf.cpp
# src/newgrf_airporttiles.h
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/order_base.h
# src/order_cmd.cpp
# src/order_func.h
# src/order_gui.cpp
# src/pathfinder/pathfinder_type.h
# src/saveload/afterload.cpp
# src/subsidy_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
|
2024-01-11 17:55:16 +00:00 |
|
Jonathan G Rennison
|
36776248b9
|
Do not get one way states when building road stops on tram-only tiles
|
2024-01-09 08:48:26 +00:00 |
|
Jonathan G Rennison
|
a90cbd837e
|
Do not try to display one way markings for tram-only road stops
|
2024-01-09 08:47:51 +00:00 |
|
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
2024-01-07 17:20:41 +00:00 |
|
Jonathan G Rennison
|
f034714559
|
Use StringBuilder for GetString/GetStringWithArgs, as per upstream
Update dependent code as required
|
2024-01-05 21:12:54 +00:00 |
|
Rubidium
|
e3f49ee7a0
|
Codechange: coding style fixes
|
2024-01-04 16:23:54 +01:00 |
|
Jonathan G Rennison
|
f3ec6abbbb
|
Fix road stops/waypoints not using road type custom one-way sprites
|
2024-01-01 17:52:03 +00:00 |
|
Jonathan G Rennison
|
3e2060f155
|
Fix #11337: Station blocked/pylon/wire bits with CBID_STATION_TILE_LAYOUT (#11656)
|
2023-12-31 18:31:01 -05:00 |
|
Jonathan G Rennison
|
673a0dc5de
|
Fix station blocked/pylon/wire bits with CBID_STATION_TILE_LAYOUT
|
2023-12-30 17:20:34 +00:00 |
|
Jonathan G Rennison
|
3b18877b87
|
Fix #11629: AirportGetNearestTown for rotated airports (#11631)
Add rotation parameter to AirportGetNearestTown
Add wrapper for existing stations
Remove unnecessary iterator cloning
|
2023-12-28 21:43:05 +00:00 |
|
Jonathan G Rennison
|
6a94f2f3e7
|
Fix 35d2842d: Fix script handling of airport rotations
Adjust types/signature
|
2023-12-28 17:03:08 +00:00 |
|
Jonathan G Rennison
|
35d2842de0
|
Fix AirportGetNearestTown for rotated airports
See: https://github.com/OpenTTD/OpenTTD/issues/11629
|
2023-12-26 22:27:13 +00:00 |
|