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

# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse4.cpp

2017-03-19 12:27:24 +00:00

..

core

Merge branch 'master' into jgrpp

2017-01-17 19:11:09 +00: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

(svn r22423) -Document: some network stuff

2011-05-04 20:24:23 +00:00

network_chat_gui.cpp

Merge branch 'master' into jgrpp

2017-03-19 12:27:24 +00:00

network_client.cpp

Merge branch 'send_money_company' into jgrpp

2017-03-03 22:42:07 +00: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 r27469) -Fix (r27468): Don't fetch all content info from content server when showing a online content window with exactly one type of content.

2015-12-10 19:58:33 +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

(svn r17248) -Fix: add GPL license notice where appropriate

2009-08-21 20:21:05 +00:00

network_gui.cpp

Merge branch 'send_money_company' into jgrpp

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

network_gui.h

(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header

2010-01-15 16:41:15 +00:00

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 'send_money_company' into jgrpp

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

Add a second int64 data field to chat arbitrary data field.

2017-03-03 22:33:55 +00: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