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

2146 Commits

Author SHA1 Message Date
Jonathan G Rennison
63203c2395 Add GUI/client setting to save zoning overlay state 2019-03-12 18:44:40 +00:00
PeterN
dd20ccee88 Feature: Industries with neutral stations (e.g. Oil Rig) only supply/accept cargo to/from their neutral station. (#7234) 
This change is a controlled by a game setting, located under Environment ->
Industries which allows toggling the behaviour. It defaults to enabled.

"Company stations can serve industries with attached neutral stations"

When enabled, industries with attached neutral station (such as Oil Rigs) may
also be served by company-owned stations built nearby. This is the traditional
behaviour.

When disabled, these industries may only be served by their neutral station.
Any nearby company-owned stations won't be able to serve them, nor will the
neutral station serve anything else other than the industry.
 2019-03-08 18:30:44 +00:00
Peter Nelson
b8a0107ad1 Change: Add configurable curve penalty for ships. 2019-03-08 16:52:08 +01:00
nikolas
a7e335c0b3 Fix: spelling for a few real town names (#7338) 
Added special characters to mostly Slovak towns, a few Spanish, and one Turkish.
 2019-03-07 17:52:57 +00:00
Niels Martin Hansen
52572cafa6 Add: Option for population-linear town cargo generation 
Introduce a new default algorithm for town cargo generation (passengers and mail), and a game setting to choose between the new and original algorithm.

The original town cargo generation algorithm has the property of the generated amount relating to the square of each building's population, meaning large towns easily produce more cargo than can realistically be transported. The problem is excessive cargo is amplified if playing with cargodist.

The new algorithm introduced instead has a linear relation to the population. The result is that smaller towns will produce slightly more cargo, while the largest towns will produce about a fourth of what they would with the original algorithm.

Existing savegames will use the original algorithm, while new games will default to the new algorithm.
 2019-03-04 20:19:44 +01:00
Jonathan G Rennison
60c2f0ebc8 Remove now unused town_bridge_over_rail setting, feature in trunk 2019-03-04 01:19:56 +00:00
Jonathan G Rennison
7ff252c58d Merge branch 'master' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h
 2019-03-04 01:18:25 +00:00
SamuXarick
03264059e4 Change: Decrease minimum permitted value for script_max_opcode_till_suspend setting (#7243) 2019-02-28 17:37:50 +00:00
Jonathan G Rennison
705fc18b08 Add company setting to advance order when cloning/copying/sharing 
Advance order if current depot is in order list
 2019-02-26 01:05:29 +00:00
Jonathan G Rennison
7b8db50fd5 Add UI setting for whether to open new vehicle GUI when share-cloning 2019-02-25 23:04:10 +00:00
Greg Carlin
00d28a500d Feature: Add option to adjust font size separately from GUI size. (#7003) 
Adds an option in the "Game Options" next to "Interface Size" called "Font Size". Available options are normal, double, and quad.
 2019-02-23 08:27:46 +00:00
Jonathan G Rennison
4c8b358ffe Add game setting to allow only non-stop orders for ground vehicles 2019-02-17 19:56:49 +00:00
Jonathan G Rennison
2142452305 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/core/config.h
#	src/network/network.cpp
#	src/network/network_udp.cpp
#	src/rev.h
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/gamelog_sl.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
#	src/viewport.cpp
 2019-02-04 18:32:44 +00:00
Jonathan G Rennison
46b5b0155c Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
 2019-02-04 18:24:38 +00:00
Jonathan G Rennison
09c62d6951 Merge branch 'master' into cpp-11 2019-02-04 18:09:36 +00:00
Peter Nelson
9de12521ec Codechange: Convert saveload numbers to enum values. 
(This was mostly achieved with a few in-place regexes)
 2019-02-02 21:39:06 +00:00
Peter Nelson
ea4ea62816 Codechange: Make saveload version upper bound exclusive, i.e. version object was removed instead of version object last appeared. 2019-02-02 21:39:06 +00:00
Jonathan G Rennison
3a77f75bf6 Add GUI setting to control savegame overwrite confirmation dialog 
Adjust game ID indications in save window UI
 2019-02-02 02:09:40 +00:00
Jonathan G Rennison
9d3b77c5a2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
 2019-02-02 01:27:56 +00:00
Peter Nelson
12b6fe47c7 Fix: Set MU flag on some default engines. 2019-02-01 07:08:55 +00:00
Jonathan G Rennison
ddf31702a2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/saveload.cpp
#	src/widgets/group_widget.h
 2019-01-31 18:19:45 +00:00
PeterN
23960d0f2c Feature: Group liveries, and livery window usability enhancements. (#7108) 
* Change: Replace checkbox in livery selection window with Default option in drop down selection.

This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.

* Feature: Add vehicle group liveries.
 2019-01-31 14:57:44 +01:00
Jonathan G Rennison
255b6adfc9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/vehicle_cmd.cpp
 2019-01-31 02:04:02 +00:00
nikolas
8334a57332 Fix: unicode characters in Romanian town names (#7141) 
Many of these town names were using the 'a with ~ above it' character,
which should actually by 'a with u above it'. There were other missing
accents as well which I've added.
 2019-01-30 14:52:56 +01:00
Jonathan G Rennison
281d346fe2 Merge branch 'master' into jgrpp 
# Conflicts:
#	bin/baseset/no_sound.obs
#	bin/baseset/orig_dos.obg
#	bin/baseset/orig_dos.obs
#	bin/baseset/orig_dos_de.obg
#	bin/baseset/orig_win.obg
#	bin/baseset/orig_win.obm
#	bin/baseset/orig_win.obs
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.cpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/common.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/saveload/saveload.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2019-01-29 02:28:14 +00:00
Nikolas Nyby
4158c077cd Fix: Remove duplicate French and Slovak town names 
I've replaced some of the duplicate real town names with new real town
names in the French and Slovak sets.

Also, some Slovak town names were missing accents, so I've fixed those.
 2019-01-24 21:47:13 +00:00
Jonathan G Rennison
094160ede3 Merge remote-tracking branch 'damfr/save-unique-id' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
 2019-01-22 18:42:01 +00:00
Jonathan G Rennison
191afd93c1 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/vehicle_base.h
#	src/widgets/dropdown.cpp
 2019-01-21 19:28:29 +00:00
Jonathan G Rennison
80d6f6c622 Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
 2019-01-21 18:37:47 +00:00
Niels Martin Hansen
48b334cf97 Add: Houses can accept up to 16 different cargo types via NewGRF. 
New Action0 property 23 for feature 07, variable length, format B n*(B B). Initial byte is number of structures following. First byte in structure is cargo id, second is acceptance level in 1/8 units.
 2019-01-21 16:06:25 +01:00
Peter Nelson
4daaec1a94 Change: Invalidate ship path caches if pathfinder choice or forbid-90-degree turns are changed. 2019-01-19 23:11:17 +00:00
Jonathan G Rennison
e3d167f9f0 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
 2019-01-14 00:01:44 +00:00
Jonathan G Rennison
4a162c5502 Merge branch 'cpp-11' into save_ext 2019-01-13 23:30:52 +00:00
Jonathan G Rennison
0bed63b77f Merge branch 'master' into cpp-11 2019-01-13 22:49:55 +00:00
nikolas
82e530b517 Fix: Remove duplicate town name "Huacho" (#7038) 
Huacho appears twice in the Spanish town names list. This change removes
the second one, and replaces it with a new one: Medellin.
 2019-01-12 08:33:13 +01:00
Nikolas Nyby
65746a0275 Fix: Spelling fixes on some Latin American town names 2019-01-11 20:24:12 +00:00
Gabda87
a0293d313d Add #4115: default company colour setting (#6998) 
Works only in single player.
 2019-01-10 10:45:38 +01:00
Jonathan G Rennison
0dba091d79 Merge branch 'cpp-11' into save_ext 
# Conflicts:
#	config.lib
#	src/saveload/saveload.cpp
 2019-01-06 22:10:04 +00:00
Jonathan G Rennison
962a9c5430 Merge branch 'master' into cpp-11 
# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/saveload/saveload.cpp
 2019-01-06 22:07:28 +00:00
Jonathan G Rennison
4f1d54564e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
 2019-01-02 16:09:44 +00:00
glx
c540d72445 Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32 2018-12-27 18:09:16 +01:00
Jonathan G Rennison
e3207a77fb Add setting to control if and how land purchasing is permitted 2018-11-26 18:25:17 +00:00
damfr
5f6858c379 Add: Setting to save a unique id for each savegame 2018-11-26 10:30:49 +01:00
Jonathan G Rennison
46b1ea81e4 Add company rate limit for land area purchasing 2018-11-23 18:47:36 +00:00
Jonathan G Rennison
8b37e5aac2 Implement custom bridge pillar flag support 
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars

Set values for default bridges and stations
 2018-11-17 19:49:05 +00:00
Jonathan G Rennison
e735c1a51a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
 2018-11-05 12:53:36 +00:00
Niels Martin Hansen
e66cec8f86 Add: NewGRF support for 16-in-16-out industries 2018-11-03 21:43:54 +01:00
Niels Martin Hansen
8859381d30 Add: Industries can produce and accept up to 16 different cargoes 2018-11-03 21:43:54 +01:00
Jonathan G Rennison
3a640af71d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp
 2018-10-29 18:33:15 +00:00
Samu
eff09c43cd Fix #4109: Add more water checks to the Oil Rig layout 
Prevents Oil Rig docking tile from becoming unreachable by ships when spawning next to each other.
 2018-10-25 20:09:42 +02:00