dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,936 Commits 1 Branch 0 Tags
cef359193a2162193a62fe387bbb7d094ca046e7
Commit Graph

67 Commits

Author SHA1 Message Date
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
Jonathan G Rennison
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
 2019-03-27 18:12:04 +00:00
Henry Wilson
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.
 2019-03-24 16:10:04 +01:00
Jonathan G Rennison
4f1d54564e Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
 2019-01-02 16:09:44 +00:00
glx
c540d72445 Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32 2018-12-27 18:09:16 +01:00
Jonathan G Rennison
8e9d68048a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/string.cpp
 2018-06-07 06:49:18 +01:00
Niels Martin Hansen
458e441a4c Codechange: Make FioCreateDirectory public 2018-06-05 22:58:35 +02:00
Jonathan G Rennison
03b0931c57 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/debug.cpp
#	src/saveload/saveload.cpp
 2018-06-01 23:32:33 +01:00
Michael Lutz
ce51e54d26 Change: [Win32] Parse and load DLS files for the DirectMusic driver without relying on high-level functions. 2018-05-26 22:28:01 +02:00
Jonathan G Rennison
f89e8b76d6 Fix increased number of NewGRFs support. 
Improve error handling if multiplayer limit is exceeded.
 2017-02-14 00:35:15 +00:00
rubidium
5c7c2445d8 (svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay 2014-04-23 21:23:21 +00:00
rubidium
21f991e235 (svn r26489) -Codechange: properly account for the end of buffers in the file io code instead of assuming MAX_PATH is okay 2014-04-23 21:23:21 +00:00
rubidium
c4ab18c029 (svn r25974) -Codechange: make the _personal_dir global const, since once it's set it shouldn't be changed anyhow 2013-11-13 18:57:25 +00:00
rubidium
def597fe31 (svn r25974) -Codechange: make the _personal_dir global const, since once it's set it shouldn't be changed anyhow 2013-11-13 18:57:25 +00:00
frosch
50abcf3edc (svn r24804) -Add: Separate subdirectory for screenshots. 2012-12-09 16:52:43 +00:00
frosch
edd9c0553a (svn r24804) -Add: Separate subdirectory for screenshots. 2012-12-09 16:52:43 +00:00
michi_cc
1966de1a2a (svn r24417) -Codechange: [Win32] Don't needlessly include windows.h in a commonly used header. 2012-07-19 19:21:47 +00:00
michi_cc
36181b3fb2 (svn r24417) -Codechange: [Win32] Don't needlessly include windows.h in a commonly used header. 2012-07-19 19:21:47 +00:00
truebrain
14325e2391 (svn r23605) -Add: GAME_DIR and CONTENT_TYPE_GAME, and read gamescript from that directory 2011-12-19 20:54:37 +00:00
truebrain
b4f832f29f (svn r23605) -Add: GAME_DIR and CONTENT_TYPE_GAME, and read gamescript from that directory 2011-12-19 20:54:37 +00:00
rubidium
3d605f6488 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 2011-12-19 17:48:04 +00:00
rubidium
df16ebd730 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 2011-12-19 17:48:04 +00:00
rubidium
ffccec6d84 (svn r23234) -Fix [FS#4840]: crash when after downloading content 2011-11-16 16:54:37 +00:00
rubidium
a3a2fdcfc2 (svn r23234) -Fix [FS#4840]: crash when after downloading content 2011-11-16 16:54:37 +00:00
rubidium
4d281cce97 (svn r23217) -Codechange: introduce the concept of scanning only in a limited set of sub directories 2011-11-14 21:30:37 +00:00
rubidium
6d991b3b10 (svn r23217) -Codechange: introduce the concept of scanning only in a limited set of sub directories 2011-11-14 21:30:37 +00:00
rubidium
9bf2cb0e86 (svn r23216) -Codechange: introduce the concept of having different tar lists 2011-11-14 21:28:43 +00:00
rubidium
160294ff22 (svn r23216) -Codechange: introduce the concept of having different tar lists 2011-11-14 21:28:43 +00:00
rubidium
661e5c6655 (svn r22904) -Codechange: add tar filename to file scanning 2011-09-08 09:48:52 +00:00
rubidium
414c397000 (svn r22904) -Codechange: add tar filename to file scanning 2011-09-08 09:48:52 +00:00
rubidium
fb5a2f4485 (svn r22835) -Codechange: keep track of the subdirectory we are looking through in the file scanner 2011-08-25 10:31:35 +00:00
rubidium
672df52e0c (svn r22835) -Codechange: keep track of the subdirectory we are looking through in the file scanner 2011-08-25 10:31:35 +00:00
rubidium
62886dfeed (svn r22827) -Codechange: pass the/a more proper sub directory when opening (some) files instead of the default one 2011-08-24 13:53:34 +00:00
rubidium
b4edc30c64 (svn r22827) -Codechange: pass the/a more proper sub directory when opening (some) files instead of the default one 2011-08-24 13:53:34 +00:00
rubidium
26788cf363 (svn r22825) -Codechange: pass subdir to FioOpenFile 2011-08-24 13:42:06 +00:00
rubidium
2a12c9df2f (svn r22825) -Codechange: pass subdir to FioOpenFile 2011-08-24 13:42:06 +00:00
rubidium
c8167de1c2 (svn r22822) -Codechange: make a distinction between base sets and newgrfs for their directory 2011-08-24 13:33:49 +00:00
rubidium
0061b5f184 (svn r22822) -Codechange: make a distinction between base sets and newgrfs for their directory 2011-08-24 13:33:49 +00:00
alberth
a70556dac2 (svn r22459) -Doc: Typo fixes and doxygen markup improvements. 2011-05-14 18:35:40 +00:00
alberth
28092366ec (svn r22459) -Doc: Typo fixes and doxygen markup improvements. 2011-05-14 18:35:40 +00:00
alberth
2b4da1d345 (svn r20689) -Codechange: Make some global functions used in 1 .cpp file static in that file. 2010-08-29 15:58:43 +00:00
alberth
9f5a96ead2 (svn r20689) -Codechange: Make some global functions used in 1 .cpp file static in that file. 2010-08-29 15:58:43 +00:00
rubidium
c03844c22a (svn r19779) -Change: add a return type to AppendPathSeparator and use that to determine whether we could append the path separator. If not, do not recurse into that directory as the path would exceed the maximum path length 2010-05-10 09:49:02 +00:00
rubidium
08919d2747 (svn r19779) -Change: add a return type to AppendPathSeparator and use that to determine whether we could append the path separator. If not, do not recurse into that directory as the path would exceed the maximum path length 2010-05-10 09:49:02 +00:00
rubidium
2099d3ffb8 (svn r19777) -Change: use the file scanner to find the .tars 2010-05-10 09:37:17 +00:00
rubidium
948beec597 (svn r19777) -Change: use the file scanner to find the .tars 2010-05-10 09:37:17 +00:00
rubidium
04fbf762fb (svn r19262) -Feature: finalise BaNaNaS support for music sets 2010-02-26 00:00:55 +00:00
rubidium
0f6d82df7e (svn r19262) -Feature: finalise BaNaNaS support for music sets 2010-02-26 00:00:55 +00:00
glx
2e499a43a9 (svn r18029) -Fix (r18028): AppendPathSeparator() should stay global 2009-11-09 15:16:38 +00:00