dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,780 Commits 1 Branch 0 Tags
58433c7667f5890b1e18b346fcbe34ba68fb50ae
Commit Graph

1048 Commits

Author SHA1 Message Date
Jonathan G Rennison
58433c7667 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/core/smallmap_type.hpp
#	src/lang/korean.txt
#	src/network/network_content.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
 2019-03-30 20:45:58 +00:00
glx22
66dd7c3879 Fix: MSVC warnings (#7423) 2019-03-28 00:09:33 +01:00
Jonathan G Rennison
ba34ec7ade Merge branch 'master' into jgrpp 
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
 2019-03-27 18:12:04 +00:00
Henry Wilson
ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 2019-03-26 20:15:57 +00:00
Henry Wilson
a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 2019-03-26 20:15:57 +00:00
Henry Wilson
a690936ed7 Codechange: Replace SmallVector::Length() with std::vector::size() 2019-03-26 20:15:57 +00:00
peter1138
317f69c152 Codechange: Use override specifier in Window-derived classes. 2019-03-24 16:10:04 +01:00
Henry Wilson
af7d9020a1 Codechange: Use override specifer for overriding member declarations 
This is a C++11 feature that allows the compiler to check that a virtual
member declaration overrides a base-class member with the same signature.

Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked
as virtual despite being a template.
 2019-03-24 16:10:04 +01:00
Jonathan G Rennison
5e6d283463 Merge branch 'master' into jgrpp 
Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
 2019-03-13 03:38:26 +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
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
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
peter1138
c2e4a8c9bf Fix 195fd0dc60: Sprite cache must still be cleared when using bitmap fonts. 2019-02-25 19:46:03 +00:00
PeterN
195fd0dc60 Fix #7266: Reorder reinitialization of caches when changing font zoom level. (#7273) 2019-02-24 16:27:44 +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
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
glx
8418e27403 Fix: close Textfile windows when closing Option window 2019-02-01 16:46:45 +01:00
Jonathan G Rennison
255b6adfc9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/vehicle_cmd.cpp
 2019-01-31 02:04:02 +00:00
glx
b22fbfbe3d Add: allow opening of one TextfileWindow per type 2019-01-28 23:43:18 +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
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
e3207a77fb Add setting to control if and how land purchasing is permitted 2018-11-26 18:25:17 +00:00
Jonathan G Rennison
ce4e2ca3c3 Add setting to enable flipping direction of all train types in depot 2018-09-11 06:08:02 +01:00
Jonathan G Rennison
4bdbf3863d Add setting to allow placing stations under bridges 2018-07-24 03:22:33 +01:00
Jonathan G Rennison
56bde8ce18 Add setting to allow placing all NewGRF objects under bridges 2018-07-24 03:22:33 +01:00
Jonathan G Rennison
035c00b521 Add rail custom bridge heads setting to settings GUI 2018-07-24 03:22:32 +01:00
Jonathan G Rennison
ef0a458ab6 Add go to depot and sell vehicle orders 
Controlled by a setting (default off)
 2018-06-21 23:28:19 +01:00
Jonathan G Rennison
e82ccad052 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/table/settings.ini
#	src/train_cmd.cpp
#	src/tunnelbridge.h
 2018-06-17 09:35:18 +01:00
Jonathan G Rennison
814f9f7e0f Implement bidirectional mode for signals on bridges/tunnels 2018-06-17 04:27:03 +01:00
Jonathan G Rennison
d2d8a86814 Add setting: station rating waiting time tolerance depends on cargo class 2018-06-04 20:43:05 +01:00
Jonathan G Rennison
f2072319cb Add autosave_on_network_disconnect setting to GUI 2018-05-30 08:36:48 +01:00
Jonathan G Rennison
fa304cdb75 Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
 2018-05-25 19:09:20 +01:00
Jonathan G Rennison
ad1c402ad8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
 2018-05-03 23:54:51 +01:00
Niels Martin Hansen
19f5a6cbb0 Feature #6090: Change music set during gameplay 2018-04-29 19:26:05 +02:00
PeterN
cfe6a8ea4f Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. (#6756) 2018-04-28 22:27:14 +01:00
Jonathan G Rennison
6ec78ff4b0 Add UI setting to disable mass action buttons for top-level vehicle lists 2018-03-29 20:39:25 +01:00
Jonathan G Rennison
7aab49e282 Add setting to enable through loading in UI 2018-03-29 18:52:54 +01:00
Jonathan G Rennison
097cf9b0b1 Add UI setting to control whether cargo filter drop down is shown 2017-10-17 00:16:10 +01:00
Jonathan G Rennison
aa138baec9 Add UI setting for whether programmable signals shown in UI (default off) 
Add setting subcategory for advanced signal features
 2017-09-04 19:25:45 +01:00
Jonathan G Rennison
5199e19213 Move timetable interface settings to GUI subcategory 2017-09-04 19:02:24 +01:00
Jonathan G Rennison
c3a9eca1a9 Add town growth setting, rate depends on proportion of transported cargo 2017-08-26 01:15:16 +01:00
Jonathan G Rennison
0d2be99827 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
 2017-08-20 10:38:23 +01:00
Jonathan G Rennison
a3d1585826 Add settings callback field to re-order setting options in GUI 2017-08-20 10:37:45 +01:00
Jonathan G Rennison
4255d8a131 Remove gui.enable_single_veh_shared_order_gui from settings GUI 2017-08-18 19:11:48 +01:00