Jonathan G Rennison
|
ba79f7b2ba
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/base_station_base.h
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/object_gui.cpp
# src/saveload/settings_sl.cpp
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/settings_internal.h
# src/timer/timer_game_calendar.cpp
|
7 months ago |
Patric Stout
|
8f22066b9a
|
Fix #12147: reset all saved settings to their default before loading a game (#12210)
|
7 months ago |
Jonathan G Rennison
|
75645b8563
|
Allow disabling a setting via guiproc
|
7 months ago |
Jonathan G Rennison
|
86a6f63e2f
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/commit-checker.yml
# .github/workflows/release-linux-legacy.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows-store.yml
# .github/workflows/release-windows.yml
# .github/workflows/upload-cdn.yml
# .github/workflows/upload-gog.yml
# .github/workflows/upload-steam.yml
# src/console_cmds.cpp
# src/core/math_func.hpp
# src/fios.cpp
# src/fios.h
# src/intro_gui.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/settings_type.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/difficulty_settings.ini
# src/table/settings/economy_settings.ini
# src/table/settings/game_settings.ini
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/table/settings/locale_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/multimedia_settings.ini
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/table/settings/news_display_settings.ini
# src/table/settings/old_gameopt_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/table/settings/script_settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
# src/table/settings/world_settings.ini
# src/viewport.cpp
# src/viewport_func.h
# src/window.cpp
|
8 months ago |
frosch
|
17dfc1a49a
|
Codechange: Replace SF_GUI_NEGATIVE_IS_SPECIAL with a settings value callback.
|
8 months ago |
frosch
|
9e9a8ca7f6
|
Codechange: Add callbacks to IntSettingDesc to support dynamic strings for title, help and values.
|
8 months ago |
frosch
|
022b9e92d2
|
Codechange: Move settings string formatting into IntSettingDesc members.
|
8 months ago |
Jonathan G Rennison
|
b01fd1607a
|
Re-order various structs to reduce holes/padding
|
8 months ago |
Patric Stout
|
fd073a2810
|
Remove: replace custom span with std::span
|
9 months ago |
Jonathan G Rennison
|
53d29852e4
|
Add SettingOnGuiCtrlType mode for setting value dparam overrides
|
9 months ago |
Jonathan G Rennison
|
a0861347db
|
Settings: Move advise default flag/functionality to guiproc
|
9 months ago |
Jonathan G Rennison
|
2ec4b2a8ca
|
Return end of string pointer in SettingDesc formatters
|
9 months ago |
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
9 months ago |
Jonathan G Rennison
|
a573d065e1
|
Add missing IsDefaultValue to SettingDesc, from upstream
|
9 months ago |
Jonathan G Rennison
|
6e671ed6e2
|
Split save/load settings into separate INI files
Matching upstream for all settings
|
10 months ago |
Jonathan G Rennison
|
ccfdf626ad
|
Replace SF_ENABLE_TABLE_PATS flag and SC_PATCH with SF_PATCH
|
10 months ago |
Jonathan G Rennison
|
581ed5b98f
|
Use compatibility table for loading non-table OPTS, PATS chunks
|
11 months ago |
Jonathan G Rennison
|
3e299aa488
|
Use upstream table chunk format for PATS
|
11 months ago |
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
|
11 months ago |
Peter Nelson
|
ab535c0a86
|
Codechange: Add base() method to StrongType to allow access to the base type without casting. (#11445)
This removes the ability to explicitly cast to the base type, but the requirement
to use .base() means the conversion is still explicit.
|
11 months ago |
Jonathan G Rennison
|
cd091e04f5
|
Add settings filter to only show non-vanilla settings
|
12 months ago |
frosch
|
b6c8f301be
|
Codechange: Silence warnings about intentionally unused parameters.
|
1 year ago |
Patric Stout
|
37e2f99c09
|
Change: store crash logs in JSON format (#11232)
|
1 year ago |
Jonathan G Rennison
|
547c00b465
|
Settings: Only write out config on setting change for persistent changes
|
1 year ago |
Patric Stout
|
299570b2c1
|
Codechange: make TimerGameCalendar Date and Year types strongly typed (#10761)
|
1 year ago |
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
|
1 year ago |
Patric Stout
|
ece50d5a1d
|
Codechange: use BoolSettingDesc to parse settings in conversion code
|
1 year ago |
Jonathan G Rennison
|
d75c489466
|
Add various missing includes
|
1 year ago |
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
|
1 year ago |
Jonathan G Rennison
|
ac2f9a21e8
|
Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
Leave afterload in src/saveload/
|
1 year ago |
Rubidium
|
f4b0ac2bd4
|
Codechange: use std::string for formatting settings
|
1 year ago |
Jonathan G Rennison
|
9a4512f789
|
Remove linkgraph duration not day length scaled setting
Now always enabled
|
1 year ago |
Patric Stout
|
199e41c762
|
Codechange: use default dtor instead of empty (#10826)
|
1 year ago |
Jonathan G Rennison
|
e862a67d2b
|
Add console command to list settings and show current and default values
|
1 year ago |
Jonathan G Rennison
|
ff0e779680
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/lang/czech.txt
# src/order_backup.h
# src/settings_internal.h
# src/string.cpp
# src/viewport.cpp
|
2 years ago |
Rubidium
|
ed7685910d
|
Codechange: pass large objects by reference instead of value
Especially when they get passed on directly to the next function or via a
constructor into an instance variable
|
2 years ago |
Jonathan G Rennison
|
85fc077637
|
Add setting flag to enable upstream mode load when patx_name set
|
2 years ago |
Jonathan G Rennison
|
b9e322ec7a
|
Add mechanism to override setting names used in config file
|
2 years ago |
Jonathan G Rennison
|
cf6f509859
|
Add setting flag to enable bool -> int config file load conversion
|
2 years ago |
Jonathan G Rennison
|
730b84e262
|
Fix load check of a savegame with realistic braking enabled triggering signal checks on current game
|
2 years ago |
Jonathan G Rennison
|
e5c99b3601
|
Settings GUI: Add flag to mark a setting as should be left at default
|
3 years ago |
Jonathan G Rennison
|
a64a6aeeb8
|
Fix text input of velocity setting values
See: #357
|
3 years ago |
Jonathan G Rennison
|
87f0c20bc0
|
Add setting flag to run string setting change callbacks on config load
|
3 years ago |
Jonathan G Rennison
|
d1f1a6942a
|
Add support for loading trunk savegames versions 293 - 299 (12.0)
Use modified upstream saveload implementation for these versions
Re-arrange headers to support multiple saveload implementations
|
3 years ago |
Jonathan G Rennison
|
81290df946
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/lang/spanish.txt
# src/network/core/tcp_content_type.h
# src/network/network_content.cpp
# src/saveload/cheat_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_internal.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/gameopt_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
|
3 years ago |
Jonathan G Rennison
|
ffef1c9e44
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/saveload/cargopacket_sl.cpp
# src/saveload/cheat_sl.cpp
# src/saveload/company_sl.cpp
# src/saveload/engine_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/stdafx.h
# src/table/settings/settings.ini
# src/town_cmd.cpp
# src/vehicle.cpp
|
3 years ago |
Jonathan G Rennison
|
544da99102
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/cargopacket.h
# src/lang/korean.txt
# src/linkgraph/linkgraph.h
# src/linkgraph/linkgraphjob.h
# src/linkgraph/linkgraphschedule.h
# src/network/network_admin.h
# src/network/network_func.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/order_base.h
# src/rail_cmd.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/economy_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/newgrf_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/signs_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/subsidy_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/script/api/script_object.cpp
# src/settings.cpp
# src/string.cpp
# src/string_func.h
# src/table/CMakeLists.txt
# src/table/settings/settings.ini
# src/viewport_sprite_sorter_sse4.cpp
|
3 years ago |
Jonathan G Rennison
|
406b81abb1
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/economy.cpp
# src/lang/traditional_chinese.txt
# src/order_gui.cpp
# src/settings.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 |
Jonathan G Rennison
|
784fcbd1e7
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
|
3 years ago |
Jonathan G Rennison
|
781aaa4fe5
|
Merge branch 'master' 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 |