Jonathan G Rennison 281d346fe2 Merge branch 'master' into jgrpp ...

# Conflicts:
#	bin/baseset/no_sound.obs
#	bin/baseset/orig_dos.obg
#	bin/baseset/orig_dos.obs
#	bin/baseset/orig_dos_de.obg
#	bin/baseset/orig_win.obg
#	bin/baseset/orig_win.obm
#	bin/baseset/orig_win.obs
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.cpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/common.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/saveload/saveload.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h

2019-01-29 02:28:14 +00:00

..

palettes

(svn r20490) -Change: merge the extra GRF sources so updating them becomes a bit easier.

2010-08-14 14:50:06 +00:00

admin_network.txt

(svn r25598) -Doc: Implications of the asynchronous processing of the rcon content command on send time of ADMIN_SERVER_ADMIN_RCON and ADMIN_SERVER_ADMIN_RCON_END packets

2013-07-13 09:59:09 +00:00

desync.txt

(svn r26788) -Add: Desync replay option to skip/replay failed commands

2014-09-07 14:21:16 +00:00

elrail_tile.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

elrail_track.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

elrail.svg

(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.

2006-03-29 16:30:26 +00:00

HOWTO_compile_lang_files.txt

Doc: replace 4 references to SVN with Git #6698 (#7036)

2019-01-11 13:41:12 +01:00

landscape_externals.html

(svn r20633) -Cleanup: and clarify some bits in the landscape documentation and make them pass the validator again.

2010-08-27 10:42:48 +00:00

landscape_grid.html

Docs: Fix error in landscape_grid.html: class 9 bridge ramp m6

2019-01-19 15:34:04 +00:00

landscape.html

Initial implementation of two rail types per tile

2018-12-21 03:27:58 +00:00

linkgraph.txt

(svn r25349) -Add: explanation of the link graph's inner workings

2013-06-09 12:52:50 +00:00

multiplayer.txt

Doc: Fix a few typos in docs/multiplayer.txt

2019-01-10 22:14:23 +00:00

newgrf-additions.html

Add Action 5 support for programmable signals graphics

2018-11-28 02:53:51 +00:00

obg_format.txt

(svn r23000) -Feature: Base graphics sets can now specify a preferred blitter which OpenTTD uses to decide which blitter to load.

2011-10-04 21:35:47 +00:00

obm_format.txt

Update: Document DOS music loading

2018-06-05 22:58:35 +02:00

obs_format.txt

(svn r17845) -Fix (r17744): Missing 'g' in sed command.

2009-10-22 16:01:28 +00:00

openttd.6

(svn r27091) -Fix [FS#6170] (r27012): Make manpage more portable. (bentley)

2014-12-24 16:53:04 +00:00

ottd-colourtext-palette.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

Readme_OS2.txt

(svn r10310) -Fix: Trunk can now be built on OS/2 :)

2007-06-24 20:41:24 +00:00

Readme_Windows_MSVC.md

Add: Visual Studio 2019 project files

2019-01-26 14:56:35 +01:00

tileh.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00