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
c972a63c8c
Codechange: Store info about the dedicated server log file in globals with automatic destruction to simplify control flow in openttd_main.
4 years ago
6ada7c3c7f
Logging: Log full file names of opened GRFs
5 years ago
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
5 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
6562937899
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/console_cmds.cpp
# src/script/api/script_order.cpp
# src/station_cmd.cpp
# src/statusbar_gui.cpp
# src/town_gui.cpp
5 years ago
5981ed248a
Codechange: Remove unused FioTarFirstDir and FioTarAddLink functions
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
af7d9020a1
Codechange: Use override specifer for overriding member declarations
...
This is a C++11 feature that allows the compiler to check that a virtual
member declaration overrides a base-class member with the same signature.
Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked
as virtual despite being a template.
5 years ago
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
6 years ago
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
458e441a4c
Codechange: Make FioCreateDirectory public
6 years ago
03b0931c57
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/saveload.cpp
6 years ago
ce51e54d26
Change: [Win32] Parse and load DLS files for the DirectMusic driver without relying on high-level functions.
6 years ago
f89e8b76d6
Fix increased number of NewGRFs support.
...
Improve error handling if multiplayer limit is exceeded.
7 years ago
5c7c2445d8
(svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay
10 years ago
21f991e235
(svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay
10 years ago
c4ab18c029
(svn r25974) -Codechange: make the _personal_dir global const, since once it's set it shouldn't be changed anyhow
11 years ago
def597fe31
(svn r25974) -Codechange: make the _personal_dir global const, since once it's set it shouldn't be changed anyhow
11 years ago
50abcf3edc
(svn r24804) -Add: Separate subdirectory for screenshots.
12 years ago
edd9c0553a
(svn r24804) -Add: Separate subdirectory for screenshots.
12 years ago
1966de1a2a
(svn r24417) -Codechange: [Win32] Don't needlessly include windows.h in a commonly used header.
12 years ago
36181b3fb2
(svn r24417) -Codechange: [Win32] Don't needlessly include windows.h in a commonly used header.
12 years ago
14325e2391
(svn r23605) -Add: GAME_DIR and CONTENT_TYPE_GAME, and read gamescript from that directory
13 years ago
b4f832f29f
(svn r23605) -Add: GAME_DIR and CONTENT_TYPE_GAME, and read gamescript from that directory
13 years ago
3d605f6488
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
13 years ago
df16ebd730
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
13 years ago
ffccec6d84
(svn r23234) -Fix [FS#4840]: crash when after downloading content
13 years ago
a3a2fdcfc2
(svn r23234) -Fix [FS#4840]: crash when after downloading content
13 years ago
4d281cce97
(svn r23217) -Codechange: introduce the concept of scanning only in a limited set of sub directories
13 years ago
6d991b3b10
(svn r23217) -Codechange: introduce the concept of scanning only in a limited set of sub directories
13 years ago
9bf2cb0e86
(svn r23216) -Codechange: introduce the concept of having different tar lists
13 years ago
160294ff22
(svn r23216) -Codechange: introduce the concept of having different tar lists
13 years ago
661e5c6655
(svn r22904) -Codechange: add tar filename to file scanning
13 years ago
414c397000
(svn r22904) -Codechange: add tar filename to file scanning
13 years ago
fb5a2f4485
(svn r22835) -Codechange: keep track of the subdirectory we are looking through in the file scanner
13 years ago
672df52e0c
(svn r22835) -Codechange: keep track of the subdirectory we are looking through in the file scanner
13 years ago
62886dfeed
(svn r22827) -Codechange: pass the/a more proper sub directory when opening (some) files instead of the default one
13 years ago
b4edc30c64
(svn r22827) -Codechange: pass the/a more proper sub directory when opening (some) files instead of the default one
13 years ago
26788cf363
(svn r22825) -Codechange: pass subdir to FioOpenFile
13 years ago
2a12c9df2f
(svn r22825) -Codechange: pass subdir to FioOpenFile
13 years ago
c8167de1c2
(svn r22822) -Codechange: make a distinction between base sets and newgrfs for their directory
13 years ago
0061b5f184
(svn r22822) -Codechange: make a distinction between base sets and newgrfs for their directory
13 years ago
a70556dac2
(svn r22459) -Doc: Typo fixes and doxygen markup improvements.
13 years ago
28092366ec
(svn r22459) -Doc: Typo fixes and doxygen markup improvements.
13 years ago
2b4da1d345
(svn r20689) -Codechange: Make some global functions used in 1 .cpp file static in that file.
14 years ago
9f5a96ead2
(svn r20689) -Codechange: Make some global functions used in 1 .cpp file static in that file.
14 years ago
Jonathan G Rennison
Michael Lutz
S. D. Cloudt
Alberth
Henry Wilson
glx
Niels Martin Hansen
rubidium
frosch
michi_cc
truebrain