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
|
3 weeks ago |
|
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
|
4 weeks ago |
|
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
|
4 weeks ago |
|
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
|
4 weeks ago |
|
Jonathan G Rennison
|
431a6a1262
|
Allow sorting by average order occupancy in shared order group mode
See: #698
|
1 month ago |
|
Jonathan G Rennison
|
1d70c781c6
|
Fix vehicle window showing profit last year in wallclock timekeeping mode
|
1 month ago |
|
Jonathan G Rennison
|
18a42664fc
|
Merge branch 'master' into jgrpp
Remove 'byte' typedef
|
2 months ago |
|
Jonathan G Rennison
|
f1c0f864f5
|
Add setting to shorten vehicle view status text
|
2 months ago |
|
Jonathan G Rennison
|
d90c540f9e
|
Enable economy day length scaling in wallclock timekeeping mode
|
2 months ago |
Rubidium
|
4f2412a272
|
Codechange: range based for loops instead of C-style for loops
|
3 months ago |
Peter Nelson
|
de4e00c93f
|
Codechange: Pass by reference to UpdateWidgetSize. (#12457)
These parameters are always provided and not optional.
|
3 months ago |
|
Peter Nelson
|
cc6322e0a3
|
Fix #12233: Mini order list overlaps vehicle group name. (#12423)
Move mini order list down one line to make room.
(cherry picked from commit e8c78df39e)
|
3 months ago |
|
Peter Nelson
|
e8c78df39e
|
Fix #12233: Mini order list overlaps vehicle group name. (#12423)
Move mini order list down one line to make room.
|
3 months ago |
|
Peter Nelson
|
7572cfd103
|
Codechange: Redefine ZOOM_LVL so that ZOOM_LVL_NORMAL is 1x zoom.
This matches expectations of what normal zoom means.
|
3 months ago |
|
Peter Nelson
|
56cac21086
|
Codechange: Use functions to create common drop down list items.
|
3 months ago |
|
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.
|
3 months ago |
Tyler Trahan
|
8928f4979a
|
Change: Add dividers in vehicle group action dropdown (#12284)
|
3 months ago |
|
Jonathan G Rennison
|
a11a8d0b29
|
Allow removing vehicle from slots using vehicle details window dropdown
|
3 months ago |
|
Jonathan G Rennison
|
0484ba700f
|
Allow manually removing/setting train speed restriction
From vehicle details window
See: #674
|
3 months ago |
Patric Stout
|
a3cfd23cf9
|
Codechange: rename byte to uint8_t (#12308)
|
3 months ago |
|
Rubidium
|
86cb184eb4
|
Codechange: use std::source_location over __FILE__ and __LINE__ for WindowDesc
|
4 months ago |
|
Tyler Trahan
|
32b0fb9f6e
|
Fix #12010: Use economy timer for vehicle stats minimum age, not calendar (#12142)
|
4 months ago |
|
Jonathan G Rennison
|
a816829cd1
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/station_gui.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
|
4 months ago |
|
Peter Nelson
|
d4f0f0e2c5
|
Codechange: Use `GetVisibleRangeIterators()` in more places. (#12190)
This replaces more first/last index calculation, along with indexed array/vector access, with iterator access instead.
|
4 months ago |
|
Jonathan G Rennison
|
1e0ff41d33
|
Add UI setting to show speed before destination in vehicle status bar
|
4 months ago |
|
Jonathan G Rennison
|
5d7c87f5e4
|
Add setting for whether to show vehicle running costs per calendar year
See #660
|
4 months ago |
|
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
|
4 months ago |
|
Peter Nelson
|
912d7bd80e
|
Codechange: Give ColourShade values names instead of numbers.
|
4 months ago |
|
Peter Nelson
|
ae3390fe48
|
Codechange: Add ColourShade enum.
|
4 months ago |
|
Peter Nelson
|
0463d4c198
|
Codechange: Remove direct access to _colour_gradient.
Access is now through GetColourGradient, which ensures parameters are in range.
|
4 months ago |
|
Jonathan G Rennison
|
40f5f17e32
|
Tidy up focus management for vehicle dropdowns
|
4 months ago |
|
Jonathan G Rennison
|
8581808952
|
Merge tag '14.0-beta2' into jgrpp
# Conflicts:
# CMakeLists.txt
# src/cargotype.cpp
# src/console_cmds.cpp
# src/graph_gui.cpp
# src/industry_cmd.cpp
# src/industrytype.h
# src/misc_gui.cpp
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_town.cpp
# src/object_cmd.cpp
# src/openttd.cpp
# src/pathfinder/water_regions.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/table/build_industry.h
# src/table/engines.h
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
|
4 months ago |
|
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
|
4 months ago |
|
Jonathan G Rennison
|
b940fa9466
|
Do not scale shown running costs by the day length factor
Show in original years
|
4 months ago |
|
Jonathan G Rennison
|
a48e15dce0
|
Add wallclock time settings
|
4 months ago |
|
Jonathan G Rennison
|
b13b2781bd
|
Add string codes for upstream wallclock mode, add upstream language changes
|
4 months ago |
|
Jonathan G Rennison
|
7ce06e22b8
|
Split date types into calendar and economy dates
See: 735abfe1
|
4 months ago |
|
Jonathan G Rennison
|
d456f4a3a5
|
Replace DATE_UNIT_SIZE macro with a function
|
5 months ago |
|
Peter Nelson
|
2fd9096070
|
Change: Decouple and remove landscape-dependent cargo types. (#11719)
Cargo types of default engines, industries and houses are now specified in terms of label.
|
5 months ago |
|
Tyler Trahan
|
f6dd5053a3
|
Feature: Order flag to unbunch vehicles at depot (#11945)
|
5 months ago |
frosch
|
b1718478c8
|
Codechange: Replace old non-standard attributes with C++17/20 standard attributes.
|
5 months ago |
|
frosch
|
68c64d2511
|
Codechange: Remove TKM string codes by duplicating strings.
|
5 months ago |
|
frosch
|
69f47caf3f
|
Codechange: Remove TKM from vehicle list sorting dropdowns.
|
5 months ago |
|
frosch
|
9741510396
|
Fix: Wallclock setting should not affect percent-based service interval increments.
|
5 months ago |
|
Jonathan G Rennison
|
04e47eca9a
|
Do not create text effects when running headlessly
|
5 months ago |
|
Tyler Trahan
|
fd9e72a7e7
|
Feature: Use real-time "wallclock" timekeeping units (#11341)
|
5 months ago |
|
Tyler Trahan
|
735abfe111
|
Codechange: Split dates and timers into Economy and Calendar time (#10700)
|
5 months ago |
|
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
|
5 months ago |
|
Jonathan G Rennison
|
f03a941b50
|
Tracerestrict: Sort slots by name in vehicle window
|
5 months ago |
|
Rubidium
|
aa5ba5bd7f
|
Codechange: allow certain enumeration to be added
Otherwise C++20 doesn't like it.
|
5 months ago |