Jonathan G Rennison
|
aaeba6887c
|
Revert "Cleanup: use std::optional instead of custom implementation."
This reverts commit 484ea62a62.
|
2021-02-16 16:06:30 +00:00 |
|
Jonathan G Rennison
|
6c3e5642f8
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
|
2021-01-31 01:08:35 +00:00 |
|
Jonathan G Rennison
|
43980639de
|
Merge branch 'master' into jgrpp
# Conflicts:
# .gitignore
# CMakeLists.txt
# src/3rdparty/optional/optional.hpp
# src/group_cmd.cpp
# src/industry_cmd.cpp
# src/misc_gui.cpp
# src/video/sdl2_v.cpp
|
2021-01-29 17:45:15 +00:00 |
|
Michael Lutz
|
358056ec42
|
Codechange: Keep filenames of loaded Fio files in std::strings.
|
2020-12-27 13:19:25 +01:00 |
|
Michael Lutz
|
dd138fc460
|
Codechange: Stringify config file paths.
|
2020-12-27 13:19:25 +01:00 |
|
frosch
|
484ea62a62
|
Cleanup: use std::optional instead of custom implementation.
|
2020-12-14 23:50:50 +01:00 |
|
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
|
715aa67a9c
|
Codechange: Use std::string in INI file parsing.
|
2020-05-21 20:02:34 +02:00 |
|
Jonathan G Rennison
|
e67669d6ed
|
Add missing include to ini_type.h
|
2020-05-13 11:10:16 +01:00 |
|
Jonathan G Rennison
|
eef6ad7b2a
|
Crash log: Save config file in new crash save chunk
|
2020-04-21 18:17:13 +01:00 |
|
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
2019-11-10 17:59:20 +00:00 |
|
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-10 23:22:20 +02:00 |
|
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
2018-10-31 12:35:54 +01:00 |
|
rubidium
|
8960939b22
|
(svn r26499) -Codechange: replace strndup with stredup
|
2014-04-24 18:37:39 +00:00 |
|
rubidium
|
05300a00b1
|
(svn r22824) -Codechange: pass sub directory to ini loading
|
2011-08-24 13:38:26 +00:00 |
|
alberth
|
fa9c193539
|
(svn r22170) -Add: Add IGT_SEQUENCE type for loading ini group lines without further interpretation.
|
2011-03-03 20:56:33 +00:00 |
|
alberth
|
6a88af662b
|
(svn r22169) -Add: Add parameter to disable automatic group creation in IniLoadFile::GetGroup().
|
2011-03-03 20:55:06 +00:00 |
|
alberth
|
722296e797
|
(svn r22168) -Codechange: Move ini file IO and file error reporting to virtual functions.
|
2011-03-03 20:53:09 +00:00 |
|
alberth
|
d19a9f5df5
|
(svn r22167) -Codechange: Extract IniLoadFile base class for loading ini files out of IniFile.
|
2011-03-03 20:50:24 +00:00 |
|
rubidium
|
7efd7e19ed
|
(svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m].
|
2011-01-18 22:31:06 +00:00 |
|
smatz
|
114d48e492
|
(svn r17596) -Codechange: constify some tables
|
2009-09-20 23:11:01 +00:00 |
|
rubidium
|
7fbc33dae1
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
2009-08-21 20:21:05 +00:00 |
|
peter1138
|
7d70f0cd14
|
(svn r15085) -Fix (r14164): Clearing a settings group did not delete old items nor reset the last_item pointer, causing lists to not be saved unless they started blank.
|
2009-01-14 20:23:45 +00:00 |
|
rubidium
|
621a9b647a
|
(svn r14167) -Fix: items in some ini-groups got duplicated on save.
|
2008-08-25 15:15:41 +00:00 |
|
rubidium
|
411c65e755
|
(svn r14164) -Codechange: simplify and unify the addition of ini items with value when not loading an ini file.
-Fix: wrong insertion management causing leaks.
|
2008-08-25 06:35:28 +00:00 |
|
smatz
|
0d4e7f9537
|
(svn r14156) -Fix (r14153): missing/wrong comments
|
2008-08-24 17:29:57 +00:00 |
|
rubidium
|
ae32d158cb
|
(svn r14153) -Codechange: split ini file reading/saving from settings.cpp.
|
2008-08-24 13:50:31 +00:00 |
|