marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
openclonk/src/network
History
David Dormagen 196f528201 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt
	planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt
	planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png
	planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c
	planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
	src/game/C4Game.cpp
	src/gamescript/C4GameScript.cpp
	src/gui/C4GameMessage.cpp
	src/landscape/C4Landscape.cpp
 		2015-06-03 22:32:36 +02:00
..
C4Client.cpp Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4Client.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4GameControlNetwork.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4GameControlNetwork.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4InteractiveThread.cpp Update copyright notices 2013-12-23 13:03:19 +01:00
C4InteractiveThread.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4League.cpp Remember league login name and password token. 2014-05-18 15:10:00 +02:00
C4League.h Remember league login name and password token. 2014-05-18 15:10:00 +02:00
C4NetIO.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4NetIO.h StdScheduler: Split into StdSchedulerWin32/StdSchedulerPoll/StdSchedulerMac 2014-01-23 17:53:40 +01:00
C4Network2.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4Network2.h Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4Network2Client.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4Network2Client.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2Dialogs.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4Network2Dialogs.h Move C4ApplicationSec1Timer to StdScheduler.h 2015-01-03 21:06:25 +01:00
C4Network2Discover.cpp Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2Discover.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2IO.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4Network2IO.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2IRC.cpp Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4Network2IRC.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2Players.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4Network2Players.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2Reference.cpp Added script functions SetLeagueProgressData, GetLeagueProgressData, GetLeagueScore and SetLeaguePerformance. 2014-04-20 15:33:36 +02:00
C4Network2Reference.h seperate update server from masterserver 2014-10-04 22:50:46 +02:00
C4Network2Res.cpp Remove a lot of disabled legacy code, round 2 2015-03-25 20:02:53 +01:00
C4Network2Res.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2ResDlg.cpp Remove some redundant #includes 2015-01-25 18:53:48 +01:00
C4Network2Stats.cpp Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2Stats.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2UPnP.h Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2UPnPDummy.cpp Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2UPnPLinux.cpp Update copyright notices 2013-12-23 13:03:19 +01:00
C4Network2UPnPWin32.cpp Ship a fallback natupnp.h 2014-08-03 21:48:53 +02:00
C4Packet2.cpp Merge branch 'master' into Controls 2014-12-25 15:24:19 +01:00
C4PacketBase.h Merge branch 'master' into Controls 2014-09-29 11:47:09 +02:00