dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,175 Commits 1 Branch 0 Tags
581ed5b98f9c627b793821c3816efaa6255ce8fc
Commit Graph

216 Commits

Author SHA1 Message Date
Jonathan G Rennison
581ed5b98f Use compatibility table for loading non-table OPTS, PATS chunks 2023-11-18 12:22:06 +00:00
Jonathan G Rennison
3e299aa488 Use upstream table chunk format for PATS 2023-11-18 00:01:46 +00:00
Jonathan G Rennison
4187b8cc62 Rename gameopt_settings to old_gameopt_settings 
To match upstream
 2023-11-17 19:53:24 +00:00
Jonathan G Rennison
b280dfb965 Split GUI settings into separate INI files 
Matching upstream for non-save settings
 2023-11-14 18:08:15 +00:00
Jonathan G Rennison
d4f39ea6c2 Remove "Show order management button" setting 
Now always enabled
 2023-11-14 00:18:47 +00:00
Jonathan G Rennison
86fff56c14 Add setting for whether to hide default stop location 2023-11-13 19:21:57 +00:00
Jonathan G Rennison
fc1c47cbd2 Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/crashlog.h
#	src/date_type.h
#	src/depot_type.h
#	src/landscape.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/script/api/script_infrastructure.cpp
#	src/stdafx.h
#	src/table/settings/gui_settings.ini
#	src/table/settings/pathfinding_settings.ini
#	src/tests/CMakeLists.txt
 2023-11-13 19:08:22 +00:00
Jonathan G Rennison
cb9e088399 Add setting to control autosave interval mode 2023-11-13 18:45:18 +00:00
Jonathan G Rennison
ec6cdce0c3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/bridge_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/table/settings/gui_settings.ini
 2023-11-12 14:15:19 +00:00
Jonathan G Rennison
4bfa8b7b7b Merge branch 'master' into jgrpp 
# Conflicts:
#	src/openttd.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/settings/gameopt_settings.ini
#	src/table/settings/gui_settings.ini
 2023-11-12 13:43:40 +00:00
Jonathan G Rennison
3436e0a781 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/error.h
#	src/error_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/misc_gui.cpp
#	src/newgrf_gui.cpp
#	src/news_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/gamelog_sl.cpp
#	src/script/api/script_text.cpp
#	src/script/script_instance.cpp
#	src/statusbar_gui.cpp
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
#	src/table/settings/gui_settings.ini
#	src/table/settings/linkgraph_settings.ini
#	src/textbuf_gui.h
 2023-11-09 01:55:23 +00:00
Jonathan G Rennison
cd091e04f5 Add settings filter to only show non-vanilla settings 2023-10-04 18:20:25 +01:00
Jonathan G Rennison
8a0fab1d4c Add setting for whether water floods from map edges 2023-09-28 17:11:02 +01:00
Jonathan G Rennison
ad3980e596 Add setting for whether non-leading train engines keep custom names 2023-09-23 12:19:52 +01:00
Jonathan G Rennison
a18f3274b4 Rename close window functions to match upstream 2023-09-15 21:17:25 +01:00
Jonathan G Rennison
c0598d34bf Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console.cpp
#	src/os/os2/os2.cpp
#	src/os/unix/font_unix.cpp
#	src/strgen/strgen.h
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
 2023-09-02 20:48:58 +01:00
Jonathan G Rennison
547c00b465 Settings: Only write out config on setting change for persistent changes 2023-08-24 17:27:47 +01:00
Jonathan G Rennison
b0538a00e0 Add setting for whether to allow converting town road to non-house types 
See: 51e22617
 2023-08-20 17:53:08 +01:00
Loïc Guilloux
8c9ecde964 Change: Remove autosave from settings window (#11218) 
It is broken since 4f4810d and it's also in game options.
 2023-08-20 14:33:02 +00:00
Jonathan G Rennison
8a14d8c246 Add setting to also limit acceleration when using realistic braking 2023-08-09 00:16:28 +01:00
Tyler Trahan
748ff13a6d Change: Enable "Forbid 90 degree turns" setting by default 
(cherry picked from commit 4decd2aa48)
 2023-07-31 18:22:58 +01:00
Tyler Trahan
9876c861e4 Remove: Unused ship pathfinder invalidation setting callback 2023-07-30 18:21:13 -04:00
Tyler Trahan
4decd2aa48 Change: Enable "Forbid 90 degree turns" setting by default 2023-07-30 18:21:13 -04:00
Daniel Hill
924b2ab9ec Add an optional "(City)" in Viewport labels 2023-07-30 22:06:51 +01:00
Tyler Trahan
f57296a033 Change: Only show platform stopping location in orders when other than default (#11102) 2023-07-29 17:59:02 -04:00
Henry Wilson
a9c65a69d0 Feature: Add config option to set default company secondary colour for new games 
This does duplicate translation strings for the colours
 2023-07-26 16:22:30 +02:00
MasonGulu
0be27778af Add: alternative setting for right-click close window option to exclude pinned windows (#10204) 2023-07-19 23:24:22 +02:00
Rubidium
eaae0bb5e7 Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
 2023-07-19 19:30:14 +02:00
Patric Stout
4f4810dc28 Fix: store autosave settings under the new names 2023-07-19 13:17:50 +02:00
Jonathan G Rennison
11bf8e22d7 Add setting to show order number in vehicle view window 2023-07-17 19:02:01 +01:00
Rubidium
a184e7f793 Fix #11137: assertion failure due to interpreting string as number 2023-07-15 06:33:12 +02:00
Jonathan G Rennison
c6c69fa3da Add setting for long-term autosaves 
A second set of autosaves for whenever the main set wraps around to 0
 2023-07-09 10:02:57 +01:00
RoqueDeicide
c57bfa479a [Feature] Added waypoint viewport tooltips. 2023-07-06 14:53:09 +04:00
Jonathan G Rennison
3e03cebad1 Simplify industry_tooltip_show_stockpiled setting 
See: #564
 2023-07-04 23:50:53 +01:00
RoqueDeicide
84e5aba1d7 [Change] Reworked stockpile settings into 1 dropdown. 2023-07-04 11:11:59 +04:00
RoqueDeicide
733f53dc9a Merge branch 'tooltip_extension' into jgrpp 2023-07-03 19:59:29 +04:00
Jonathan G Rennison
ead18b2af2 Merge branch 'master' into jgrpp 
# Conflicts:
#	CMakeLists.txt
#	src/3rdparty/md5/md5.h
#	src/3rdparty/squirrel/squirrel/squtils.h
#	src/animated_tile.cpp
#	src/console_func.h
#	src/core/CMakeLists.txt
#	src/core/container_func.hpp
#	src/core/smallstack_type.hpp
#	src/crashlog.cpp
#	src/crashlog.h
#	src/debug.h
#	src/economy.cpp
#	src/gamelog.cpp
#	src/industry_gui.cpp
#	src/lang/catalan.txt
#	src/misc_gui.cpp
#	src/network/network_content.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/newgrf_gui.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_cmd.cpp
#	src/saveload/animated_tile_sl.cpp
#	src/script/api/script_tilelist.cpp
#	src/settings.cpp
#	src/settingsgen/settingsgen.cpp
#	src/sl/oldloader_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/viewport_sprite_sorter.h
 2023-07-02 12:02:36 +01:00
RoqueDeicide
5af7be6d17 [Feature] Added station viewport tooltips. 2023-07-01 22:59:00 +04:00
RoqueDeicide
1071235aee [Feature] Added depot viewport tooltips. 2023-07-01 22:58:24 +04:00
Jonathan G Rennison
8fea927ed1 Add setting for whether to shade height in viewport map mode 
See: #550
 2023-07-01 12:03:36 +01:00
Jonathan G Rennison
99b883298e Add help text for the various viewport map settings 2023-07-01 11:22:18 +01:00
Jonathan G Rennison
05be624294 Remove gui.viewport_map_scan_surroundings setting, now always enabled 2023-07-01 11:00:59 +01:00
Jonathan G Rennison
d09b504bc5 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-source.yml
#	.github/workflows/release.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/ai/ai_core.cpp
#	src/ai/ai_gui.cpp
#	src/bridge_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/CMakeLists.txt
#	src/core/smallmap_type.hpp
#	src/disaster_vehicle.h
#	src/effectvehicle_base.h
#	src/fontcache.cpp
#	src/game/game_core.cpp
#	src/game/game_gui.cpp
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/group_gui.cpp
#	src/linkgraph/linkgraph.h
#	src/misc.cpp
#	src/network/core/config.h
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_profiling.cpp
#	src/newgrf_profiling.h
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/openttd.h
#	src/order_gui.cpp
#	src/os/windows/font_win32.cpp
#	src/rail_gui.cpp
#	src/road.cpp
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_controller.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/script/script_config.cpp
#	src/script/script_config.hpp
#	src/script/script_instance.cpp
#	src/script/script_scanner.cpp
#	src/script/squirrel.cpp
#	src/script/squirrel_helper.hpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings/network_private_settings.ini
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/window_gui.h
 2023-07-01 02:42:51 +01:00
RoqueDeicide
33ee78f9ac [Feature] Extended functionality of industry viewport tooltips. 
Added ability to turn them off or to show any combination of the following: name, required, stockpiled or produced cargoes.
 2023-06-30 15:55:12 +04:00
RoqueDeicide
8eea01717f [Feature] A setting to allow town name tile tooltips to always or never be displayed. 2023-06-28 16:11:51 +04:00
RoqueDeicide
d6041744ca [Change] Moved tooltip-related settings to a dedicated category. 2023-06-28 15:14:29 +04:00
Jonathan G Rennison
55c07eed59 Change: Add separate setting for server sent commands per frame limit (#11023) 
Set a higher default value for this setting.
Use the higher of this and existing commands per frame limit
setting for server-originating commands, e.g. GS.

This is to support the GSAsyncMode class.
This also avoids undue throttling when more than one
script is in operation (e.g. AIs).
 2023-06-27 12:32:45 +01:00
Jonathan G Rennison
9a5df29648 Adjustments for PR #556 
Setting text/condition, tooltip condition
 2023-06-25 00:04:11 +01:00
RoqueDeicide
829db8e4f9 Feature: A setting to bring back old tile tooltip behavior. 
If enabled, the setting allows tooltips for tiles, such as industries, to show instantly, when otherwise they would require a right-click.
 2023-06-25 00:11:01 +04:00
Jonathan G Rennison
d6787c4731 Fix f9f1cb21: Setting saveload type 
See: #548
 2023-06-14 22:29:12 +01:00