Jonathan G Rennison
|
51ce0a69db
|
Fix vehicle route overlay focus handling in orders window for some drop downs
|
2024-06-23 20:08:12 +01:00 |
|
Jonathan G Rennison
|
ffbc5aff6d
|
Fix various formatting and spelling issues
|
2024-06-13 21:47:36 +01:00 |
|
Jonathan G Rennison
|
fff46974fd
|
Scheduled dispatch: Allow naming departure slot tags
|
2024-06-13 19:32:42 +01:00 |
|
Jonathan G Rennison
|
e53998ec01
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/cheat_gui.cpp
# src/industry_gui.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/misc/getoptdata.h
# src/music/dmusic.cpp
# src/network/core/os_abstraction.cpp
# src/newgrf_engine.cpp
# src/openttd.cpp
# src/order_gui.cpp
# src/os/windows/win32.cpp
# src/pathfinder/npf/queue.cpp
# src/smallmap_gui.cpp
# src/strgen/strgen.cpp
|
2024-06-08 22:57:36 +01:00 |
|
Jonathan G Rennison
|
c3829f5088
|
Show scheduled dispatch tag in order window
|
2024-06-05 18:38:54 +01:00 |
|
Jonathan G Rennison
|
32b8ec34ff
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/autoreplace_gui.cpp
# src/build_vehicle_gui.cpp
# src/cheat_gui.cpp
# src/company_gui.cpp
# src/debug.cpp
# src/engine_gui.h
# src/error_gui.cpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/newgrf.cpp
# src/newgrf_debug_gui.cpp
# src/newgrf_gui.cpp
# src/order_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/saveload/saveload.cpp
# src/screenshot_gui.cpp
# src/sound/win32_s.cpp
# src/statusbar_gui.cpp
# src/strgen/strgen.cpp
# src/table/newgrf_debug_data.h
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/viewport.cpp
|
2024-05-31 22:57:16 +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 |
|
Rubidium
|
4f2412a272
|
Codechange: range based for loops instead of C-style for loops
|
2024-04-11 07:05:04 +02:00 |
|
Peter Nelson
|
de4e00c93f
|
Codechange: Pass by reference to UpdateWidgetSize. (#12457)
These parameters are always provided and not optional.
|
2024-04-09 08:34:45 +01:00 |
|
Peter Nelson
|
56cac21086
|
Codechange: Use functions to create common drop down list items.
|
2024-04-01 22:33:16 +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 |
|
Rubidium
|
5d8e40cad4
|
Codechange: use int32_t instead of uint16_t for scroll bar position/size/capacity
(cherry picked from commit d09b5aaeba)
# Conflicts:
# src/newgrf_debug_gui.cpp
# src/newgrf_gui.cpp
# src/widget_type.h
|
2024-03-24 10:37:40 +00:00 |
|
Rubidium
|
d09b5aaeba
|
Codechange: use int32_t instead of uint16_t for scroll bar position/size/capacity
|
2024-03-24 08:30:38 +01:00 |
|
Tyler Trahan
|
d21369b258
|
Change: Show unbunching action in timetable window (#12351)
(cherry picked from commit 2732b3d6c6)
# Conflicts:
# src/order_gui.cpp
|
2024-03-23 20:53:25 +00:00 |
|
Tyler Trahan
|
2732b3d6c6
|
Change: Show unbunching action in timetable window (#12351)
|
2024-03-23 08:23:13 -04:00 |
|
Patric Stout
|
a3cfd23cf9
|
Codechange: rename byte to uint8_t (#12308)
|
2024-03-16 23:59:32 +01:00 |
|
Jonathan G Rennison
|
1532c96ca7
|
Add ctrl-click scroll to for non-destination orders
Conditional orders on station cargo and show as via orders
|
2024-03-16 17:32:45 +00:00 |
|
Rubidium
|
86cb184eb4
|
Codechange: use std::source_location over __FILE__ and __LINE__ for WindowDesc
|
2024-03-10 10:14:20 +01:00 |
|
Loïc Guilloux
|
82430a1086
|
Fix ab315d0: Don't show "insert order" errors in the console (#12245)
|
2024-03-09 16:33:44 +00:00 |
|
Tyler Trahan
|
ab315d0dc9
|
Fix #12118: When adding an unbunching order, properly check for unsafe conditions (#12136)
|
2024-03-09 08:28:05 -05:00 |
|
Jonathan G Rennison
|
828d2146eb
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/ai/ai_info.cpp
# src/company_base.h
# src/economy.cpp
# src/game/game_info.cpp
# src/gfx_type.h
# src/linkgraph/linkgraph_gui.cpp
# src/palette.cpp
# src/palette_func.h
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/ship_cmd.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
# src/window.cpp
# src/window_func.h
|
2024-02-26 18:19:34 +00:00 |
|
Jonathan G Rennison
|
18e1d57fc6
|
Duplicate STR_ORDERS_GO_TO_TOOLTIP string
|
2024-02-26 17:24:10 +00:00 |
|
Peter Nelson
|
912d7bd80e
|
Codechange: Give ColourShade values names instead of numbers.
|
2024-02-25 12:38:07 +00:00 |
|
Peter Nelson
|
ae3390fe48
|
Codechange: Add ColourShade enum.
|
2024-02-25 12:38:07 +00:00 |
|
Peter Nelson
|
0463d4c198
|
Codechange: Remove direct access to _colour_gradient.
Access is now through GetColourGradient, which ensures parameters are in range.
|
2024-02-25 12:38:07 +00:00 |
|
Jonathan G Rennison
|
40f5f17e32
|
Tidy up focus management for vehicle dropdowns
|
2024-02-20 00:01:44 +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 |
|
Tyler Trahan
|
87a80c7ff2
|
Change: When adding orders, Ctrl+Click on a depot to unbunch, instead of service if required (#12023)
|
2024-02-18 10:43:44 -05:00 |
|
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
|
2024-02-15 23:49:11 +00:00 |
|
Jonathan G Rennison
|
b13b2781bd
|
Add string codes for upstream wallclock mode, add upstream language changes
|
2024-02-14 23:22:28 +00:00 |
|
Jonathan G Rennison
|
0f7eb3d8d5
|
Add road vehicle direction to order window manage order dropdown
|
2024-02-11 12:36:33 +00:00 |
|
Tyler Trahan
|
7b32d9cff5
|
Fix #12019: Correctly highlight depot unbunch action in dropdown
|
2024-02-10 15:11:24 -05:00 |
|
Jonathan G Rennison
|
d456f4a3a5
|
Replace DATE_UNIT_SIZE macro with a function
|
2024-02-07 21:19:55 +00:00 |
|
Peter Nelson
|
e9ea837311
|
Fix #12012: Crash when opening orders of another company. (#12013)
Orders window changes tooltip depending on vehicle type but did check if widget exists.
|
2024-02-06 12:53:23 +00:00 |
|
Tyler Trahan
|
d5e936c9d4
|
Fix #11968: Always set string parameters to avoid undefined behavior (#11973)
|
2024-02-04 07:07:47 +01:00 |
|
Tyler Trahan
|
80a704ba11
|
Fix f6dd505: Split depot action tooltip by vehicle type
|
2024-02-03 17:32:25 -05:00 |
|
Tyler Trahan
|
f6dd5053a3
|
Feature: Order flag to unbunch vehicles at depot (#11945)
|
2024-02-03 08:04:24 -05: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
|
9bea1e3cc3
|
Scheduled dispatch: Allow tagging departure slots, add to conditional order
|
2024-01-28 17:14:03 +00:00 |
|
Tyler Trahan
|
86981c0983
|
Fix: Extra refit button when train/RV is in a depot (#11904)
|
2024-01-28 08:01:09 -05:00 |
|
Jonathan G Rennison
|
606d7cd814
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/airport_gui.cpp
# src/build_vehicle_gui.cpp
# src/direction_type.h
# src/gfx_type.h
# src/group_gui.cpp
# src/misc_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/signs_gui.cpp
# src/slope_func.h
# src/smallmap_gui.cpp
# src/terraform_gui.cpp
# src/toolbar_gui.cpp
# src/town_gui.cpp
# src/town_type.h
# src/vehicle_type.h
# src/widget_type.h
|
2024-01-21 23:03:08 +00:00 |
|
Peter Nelson
|
7737aa6640
|
Codechange: Make all NWidgetPart arrays constexpr.
This ensures that the arrays are not created at runtime and prevents using non-constexpr values.
|
2024-01-16 21:57:05 +00:00 |
|
Jonathan G Rennison
|
041f36d565
|
Add try to acquire slot order subtype
|
2024-01-11 21:04:49 +00:00 |
|
Jonathan G Rennison
|
2fc631b15b
|
Rename OT_RELEASE_SLOT to OT_SLOT, use a subtype field
|
2024-01-11 19:01:25 +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 |
|
Peter Nelson
|
400ae65ff2
|
Codechange: Redefine some cargo-related values in terms of CargoID instead of CargoType.
Values used as special filter types are now defined as offsets from NUM_CARGO instead of confusingly reusing CARGO_NO_REFIT/CARGO_AUTO_REFIT types.
|
2024-01-09 18:56:05 +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 |
|