Jonathan G Rennison ad1c402ad8 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp

2018-05-03 23:54:51 +01:00

..

core

Merge branch 'master' into jgrpp

2018-05-03 23:54:51 +01:00

network_admin.cpp

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

2017-03-03 22:32:33 +00: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 'improved_breakdowns' into jgrpp

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

network_client.h

Merge branch 'send_money_company' into jgrpp

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

network_command.cpp

Merge branch 'template_train_replacement' into jgrpp

2017-01-21 01:44:05 +00:00

network_content_gui.cpp

(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)

2017-08-13 18:38:42 +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

(svn r27576) -Fix (r27570): Compilation failure with all compilers but mine.

2016-05-22 10:45:46 +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 'improved_breakdowns' into jgrpp

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

network_gui.h

…

network_internal.h

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

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

network_server.cpp

Merge branch 'master' into jgrpp

2018-05-03 23:54:51 +01: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

(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)

2016-10-30 17:29:33 +00:00

network_udp.h

(svn r23751) -Codechange: rename NetworkUDPGameLoop to a more descriptive name, and move the UDP specific bits to network_udp

2012-01-04 22:08:43 +00:00

network.cpp

Merge branch 'send_money_company' into jgrpp

2017-03-03 22:42:07 +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