dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,346 Commits 1 Branch 0 Tags
5641c926bf5c8ebd3c0c21cd9bedbb18a677c24f
Commit Graph

2412 Commits

Author SHA1 Message Date
Jonathan G Rennison
e0a42b5945 Debug: Add dumping of rail and road/tram sprite groups 2023-02-25 16:16:49 +00:00
Jonathan G Rennison
5a877b49b4 Add railtype/signal variable to get signal side 2023-02-19 20:22:40 +00:00
Jonathan G Rennison
f7d62a1767 Add road/tram type flag to disallow collisions with trains 2023-02-19 18:05:11 +00:00
Jonathan G Rennison
663a3969a0 Add road/tram type flag to disallow tunnels 2023-02-19 15:21:35 +00:00
Jonathan G Rennison
3497d0dcdb Add road/tram type properties to set road vehicle collision mode 2023-02-19 14:30:21 +00:00
Jonathan G Rennison
796924ec32 Change type of extended feature versions arrays 2023-02-15 23:49:40 +00:00
Jonathan G Rennison
dceafaf2db GRF: Initial support for > 255 road stop specs per GRF 
Add new variable for road stop info of nearby tiles
Bump roadstops version
 2023-02-12 20:35:18 +00:00
Jonathan G Rennison
ae9b416684 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/ai/ai_instance.cpp
#	src/console_cmds.cpp
#	src/engine_type.h
#	src/game/game_gui.cpp
#	src/game/game_instance.cpp
#	src/goal.cpp
#	src/goal_cmd.h
#	src/lang/english.txt
#	src/lang/estonian.txt
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_generic.h
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_map.h
#	src/strings.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/gui_settings.ini
#	src/tbtr_template_gui_main.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/water_cmd.cpp
 2023-02-11 23:05:22 +00:00
Michael Lutz
5daaa45e4a Add: [NewGRF] Second vehicle property for additional callback flags. 
(cherry picked from commit 2d73076056)
 2023-02-05 22:40:03 +00:00
glx22
b080f24bd8 Codechange: move windows common to AI and GS out of ai_gui 2023-02-05 19:27:25 +01:00
Jonathan G Rennison
1272bec13b Road stops: Add height property for build window preview 2023-02-05 17:40:14 +00:00
Jonathan G Rennison
219e41b5d6 Debug: Enable inspecting non-GRF objects 2023-02-04 11:00:00 +00:00
Jonathan G Rennison
e8dca9f220 Debug: Add time since load/unload to station debug info 2023-02-02 18:48:46 +00:00
Rubidium
bf8b32d193 Change: explicitly allow initial loan of 0, however show warning in UI 2023-02-01 21:41:18 +01:00
Rubidium
b7b7c11b90 Change #10077: make maximum loan a positive multiple of the loan interval 
And set the minimum maximum loan to the value of loan interval, so there is
always an amount of money to lend. Compared to being allowed to set max loan
to 0 and never be allowed to lend any money.
 2023-02-01 21:41:18 +01:00
Michael Lutz
2d73076056 Add: [NewGRF] Second vehicle property for additional callback flags. 2023-01-30 22:00:56 +01:00
Jonathan G Rennison
f3645cf629 Debug: Dump all station sprite groups, not just current resolved one 2023-01-29 14:14:17 +00:00
Jonathan G Rennison
c80075b7cc Add setting and town override for whether towns can build bridges 2023-01-28 11:19:49 +00:00
Jonathan G Rennison
1f364c6b21 Fix the viewport map default display mode setting 
Routes value was missing
Adjust strings

See: #475
 2023-01-22 12:39:18 +00:00
Jonathan G Rennison
1bfd96c7f2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/3rdparty/fmt/core.h
#	src/command_type.h
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/landscape.cpp
#	src/network/network.cpp
#	src/newgrf_object.h
#	src/object_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_industrytype.cpp
#	src/script/api/script_object.hpp
#	src/script/api/script_town.cpp
#	src/table/object_land.h
#	src/timetable_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
 2023-01-15 19:28:37 +00:00
PeterN
2355882ec1 Codechange: Remove object enabled flag and shuffle members. (#10358) 
`enabled` flag is replaced with IsEnabled() which checks if views is
non-zero.

ObjectSpec is shuffled to reduce its memory footprint.
 2023-01-15 10:58:03 +00:00
Jonathan G Rennison
8c4c9a8c13 Enable loading game_creation.custom_industry_number from upstream saves 2023-01-14 16:59:03 +00:00
Tyler Trahan
2206c73156 Feature: Set a custom number of industries in map generation window (#10340) 2023-01-14 05:12:29 -05:00
Jonathan G Rennison
3e33be7b10 Fix day length changes with scheduled dispatch and timetable start times 
When time is in minutes

See: #472
 2023-01-12 23:44:09 +00:00
Jonathan G Rennison
e816c2416a Debug: Show more road vehicle engine fields in debug window 2023-01-07 00:22:39 +00:00
Jonathan G Rennison
62d524eaef Merge branch 'master' into jgrpp 
# Conflicts:
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/spritecache.cpp
#	src/timetable_gui.cpp
 2023-01-06 20:02:04 +00:00
PeterN
1b1aa682a6 Fix: Don't assume engclass 2 should be elrail. (#10315) 
When disabling/enabling elrail, there is an assumption that `engclass` of 2
means the engine will run on elrail. While this holds for default engines,
NewGRFs can do other things.

To resolve this we store the intended railtype so that toggling elrail will
restore to the correct type.
 2023-01-06 00:44:57 +00:00
Jonathan G Rennison
96f790fc7d Debug: Show rail station tile layouts in debug window 2023-01-03 03:55:51 +00:00
Jonathan G Rennison
0093ebe3a7 Debug: Add engine variant ID and extra flags to debug info 2022-12-28 02:17:48 +00:00
Jonathan G Rennison
b9dad1818b Add setting to disable NewGRF inflation flag 2022-12-28 01:58:03 +00:00
Jonathan G Rennison
64c210f770 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/engine.cpp
#	src/engine_func.h
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/newgrf.cpp
#	src/saveload/oldloader_sl.cpp
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
 2022-12-28 01:46:29 +00:00
Jonathan G Rennison
5bea50c413 Debug: Add rail engine misc flags to debug info 2022-12-27 02:11:41 +00:00
Jonathan G Rennison
14f4f6d104 Remove now unused vehicle.flip_direction_all_trains setting 2022-12-27 01:00:41 +00:00
Jonathan G Rennison
58d841486e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/os/windows/font_win32.cpp
#	src/script/api/script_object.hpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2022-12-27 01:00:40 +00:00
Francis Herne
6caed5f15e Add: Slope-aware and roadtype-specific one-way sprites. (#10282) 2022-12-26 15:06:21 -05:00
Peter Nelson
3485709f53 Add: Additional vehicle flags to control variants. 2022-12-25 16:41:58 +00:00
peter1138
d7f561a400 Change: Add variant property to engines. 2022-12-25 16:41:58 +00:00
Jonathan G Rennison
8af4ac8a4c GRF: Add road stops variable for road info of nearby plain road tile 
See: #464
 2022-12-24 18:54:28 +00:00
Jonathan G Rennison
6b8f799a1c Debug: Show engine base introduction date 2022-12-24 17:42:14 +00:00
PeterN
7b5edba76c Change: Support flipping shorter engines without NewGRF support. (#10262) 
* Change: Support flipping shorter engines without NewGRF support.
* Cleanup: Remove write-only prop27_set temporary flag.
 2022-12-23 21:02:14 +00:00
Jonathan G Rennison
9e33153df9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/os/macosx/string_osx.cpp
 2022-12-20 18:05:43 +00:00
PeterN
dde15a403c Fix #10257: Incorrect wire position on sloped bridge heads. (#10258) 2022-12-19 20:16:26 +00:00
Jonathan G Rennison
0a9d734ce8 Debug: List new landscape GRFs and their flags in the debug window 2022-12-12 23:25:44 +00:00
Jonathan G Rennison
39277404a2 Add new landscape variable for ground density and snow presence 2022-12-12 23:19:44 +00:00
Jonathan G Rennison
2430a5113e Debug: Add GRF debug window support for new landscape rocks 2022-12-12 19:15:19 +00:00
Jonathan G Rennison
5c2d5782a4 Fixes incorrect link graph edge travel times with non-unity day length 
Change vehicle last_loading_tick to be relative to _scaled_tick_counter
 2022-12-11 00:27:18 +00:00
Jonathan G Rennison
d776b302fa Store the gui.zoom_max setting under a different name in the config file 
So that it isn't overwritten by vanilla.
Otherwise use the vanilla setting value if present and outside the
vanilla range.
 2022-12-09 19:58:07 +00:00
Jonathan G Rennison
6d4474b84e Merge tag '13.0-beta2' into jgrpp 
# Conflicts:
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/depot_gui.cpp
#	src/error_gui.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/misc_gui.cpp
#	src/network/network_content_gui.h
#	src/newgrf_debug_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/station_gui.cpp
#	src/subsidy_gui.cpp
#	src/table/settings/gui_settings.ini
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/water_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
 2022-12-04 20:43:11 +00:00
Jonathan G Rennison
7a6a7a3bfa Fix duplication of tree sprite table 2022-12-03 22:48:49 +00:00
Jonathan G Rennison
afd3004ea0 Debug: Avoid compiler warnings in debug window cargo class printing 2022-11-29 17:58:51 +00:00