dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,648 Commits 1 Branch 0 Tags
fd605e3cf38a249da537621301adcac2478e53a7
Commit Graph

2306 Commits

Author SHA1 Message Date
Jonathan G Rennison
fd605e3cf3 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/swedish.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/mcf.cpp
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_game.h
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/network/network_admin.h
#	src/network/network_chat_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf.cpp
#	src/newgrf_station.cpp
#	src/order_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/currency_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/terraform_cmd.cpp
#	src/timetable_gui.cpp
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/water_cmd.cpp
 2021-09-27 22:47:23 +01:00
Jonathan G Rennison
0b0d154788 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/ci-build.yml
#	src/lang/german.txt
#	src/lang/romanian.txt
#	src/lang/slovak.txt
#	src/lang/turkish.txt
#	src/network/core/address.cpp
#	src/network/core/tcp.h
#	src/network/core/udp.cpp
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/newgrf_sl.cpp
#	src/tree_cmd.cpp
#	src/video/video_driver.hpp
#	src/window.cpp
#	src/window_gui.h
 2021-09-22 21:50:02 +01:00
Jonathan G Rennison
0dcb04f450 Fix #320: Misspelling of SLXI chunk name 2021-09-17 03:22:06 +01:00
Jonathan G Rennison
e7480620af Include liblzma error code in message 2021-09-15 19:28:11 +01:00
Jonathan G Rennison
54e2d1b851 Log SLXI version label at level sl=2 2021-09-14 19:20:14 +01:00
Jonathan G Rennison
0748d540e8 Implement improved breakdown speed reductions for ships 2021-09-11 23:50:04 +01:00
Jonathan G Rennison
5d351a14d2 Add new signal type: no-entry signal 
This is only passable in one direction, but does not have a signal
or show an aspect in the opposite direction

Add a setting for whether this is shown in the signal UI.
Off by default.
 2021-09-04 11:39:54 +01:00
Jonathan G Rennison
16f2ef227b Store tunnel/bridge signal spacing on tile, adjust spacing to fit length 2021-08-29 02:11:58 +01:00
Jonathan G Rennison
b2ef6c0de8 Add implementation of multi-aspect signalling and GRF support 
Requires realistic braking

See: #247
 2021-08-28 12:54:18 +01:00
Jonathan G Rennison
13603cb8e1 Block signals into blocks with junctions now default to red with realistic braking 2021-08-24 17:30:06 +01:00
Jonathan G Rennison
b8d5113c5a Tracerestrict: Add slot action mode, try to acquire (only on reserve) 2021-08-15 22:39:52 +01:00
Jonathan G Rennison
71dfd2900a Add depot order flag for specific depot 
Use upper half of order flags for extra depot flags

See: #302
 2021-07-23 18:33:24 +01:00
Jonathan G Rennison
6a009686c9 Fix #299: Add estimated max speed (full) to template windows 2021-07-17 23:21:12 +01:00
Jonathan G Rennison
4174fe727c Add NewGRF feature: Extra station name strings 
These are used when all the default names have been used up,
instead of "Town Station #NNN".
 2021-07-17 20:54:10 +01:00
Jonathan G Rennison
158608442c Merge pull request #281 from VacuumBreather/train_speed_adaptation 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
 2021-07-03 23:00:25 +01:00
Jonathan G Rennison
9edc13b889 Make sure setting set correctly on loading existing saves 2021-07-03 22:56:17 +01:00
Jonathan G Rennison
0f73fe765f Merge pull request #293 from VacuumBreather/station_cargo_history 
Add station cargo history
 2021-06-29 19:53:18 +01:00
Jonathan G Rennison
b438380a1e Add station cargo history save/load support 2021-06-29 19:37:20 +01:00
Jonathan G Rennison
5698507d0b Change station cargo history storage format 
Use uint16 to avoid truncation issues
Don't reserve memory for unused cargoes
Store history as ring buffer
Update history graph immediately on storage date
Show total waiting cargo
 2021-06-29 19:37:20 +01:00
Jonathan G Rennison
c4a596b756 Fix missing file from fb0403dc 2021-06-27 09:30:09 +01:00
Jonathan G Rennison
fb0403dcee Add save/load support for train speed adaptation 2021-06-27 04:41:46 +01:00
Jonathan G Rennison
4d0cda12bd Fix saving one byte at a time in Save_SPRG 2021-06-27 04:12:27 +01:00
Andreas Schmitt
9b1783809d Add station cargo history 2021-06-23 08:48:46 +02:00
Andreas Schmitt
e1214a6d8b Fix some type conversion warnings 2021-06-21 09:10:40 +02:00
Jonathan G Rennison
3e66ffead0 Saveload: Allow threaded saves in network server mode 2021-06-20 10:20:10 +01:00
Jonathan G Rennison
87948d8029 Thread: Adjust checks for whether current thread is the game thread 2021-06-20 10:00:36 +01:00
Jonathan G Rennison
1002c6d9d2 Fix various compiler warnings 
See: #267
 2021-06-11 22:54:27 +01:00
Jonathan G Rennison
0579c8755c Add tracerestrict action: No PBS signal back PF penalty 2021-05-25 18:50:36 +01:00
Jonathan G Rennison
6d3a1935a0 Fix "(undefined string)" message when SlError called when saving 2021-05-21 02:05:18 +01:00
Jonathan G Rennison
3ecda2b735 Fix handling of SlError when called from game thread 2021-05-20 20:20:45 +01:00
Jonathan G Rennison
a15e26f369 NewGRF: Elide unmasked vehicle callbacks where possible 
This includes:
* CBID_VEHICLE_32DAY_CALLBACK
* CBID_VEHICLE_REFIT_COST
* CBID_VEHICLE_MODIFY_PROPERTY
  This is on a per-property basis

The main benefit of this is to avoid callbacks not handled by the
vehicle's current sprite group from using the full graphics chain as
the "default" branch in the callback switch.
In the case where the graphics chain is long/expensive, a lot of work
had to be done before a callback failure result was eventually returned.
 2021-05-18 19:07:44 +01:00
rubidium42
44ca7d9377 Change: Use gender-neutral pronouns 2021-05-15 10:16:48 +02:00
rubidium42
ddaedaf32a Fix: empty undocumented branches 2021-05-15 10:16:10 +02:00
Rubidium
bb9121dbd4 Fix: comparison of narrow type to wide type in loop (potential for infinite loops) 2021-05-15 10:16:10 +02:00
PeterN
66cac92028 Fix #9202: Invalid test for unset NewGRF override mapping. (#9226) 
(cherry picked from commit 3d9436bd75)
 2021-05-14 18:33:19 +01:00
PeterN
f52da3de3a Codechange: Don't save unused NewGRF override mappings. (#9202) 
(cherry picked from commit 69e5da0b54)
 2021-05-14 18:15:17 +01:00
William Davis
879de9781b Change: Use gender-neutral pronouns in console command messages (and comments) (#9203) 
(cherry picked from commit 881e1da51d)
 2021-05-14 18:15:00 +01:00
Jonathan G Rennison
2e28bc8e6a Tracerestrict: Add engine class conditional 2021-05-13 23:49:03 +01:00
rubidium42
0f062b3882 Codechange: clean up C-string support from settings 2021-05-13 23:13:17 +02:00
rubidium42
a032714dc4 Codechange: move script settings to std::string 2021-05-13 23:13:17 +02:00
rubidium42
95386dc2b8 Codechange: move misc settings to std::string 2021-05-13 23:13:17 +02:00
glx22
38c97e1492 Codechange: Replace TILE_AREA_LOOP with range-based for loops 2021-05-13 00:13:54 +02:00
Patric Stout
b136e65cf9 Change: reworked the debug levels for network facility (#9251) 
It now follows very simple rules:
0 - Fatal, user should know about this
1 - Error, but we are recovering
2 - Warning, wrong but okay if you don't know
3 - Info, information you might care about
4 -
5 - Debug #1 - High level debug messages
6 - Debug #2 - Low level debug messages
7 - Trace information
 2021-05-12 16:34:02 +02:00
PeterN
3d9436bd75 Fix #9202: Invalid test for unset NewGRF override mapping. (#9226) 2021-05-12 09:11:14 +02:00
PeterN
69e5da0b54 Codechange: Don't save unused NewGRF override mappings. (#9202) 2021-05-08 11:36:39 +01:00
William Davis
881e1da51d Change: Use gender-neutral pronouns in console command messages (and comments) (#9203) 2021-05-08 11:02:30 +01:00
glx22
8333323090 Codechange: Replace FOR_ALL_ROADTRAMTYPES with range-based for loops 
(cherry picked from commit 2feb801e56)
 2021-05-06 21:21:41 +01:00
PeterN
43fe7463ba Fix: Update text effect size when font zoom is changed. (#9174) 
(cherry picked from commit 18651dd8b1)
 2021-05-06 20:52:00 +01:00
Loïc Guilloux
88bc7bd235 Fix: [MinGW] Set minimum OS version to Windows XP (#9135) 
(cherry picked from commit 356bbbb90a)
 2021-05-06 18:25:28 +01:00
Jonathan G Rennison
95ca147445 Add cheat: town local authority ratings fixed as Outstanding 2021-05-05 01:17:54 +01:00