Jonathan G Rennison f764fcfb1f Merge branch 'master' into jgrpp-beta ...

# Conflicts:
#	src/console_cmds.cpp
#	src/debug.cpp
#	src/lang/vietnamese.txt
#	src/network/core/address.cpp
#	src/network/core/address.h
#	src/network/core/config.h
#	src/network/core/os_abstraction.cpp
#	src/network/core/os_abstraction.h
#	src/network/core/tcp_listen.h
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_gamelist.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf.cpp
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/table/settings/network_settings.ini

2021-11-02 00:51:54 +00:00

..

palettes

Doc: add a png representation of the palette overlaid with indexes (decimal) (#8547)

2021-01-22 10:26:45 +01:00

admin_network.md

Doc: Acknowledge integer type mismatch in certain admin packets using AdminUpdateType (#8238)

2020-06-27 18:21:17 +02:00

company_colour_indexes.html

Doc: provide a visual representation of the company colour ranges (#8546)

2021-04-24 13:19:13 +02:00

compiling_lang_files.md

Doc: rename HOWTO_compile_lang_files.md

2019-10-20 17:41:17 +01:00

debugging_desyncs.md

Doc: revised README to be more helpful to casual GitHub visitors

2019-11-13 20:40:18 +01:00

desync.md

Doc: rename the modified files

2019-10-20 17:12:54 +01:00

directory_structure.md

Doc: revised README to be more helpful to casual GitHub visitors

2019-11-13 20:40:18 +01: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

game_coordinator.md

Doc: explain in a bit more detail how we implemented STUN

2021-07-16 19:50:29 +02:00

jgrpp-low-level-changes.md

Documentation: Update low level changes

2021-03-02 19:48:50 +00: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

Store tunnel/bridge signal spacing on tile, adjust spacing to fit length

2021-08-29 02:11:58 +01:00

landscape.html

Store tunnel/bridge signal spacing on tile, adjust spacing to fit length

2021-08-29 02:11:58 +01:00

linkgraph.md

Doc: rename the modified files

2019-10-20 17:12:54 +01:00

logging_and_performance_metrics.md

Feature: NewGRF callback profiling (#7868)

2020-01-26 13:45:51 +01:00

multiplayer.md

Feature: parse the console settings the same way as config settings

2021-07-11 23:11:05 +02:00

newgrf-additions-nml.html

Add new signal type: no-entry signal

2021-09-04 11:39:54 +01:00

newgrf-additions.html

Add new signal type: no-entry signal

2021-09-04 11:39:54 +01: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

script-additions.html

Script: Add date methods for getting time in minutes

2020-10-29 17:47:05 +00:00

tileh.png

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

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