Jonathan G Rennison 7ff252c58d Merge branch 'master' into jgrpp ...

# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h

2019-03-04 01:18:25 +00:00

..

core

Merge branch 'save_ext' into jgrpp

2019-02-13 19:09:06 +00:00

network_admin.cpp

Change: Make a shortened network revision string for use in server queries

2019-02-03 18:00:16 +01:00

network_admin.h

Change chat arbitrary data field from an int64 to a struct.

2017-03-03 22:32:33 +00:00

network_base.h

…

network_chat_gui.cpp

Merge branch 'improved_breakdowns' into jgrpp

2017-08-15 19:26:26 +01:00

network_client.cpp

Merge branch 'master' into jgrpp

2019-03-04 01:18:25 +00:00

network_client.h

Merge branch 'send_money_company' into jgrpp

2017-03-03 22:42:07 +00:00

network_command.cpp

Use std::string for CommandContainer text instead of giant static buffer

2018-08-13 12:16:41 +01:00

network_content_gui.cpp

Add: allow opening of one TextfileWindow per type

2019-01-28 23:43:18 +00:00

network_content_gui.h

(svn r27288) -Fix: Slow network content GUI in MSVC Debug builds due to repeated string resolving.

2015-05-17 19:49:35 +00:00

network_content.cpp

Merge branch 'save_ext' into jgrpp

2019-02-13 19:09:06 +00:00

network_content.h

(svn r27468) -Fix (r27444): Game Scripts were not displayed in the content download window when opened from the AI/GS settings window.

2015-12-10 18:28:01 +00:00

network_func.h

Change chat arbitrary data field from an int64 to a struct.

2017-03-03 22:32:33 +00:00

network_gamelist.cpp

(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

2014-04-23 20:13:33 +00:00

network_gamelist.h

…

network_gui.cpp

Merge branch 'master' into jgrpp

2019-02-19 19:36:30 +00:00

network_gui.h

…

network_internal.h

Allow 256 NewGRFs in multiplayer

2018-05-12 09:11:41 +01:00

network_server.cpp

Merge branch 'save_ext' into jgrpp

2019-02-13 19:09:06 +00:00

network_server.h

Change chat arbitrary data field from an int64 to a struct.

2017-03-03 22:32:33 +00:00

network_type.h

Fix crashes/issues with non-broadcast network chat.

2017-05-01 14:50:45 +01:00

network_udp.cpp

Change: Make a shortened network revision string for use in server queries

2019-02-03 18:00:16 +01:00

network_udp.h

…

network.cpp

Fix: Do not mangle tagged revision strings for network revision strings

2019-02-12 21:32:43 +00:00

network.h

(svn r26449) -Add: Allow more sound sleep for dedicated servers when there's nothing to do and nobody paying attention

2014-04-08 20:19:41 +00:00