dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,452 Commits 1 Branch 0 Tags
152e258d80aeb9f49a5576fde778abf8ab71a4dd
Commit Graph

492 Commits

Author SHA1 Message Date
Jonathan G Rennison
84a7ab180e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_cmd.cpp
#	src/lang/greek.txt
#	src/table/settings.ini
 2021-03-02 13:46:42 +00:00
Patric Stout
74aa934441 Codechange: validate that "max" value of settings fit in their storage 
This is an easy mistake to make, so protect us against making such
mistakes, by validating it doesn't happen.
 2021-03-01 23:17:47 +01:00
Patric Stout
f183ded9fe Add: settings to limit your fast-forward game speed 
By default this setting is set to 2500% normal game speed.

(cherry picked from commit c3dc27e37e)

# Conflicts:
#	src/gfx.cpp
#	src/gfx_func.h
#	src/settings_type.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
 2021-03-01 17:54:15 +00:00
Patric Stout
c3dc27e37e Add: settings to limit your fast-forward game speed 
By default this setting is set to 2500% normal game speed.
 2021-02-28 18:04:51 +00:00
Jonathan G Rennison
93f2d5e056 Add GUI setting for shading trees on slopes in viewports 
Deafult on, only for non-map mode
(Slope shading is always on in map mode)
 2021-02-26 18:03:00 +00:00
Jonathan G Rennison
e95216b59d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
 2021-02-19 15:38:34 +00:00
Patric Stout
fa170b9ace Feature: configurable refresh-rate and change default to 60fps 
Most modern games run on 60 fps, and for good reason. This gives
a much smoother experiences.

As some people have monitors that can do 144Hz or even 240Hz, allow
people to configure the refresh rate. Of course, the higher you
set the value, the more time the game spends on drawing pixels
instead of simulating the game, which has an effect on simulation
speed.

The simulation will still always run at 33.33 fps, and is not
influences by this setting.
 2021-02-19 10:43:15 +01:00
Jonathan G Rennison
b7ddd486cf Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
 2021-02-01 17:07:34 +00:00
Jonathan G Rennison
f9956d88c3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/company_gui.cpp
#	src/lang/arabic_egypt.txt
#	src/lang/czech.txt
#	src/lang/esperanto.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/malay.txt
#	src/lang/polish.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/unfinished/urdu.txt
#	src/main_gui.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings.ini
 2021-01-31 01:11:12 +00:00
Jonathan G Rennison
33d9e48bcf Add setting for inflation dates mode 2021-01-30 19:59:00 +00:00
Jonathan G Rennison
39df1c49a1 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fileio.cpp
#	src/group_gui.cpp
#	src/industry.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.cpp
#	src/linkgraph/linkgraphschedule.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/town_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
 2021-01-30 18:27:35 +00:00
Jonathan G Rennison
09dc33022c Add client setting for vehicle naming scheme 2021-01-29 18:16:42 +00:00
Jonathan G Rennison
ed0ffb6220 Add feature: realistic train braking 
Add setting to select train braking model.
 2021-01-28 19:03:18 +00:00
Charles Pigott
188bf0fbc9 Change: Remove disable_unsuitable_building setting 
This setting is no longer useful, as you can now always build roads,
canals, etc.
 2021-01-08 16:43:51 +01:00
Kuhnovic
a3a7928372 Feature: option to auto remove signals when in the way during rail construction (#8274) 2021-01-07 10:17:05 +01:00
Pavel Stupnikov
ba4626d450 Add: new economy "frozen" that stops production changes and industry closures (#8282) 
(cherry picked from commit c9fd85528a)
 2020-12-27 20:32:34 +00:00
frosch
2bb691f50e Change: Remove the LAN/Internet combobox from the server list in favour of adding two separate search buttons. 2020-12-25 00:40:35 +01:00
Jonathan G Rennison
8ac436f507 Add setting to scale primary industry cargo production 2020-12-21 20:47:44 +00:00
Pavel Stupnikov
c9fd85528a Add: new economy "frozen" that stops production changes and industry closures (#8282) 2020-12-14 23:35:07 +01:00
Jonathan G Rennison
9efeb3551a Tunnel/bridge signal simulation spacing is now a company setting 2020-11-21 17:43:55 +00:00
Jonathan G Rennison
cde5e8c79d Add setting to disable continuously updating NewGRF vehicle image 2020-11-08 11:59:29 +00:00
Jonathan G Rennison
ca726d79f5 Add company setting for whether to add vehicle to group on copy-clone 2020-10-12 18:11:14 +01:00
Jonathan G Rennison
84dd35b685 Add drive-through train depot emulation (default off) 2020-09-26 18:08:26 +01:00
Jonathan G Rennison
2ea3a7d6f4 Add setting for default road/tram types, to match default rail type setting 2020-09-18 23:32:47 +01:00
Jonathan G Rennison
f44d75eaf5 Allow building objects by area (1x1 objects only) 
Add setting (default on)
 2020-09-14 23:19:45 +01:00
Jonathan G Rennison
2d350d26db Add rate limit for object construction 2020-09-14 23:06:49 +01:00
Jonathan G Rennison
cc6be16422 Add news setting for trains waiting due to routing restrictions 2020-08-29 13:31:52 +01:00
Jonathan G Rennison
8bf41a6f1d Add setting to show unlisted console commands 2020-08-15 00:37:46 +01:00
Jonathan G Rennison
f26143f063 Add setting for alternative linkgraph overlay colour schemes 2020-08-03 23:30:05 +01:00
Jonathan G Rennison
ce6cdc551f Add anywhere mode to ignore house zone scenario editor setting 
See: #177
 2020-08-03 19:37:50 +01:00
Jonathan G Rennison
157beb05ed Add settings to ignore date/zone/GRF when placing houses in scenario editor 
See: #177
 2020-08-03 19:02:11 +01:00
Jonathan G Rennison
b7118b60fe Add setting to enable multiple churches/stadiums in scenario editor 
See: #177
 2020-08-03 16:39:03 +01:00
Jonathan G Rennison
3dfbeb07f6 Settings: Add scenario editor section 2020-08-03 18:32:27 +01:00
Jonathan G Rennison
d5ada6a14b Add setting to control RV re-routing on road layout change 
Default to road removal only
This is due to poor performance with many RVs when town growth is
continually adding to the road layout
 2020-07-02 17:47:26 +01:00
Jonathan G Rennison
38d42795c8 Add setting to disable vehicle expiry after a given year 2020-07-01 20:36:40 +01:00
Jonathan G Rennison
f5e9805b10 Store time display settings both in savegame and client, add setting 2020-06-23 21:05:21 +01:00
Jonathan G Rennison
271fac01a7 Add setting to scale station cargo capacity and rating tolerance by size 2020-06-07 19:50:37 +01:00
Jonathan G Rennison
ab99c16601 Add support for money cheat in multiplayer 
Add a setting for whether this is permitted by multiplayer clients
 2020-04-14 22:04:41 +01:00
Jonathan G Rennison
81a1094cc8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/date.cpp
#	src/economy.cpp
#	src/misc.cpp
#	src/newgrf_house.cpp
 2020-01-29 19:32:06 +00:00
Jonathan G Rennison
7960db35f2 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 2020-01-06 18:45:51 +00:00
stormcone
b524f1ae21 Feature: Show the name of the NewGRF in the build vehicle window. 2020-01-04 18:42:35 +01:00
Niels Martin Hansen
2fd871e2af Feature: Configurable game ending year 
Functionally reverts 683b65ee1
 2019-12-28 12:27:39 +01:00
Jonathan G Rennison
fd25596311 Merge upstream PR #7852 into jgrpp 
Feature: Show the name of the NewGRF in the build vehicle window

Author: stormcone

# Conflicts:
#	src/lang/english.txt
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/settings.ini
 2019-12-13 17:28:48 +00:00
Jonathan G Rennison
030e8bf762 Rename programmable signals to programmable pre-signals 
This is to make it less unclear what they actually are and do
 2019-12-05 18:13:35 +00:00
stormcone
4def6cf70f Feature: Show the name of the NewGRF in the build vehicle window. 2019-12-02 21:28:29 +01:00
Jonathan G Rennison
2b0c1a5930 Separate allow stations under bridges into settings for: rail, road, docks 2019-11-19 22:51:45 +00:00
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
 2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
ca3c72438e Merge branch 'master' into jgrpp 
# Conflicts:
#	Makefile.bundle.in
#	src/os/macosx/string_osx.cpp
#	src/station_cmd.cpp
 2019-11-06 17:49:00 +00:00
Jack Baron
7c9dedb94f Feature: Configure minimum share trading years 2019-10-19 20:31:44 +01:00