dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,723 Commits 1 Branch 0 Tags
65d5d13a08fc40ddb14bd99c5f7f672f7fae2b16
Commit Graph

90 Commits

Author SHA1 Message Date
Jonathan G Rennison
f8d6e781ba Merge branch 'master' into jgrpp 
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
 2020-05-21 22:24:01 +01:00
Michael Lutz
a49fdb7ebb Codechange: Store base set related texts in std::strings. 2020-05-21 20:02:34 +02:00
Jonathan G Rennison
8176da3f62 Saveload: Add value conversion support to settings xref 2020-01-03 18:53:09 +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
36eb4165b8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h
 2019-07-08 16:19:07 +01:00
Jonathan G Rennison
79e49cf4a9 Setting: Add setting flag: no new game (in game use only) 2019-05-01 20:57:59 +01:00
Jonathan G Rennison
8b1ee39ace Setting: Add support for enum type settings 2019-05-01 19:03:00 +01:00
Charles Pigott
644f4c3547 Codechange: Set size of SettingGuiFlag & SettingDescType enums, and use them properly 2019-04-29 17:40:22 +01:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +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
6fcb156989 Add generic mechanism to cross-ref settings at load time. 
This is useful for loading settings from legacy/special versions,
where the corresponding setting is somewhere else and/or a PATX setting,
with duplicating all the info.

(cherry picked from commit b5c453b21e)
 2017-08-20 01:44:10 +01:00
Jonathan G Rennison
842728bd17 Settings GUI: Add support for DECIMAL1 settings. 2016-11-25 23:14:11 +00:00
Jonathan G Rennison
b5c453b21e Add generic mechanism to cross-ref settings at load time. 
This is useful for loading settings from legacy/special versions,
where the corresponding setting is somewhere else and/or a PATX setting,
with duplicating all the info.
Use this to load SpringPP settings which have a corresponding setting.
 2015-08-17 20:11:30 +01:00
Jonathan G Rennison
c57ffc64bc Settings update: add PATX chunk to store additional settings 
in an unordered format which is tolerant of extra, missing or reordered
settings.
 2015-08-01 12:58:53 +01:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
planetmaker
c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
frosch
2670b05fb5 (svn r24862) -Add: Settings type filter to adv. settings GUI. 2012-12-26 17:47:02 +00:00
frosch
c4c3d00578 (svn r24862) -Add: Settings type filter to adv. settings GUI. 2012-12-26 17:47:02 +00:00
frosch
af74f3bb2d (svn r24860) -Codechange: Add SettingDesc::GetType(). 2012-12-26 17:43:35 +00:00
frosch
0efd29b71b (svn r24860) -Codechange: Add SettingDesc::GetType(). 2012-12-26 17:43:35 +00:00
frosch
6516c85c82 (svn r24787) -Fix: Unify checks for editability of settings. 2012-12-05 19:35:09 +00:00
frosch
22dc45738d (svn r24787) -Fix: Unify checks for editability of settings. 2012-12-05 19:35:09 +00:00
frosch
b4c70a51da (svn r24671) -Feature [FS#5355]: Add basic/advanced/expert filters to adv. settings GUI. (Eagle_rainbow) 2012-11-08 10:04:00 +00:00
frosch
69a62452be (svn r24671) -Feature [FS#5355]: Add basic/advanced/expert filters to adv. settings GUI. (Eagle_rainbow) 2012-11-08 10:04:00 +00:00
alberth
cc6b16a4c1 (svn r24234) -Add: Add help-string infrastructure to the ini files 2012-05-12 10:09:00 +00:00
alberth
1d58838a97 (svn r24234) -Add: Add help-string infrastructure to the ini files 2012-05-12 10:09:00 +00:00
alberth
ce210ac66d (svn r24233) -Codechange: Rename 'val_str' to 'str_val' to better match with 'strval' in the ini files. 2012-05-12 10:07:18 +00:00
alberth
34a11d4b8d (svn r24233) -Codechange: Rename 'val_str' to 'str_val' to better match with 'strval' in the ini files. 2012-05-12 10:07:18 +00:00
alberth
f6ccaa01c0 (svn r24210) -Feature: Split the renew-months setting text in two string values (one before life time and one after). 2012-05-06 15:03:45 +00:00
alberth
88224d001d (svn r24210) -Feature: Split the renew-months setting text in two string values (one before life time and one after). 2012-05-06 15:03:45 +00:00
alberth
0c80091daa (svn r24209) -Cleanup: Remove now unused SGF_NOCOMMA value. 2012-05-06 15:00:13 +00:00
alberth
8c585e5ad6 (svn r24209) -Cleanup: Remove now unused SGF_NOCOMMA value. 2012-05-06 15:00:13 +00:00
rubidium
0cfe86cead (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 2012-01-03 20:26:05 +00:00
rubidium
e40eb8177a (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 2012-01-03 20:26:05 +00:00
frosch
c1b1513815 (svn r22626) -Fix [FS#4622]: Also initialise _old_vds with newgame settings; TTD savegames do not contain these settings. 2011-07-03 10:59:25 +00:00
frosch
d29def43b0 (svn r22626) -Fix [FS#4622]: Also initialise _old_vds with newgame settings; TTD savegames do not contain these settings. 2011-07-03 10:59:25 +00:00
frosch
ea311e7904 (svn r22522) -Fix (r22489): (size_t)(uint32)(-1) != (size_t)-1 2011-05-29 18:35:31 +00:00
frosch
615e435677 (svn r22522) -Fix (r22489): (size_t)(uint32)(-1) != (size_t)-1 2011-05-29 18:35:31 +00:00
alberth
a7e7e76f7f (svn r22210) -Add: Add a variable for the value strings in the settings tables. 2011-03-06 15:51:44 +00:00
alberth
9fe65f93fe (svn r22210) -Add: Add a variable for the value strings in the settings tables. 2011-03-06 15:51:44 +00:00
alberth
0b0127b13d (svn r21593) -Codechange: endif comment correcttions. 2010-12-22 10:50:32 +00:00
alberth
f65a9a5515 (svn r21593) -Codechange: endif comment correcttions. 2010-12-22 10:50:32 +00:00
alberth
f2a59e197c (svn r21467) -Doc: Add a few doxygen comments to config file settings code. 2010-12-11 15:14:28 +00:00
alberth
997551c599 (svn r21467) -Doc: Add a few doxygen comments to config file settings code. 2010-12-11 15:14:28 +00:00
frosch
c18839704b (svn r20286) -Codechange: Unify end of doxygen comments. 2010-08-01 19:44:49 +00:00
frosch
4bd32799f1 (svn r20286) -Codechange: Unify end of doxygen comments. 2010-08-01 19:44:49 +00:00
frosch
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
frosch
ed4f806f1d (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00