dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,448 Commits 1 Branch 0 Tags
2ea1766677b063a2e40f370b655177ccec406b35
Commit Graph

881 Commits

Author SHA1 Message Date
Jonathan G Rennison
2ea1766677 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_object.hpp
#	src/script/squirrel_helper.hpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/table/settings.h.preamble
#	src/tree_cmd.cpp
#	src/tree_map.h
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
 2023-03-04 16:45:05 +00:00
Jonathan G Rennison
4ec6a99dd8 Add GetTileTrackStatus wrapper for when red signals part is not needed 2023-03-04 02:01:40 +00:00
Rubidium
580d0a6343 Codechange: make use of Tile in for all direct map accesses 2023-02-28 07:11:48 +01:00
Rubidium
0fb0469e47 Codechange: introduce iterator to iterate over the Tiles of a Map 
Note: this version is using TileIndex, but that changes later
 2023-02-28 07:11:48 +01:00
dP
b0542c8c49 Codechange: Don't store tree counter in the map array (#10018) 2023-02-26 16:39:44 -05:00
Loïc Guilloux
8b36b2cbf3 Fix #10486: [Script] Debug window requires AIs to be started before GS (#10487) 
(cherry picked from commit 4072dcff49)
 2023-02-20 17:32:19 +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
3497d0dcdb Add road/tram type properties to set road vehicle collision mode 2023-02-19 14:30:21 +00:00
Loïc Guilloux
4072dcff49 Fix #10486: [Script] Debug window requires AIs to be started before GS (#10487) 2023-02-17 12:24:51 +01: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
Jonathan G Rennison
05ec32f577 Run water flooding at constant speed at day lengths >= 4 
See: #482
 2023-02-09 21:39:04 +00:00
glx22
b080f24bd8 Codechange: move windows common to AI and GS out of ai_gui 2023-02-05 19:27:25 +01:00
Rubidium
4e65ec1dc4 Codechange: do not declare functions in blocks 2023-01-29 20:28:45 +01:00
Jonathan G Rennison
7a7c688b11 Do not call ReInitAllWindows from within LoadStringWidthTable 2023-01-29 10:31:28 +00:00
Tyler Trahan
9c5de7fd72 Fix #10395: When loading old saves, don't forcibly bar level crossings (#10400) 2023-01-23 18:08:19 +01:00
Rubidium
fe2bcd2a58 Codechange: migrate size related functions to Map structure 2023-01-21 17:11:40 +01: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
Rubidium
c5ff61c5f2 Add: script specific Randomizer instances 2023-01-14 22:00:11 +01:00
Jonathan G Rennison
adf2210bc8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/genworld_gui.cpp
#	src/lang/afrikaans.txt
#	src/lang/arabic_egypt.txt
#	src/lang/basque.txt
#	src/lang/belarusian.txt
#	src/lang/brazilian_portuguese.txt
#	src/lang/bulgarian.txt
#	src/lang/catalan.txt
#	src/lang/croatian.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/dutch.txt
#	src/lang/english.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/esperanto.txt
#	src/lang/estonian.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/frisian.txt
#	src/lang/gaelic.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/lang/greek.txt
#	src/lang/hebrew.txt
#	src/lang/hungarian.txt
#	src/lang/icelandic.txt
#	src/lang/indonesian.txt
#	src/lang/irish.txt
#	src/lang/italian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latin.txt
#	src/lang/latvian.txt
#	src/lang/lithuanian.txt
#	src/lang/luxembourgish.txt
#	src/lang/malay.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/norwegian_nynorsk.txt
#	src/lang/persian.txt
#	src/lang/polish.txt
#	src/lang/portuguese.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/slovenian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/thai.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/lang/welsh.txt
#	src/saveload/afterload.cpp
 2023-01-12 20:59:34 +00:00
PeterN
c18a171028 Fix #10331: Starting new company during load must happen after AI start. (#10332) 
This situation occurs when loading a savegame in single-player which only
has AI companies.
 2023-01-08 18:09:38 +00:00
Rubidium
375a5b8e3f Codechange: refactor FindClosestDepot to not use pointers, but return a struct 2023-01-04 22:30:48 +01:00
Jonathan G Rennison
a1f6aaa58f Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/korean.txt
#	src/saveload/afterload.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/game_sl.cpp
#	src/script/script_instance.cpp
 2022-12-31 18:17:24 +00:00
Loïc Guilloux
fe30f66570 Fix #9720: Delay start of GS/AI to after loading of savegame (#9745) 2022-12-28 05:02:26 +01:00
Jonathan G Rennison
3877bb31ef Changing day length or date no longer changes time in minutes 
Add offset variables for scaled date ticks.
Adjust offset when changing day length or date, such that scaled
date ticks remain the same.
Store _scaled_tick_counter and scaled date ticks offset in the savagame.
 2022-12-16 19:15:46 +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
Loïc Guilloux
13d2d11fa8 Fix #10216: Initialise RoadStop caches before using them and don't try to teleport crashed vehicles (#10217) 2022-12-05 12:46:46 +01:00
Jonathan G Rennison
3d7e5d5369 Avoid unnecessary viewport redraws for unused tile loop house triggers 2022-11-24 02:38:10 +00:00
Jonathan G Rennison
0bf1c9bb9d Merge tag '13.0-beta1' into jgrpp 2022-11-05 19:12:42 +00:00
Jonathan G Rennison
49bda05fb5 Set adjacent crossings setting to false when loading pre v300 trunk savegames 2022-11-03 00:57:47 +00:00
Jonathan G Rennison
aba8e88d8c Enable loading of upstream savegames up to version 302 2022-11-02 18:46:24 +00:00
Tyler Trahan
c19abebf8d Feature: Multi-track level crossings (#9931) 2022-11-01 16:51:23 -04:00
Nicolas Chappe
f8a7b76675 Fix #9665: [Linkgraph] Fix travel times of non-direct journeys 2022-10-29 18:39:03 +02:00
Jonathan G Rennison
12eb23f0ab Clear old tree counter in map array on load of old savegames 
See: https://github.com/OpenTTD/OpenTTD/pull/10018
 2022-10-01 23:05:07 +01:00
Jonathan G Rennison
9e24414033 In ReloadNewGRFData recompute prices before reiniting windows 
Avoid crash if land info window is open during reload
 2022-10-01 14:31:26 +01:00
Jonathan G Rennison
bc3b928d34 Fix improved breakdowns being enabled after loading old/other savegame 2022-09-16 20:28:58 +01:00
Jonathan G Rennison
aa49e17e39 Remove road vehicles during load which are uncorrectably invalid 2022-08-07 20:00:40 +01:00
Jonathan G Rennison
92723d4f5c Remove tunnel/bridge spacing setting, use usual signal drag spacing 2022-06-19 18:32:47 +01:00
Jonathan G Rennison
22caac6529 Add game setting to limit train lookahead to signal aspect 
In realistic braking mode when multi-aspect signalling enabled by GRF
 2022-06-19 12:44:15 +01:00
Jonathan G Rennison
bdd73a19a1 Add signal style flag for unconditional reserve through 
Add map bits for unconditional reserve through
Adjust signal aspect/state handling
 2022-06-19 04:15:27 +01:00
Jonathan G Rennison
7ae06124ae Add signal style flag for no aspect increase behaviour (banner repeater) 2022-06-19 02:08:38 +01:00
Jonathan G Rennison
6e4c4b35e7 Initial implementation of NewGRF custom signal styles 2022-06-19 02:08:38 +01:00
Jonathan G Rennison
99ee4b13ce Realistic braking: Cache train overall z position 
Refresh cache at a variable rate depending on train length and
weight distribution
 2022-06-03 00:41:41 +01:00
Jonathan G Rennison
af270a63ad Industry: Apply anim tile masking when loading prior version saves 2022-06-01 01:21:58 +01:00
Jonathan G Rennison
42e20d3d99 Industry: Determine which tiles in industry layouts are not animated 
Do not set these as animated tiles for new industries
 2022-06-01 01:13:46 +01:00
Tyler Trahan
ec90fb4c99 Fix #6544: Don't join AI company when loading network game in singleplayer 2022-04-30 19:36:09 +02:00
Jonathan G Rennison
ed30542acf Cache highest snowline value 2022-04-29 17:10:18 +01:00
Rubidium
c73f578e8c Codechange: replace magic numbers and C-style arrays with C++-style array for share owners 2022-03-09 18:05:12 +01:00
Jonathan G Rennison
e5a421b65a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/economy.cpp
#	src/linkgraph/refresh.cpp
#	src/order_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_base.h
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
 2022-03-04 18:17:44 +00:00
Niels Martin Hansen
e68bf58989 Codechange: Use anonymous union for vehicle orders/old orders list 2022-02-15 20:01:10 +01:00
Jonathan G Rennison
d4f11eca42 Add NewGRF object properties to set viewport map mode/smallmap tile type 2022-02-07 01:16:45 +00:00