4042480806
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/company_settings.ini
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/table/win32_settings.ini
# src/table/window_settings.ini
3 years ago
65c20edde7
Settings: Merge orderproc into guiproc
3 years ago
47156122fa
Settings: Add a guiproc callback for general settings GUI operations
3 years ago
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
3 years ago
da1ac73c02
Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta
...
# Conflicts:
# src/lang/estonian.txt
# src/lang/hungarian.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/packet.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/string_func.h
3 years ago
afd66c1631
Show linear scaling value in settings window for cargo scaling settings
3 years ago
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.
3 years ago
e76c5dfda7
Revert "Temporarily mark dual pane train purchase window as experimental"
...
This reverts commit f9bb004b05
3 years ago
f9bb004b05
Temporarily mark dual pane train purchase window as experimental
...
See: #287 , #296 , #297
3 years ago
158608442c
Merge pull request #281 from VacuumBreather/train_speed_adaptation
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
3 years ago
5e418128da
Add setting for whether to use dual pane train purchase window
3 years ago
3bba9ef37a
Fix setting name
3 years ago
debc504e59
Add a setting for train speed adaptation
...
Prior to this change, without realistic breaking, trains would continuously run into the train in front of them. This makes them adjust their speed based on trains in front of them
3 years ago
ac9749d015
Merge PR #283 (max city height) into jgrpp
3 years ago
a17efcd7d5
Introduce setting for a max height level for towns
...
Prior to this change, the game tended to place towns on mountain tops. Realistic heightmaps had limitations because of this.
This change allows the player to specify that the towns should be generated in the valleys.
3 years ago
150e502cf9
Add generation of public roads linking towns
3 years ago
d718ba62ef
Add option to sort tracks by category and speed ( #282 )
3 years ago
ec40677fdc
Add a setting to turn off road vehicle slowdown in curves
...
Prior to this change, road vehicles would always slowdown in curves. This forces the player to build grid like roads. With new height levels and more mountainous maps and in the absense of diagonal roads this causes unnecessary pain. It should be an option to turn this off, so mountainous maps and curvy roads are not punishing the player unnecessarily. Nobody wants to build grid like roads outside of towns.
3 years ago
7555da1642
Move subsettings always to the top of parent setting ( #279 )
3 years ago
0b80461cd4
Merge branch 'pr-270' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/settings_type.h
# src/table/settings.ini
3 years ago
696fb746b7
Add setting for demolition confirmation mode
3 years ago
1cc8053003
Add setting to control station rating tooltip detail level
...
Default to simple
3 years ago
704eac8220
Fix changing font zoom level not updating font height cache
3 years ago
6936fe4f6e
Settings GUI: Move day length factor to environment section
3 years ago
a7d8c6fe0c
Add PF setting for whether to pathfind up to back of one-way PBS
3 years ago
8ffb4122df
Codechange: just pass the SettingDesc to SetSettingValue and remove distinction between (non)company
3 years ago
3e8ee4f49f
Remove "Disable vehicle image update" setting
3 years ago
65cbde4b30
Codechange: move currency settings to std::string
3 years ago
ad554d913f
Codechange: Set specific widgets dirty instead of window.
...
(cherry picked from commit 8321ef0061
3 years ago
8321ef0061
Codechange: Set specific widgets dirty instead of window.
3 years ago
6bca9e090d
Codechange: add SetDParamStr that accepts std::string&
3 years ago
2b233a2a8c
Codechange: No longer necessary to manually resize volume sliders.
...
(cherry picked from commit d32df00b5c
3 years ago
a469b4f395
Fix: Recalculate padding and minimum sizes when GUI or Font zoom is changed.
...
(cherry picked from commit 4791ff2862
3 years ago
a9515456cb
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/core/os_abstraction.h
# src/network/core/tcp_content.h
# src/network/core/udp.cpp
# src/table/currency_settings.ini
# src/table/settings.h.preamble
3 years ago
d32df00b5c
Codechange: No longer necessary to manually resize volume sliders.
3 years ago
4791ff2862
Fix: Recalculate padding and minimum sizes when GUI or Font zoom is changed.
3 years ago
b54d8a49fb
Feature: allow non-ASCII currency separators
3 years ago
253772e9af
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# COMPILING.md
# src/console.cpp
# src/console_cmds.cpp
# src/console_internal.h
# src/rev.cpp.in
3 years ago
37222c3fa2
Change: treat languages as finished, if translations are 75% completed.
...
Unfinished translations are not auto-picked from the locale.
In release builds, unfinished translations are not offered in the GUI.
Unfinished translations are available in non-release builds, or by editing openttd.cfg.
3 years ago
a9740cef82
Add: show completion progress of languages in the language dropdown for non-release builds.
3 years ago
d1d27c0748
Adds additional zone configuration for cities, renames existing zone configuration to towns.
3 years ago
272e583478
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/korean.txt
# src/settings.cpp
3 years ago
d50b934bb4
Change: reworked how the Game Option display options are drawn
...
"Hardware acceleration" was not aligned with its checkbox. So instead
of drawing the labels left and the options right, now draw settings
one by one with a spacer between label and option to get the right
spacing.
Also, use SetPIP instead of repeating a SetPadding for all but
last element.
3 years ago
f0f2073006
Feature: allow a toggle to enable/disable vsync
...
Vsync should be off by default, as for most players it will be
better to play without vsync. Exception exist, mainly people who
play in fullscreen mode.
3 years ago
227041008f
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/lang/russian.txt
# src/misc_gui.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/font_win32.cpp
# src/os/windows/win32.cpp
# src/rail_cmd.cpp
# src/window_gui.h
3 years ago
edfa04286b
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release.yml
# bin/CMakeLists.txt
# src/dock_gui.cpp
# src/lang/brazilian_portuguese.txt
# src/lang/catalan.txt
# src/lang/czech.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/german.txt
# src/lang/hungarian.txt
# src/lang/indonesian.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.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/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/ukrainian.txt
# src/lang/vietnamese.txt
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/object_gui.cpp
# src/pathfinder/yapf/yapf_costrail.hpp
# src/pathfinder/yapf/yapf_node_rail.hpp
# src/rail_cmd.cpp
# src/roadveh_cmd.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/water_cmd.cpp
3 years ago
34e9c22c3d
Hide unused climate threshold settings depending on climate threshold mode
3 years ago
40203b090f
Settings window: Add mechanism for conditionally hidden settings
3 years ago
f39b6f4ba3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/genworld_gui.cpp
# src/landscape.cpp
# src/lang/english.txt
# src/saveload/afterload.cpp
# src/screenshot.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/table/settings.ini
# src/tile_type.h
# src/widgets/genworld_widget.h
3 years ago
785e42a6f9
Feature: Volume sliders in Game Options window
3 years ago
Jonathan G Rennison
Andreas Schmitt
rubidium42
Peter Nelson
frosch
reldred
Patric Stout
Niels Martin Hansen