Jonathan G Rennison
|
b7ddd486cf
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
|
3 years ago |
|
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
|
3 years ago |
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
4 years ago |
Michael Lutz
|
358056ec42
|
Codechange: Keep filenames of loaded Fio files in std::strings.
|
4 years ago |
|
Michael Lutz
|
dd138fc460
|
Codechange: Stringify config file paths.
|
4 years ago |
|
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
|
4 years ago |
|
Michael Lutz
|
715aa67a9c
|
Codechange: Use std::string in INI file parsing.
|
4 years ago |
|
Jonathan G Rennison
|
eef6ad7b2a
|
Crash log: Save config file in new crash save chunk
|
4 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
rubidium
|
9ed12b0f07
|
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
|
10 years ago |
frosch
|
d71cc434e4
|
(svn r26504) -Fix (r26499): Obiwan and his gang.
|
10 years ago |
|
rubidium
|
8960939b22
|
(svn r26499) -Codechange: replace strndup with stredup
|
10 years ago |
|
rubidium
|
0463dbdc9e
|
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
|
10 years ago |
|
rubidium
|
4b355534c0
|
(svn r26476) -Fix: prevent comparing to NULL when strndup could not allocate memory
|
10 years ago |
|
frosch
|
7247ecf172
|
(svn r26206) -Fix [FS#5829]: Run everything from ini, obg, obs, obs, ... files through str_validate.
|
11 years ago |
|
rubidium
|
d8d2f74559
|
(svn r23741) -Revert (r23740): the few parts that the Windows / non-network compiles stumble on
|
13 years ago |
|
rubidium
|
6d6be50ae0
|
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
|
13 years ago |
|
rubidium
|
05300a00b1
|
(svn r22824) -Codechange: pass sub directory to ini loading
|
13 years ago |
alberth
|
fa9c193539
|
(svn r22170) -Add: Add IGT_SEQUENCE type for loading ini group lines without further interpretation.
|
14 years ago |
|
alberth
|
6a88af662b
|
(svn r22169) -Add: Add parameter to disable automatic group creation in IniLoadFile::GetGroup().
|
14 years ago |
|
alberth
|
722296e797
|
(svn r22168) -Codechange: Move ini file IO and file error reporting to virtual functions.
|
14 years ago |
|
alberth
|
d19a9f5df5
|
(svn r22167) -Codechange: Extract IniLoadFile base class for loading ini files out of IniFile.
|
14 years ago |