Menu
▾
▴
[Armagetronad-commits] SF.net SVN: armagetronad:[10403] armagetronad/branches/0.4
|
From: <z-...@us...> - 2012-04-16 07:34:04
|
Revision: 10403
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10403&view=rev
Author: z-man
Date: 2012-04-16 07:33:58 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Merging branch 0.2.8 from revision 10389 to 10402:
------------------------------------------------------------------------
r10400 | bazaaarmagetron | 2012-04-16 09:10:09 +0200 (Mon, 16 Apr 2012) | 4 lines
author: Manuel Moos
Lowering CONNECTION_FLOOD_SENSITIVITY so by default, lost clients
(changed IP address, post-server crash) don't trigger turtle mode.
------------------------------------------------------------------------
r10394 | z-man | 2012-03-31 18:45:25 +0200 (Sat, 31 Mar 2012) | 13 lines
Merging branch 0.2.8.3 from revision 10004 to 10393:
------------------------------------------------------------------------
r10393 | z-man | 2012-03-31 17:59:04 +0200 (Sat, 31 Mar 2012) | 2 lines
Backporting rare crashfix: Adding sound lock when alpha objects get resorted.
(not merging, already here)
------------------------------------------------------------------------
r10262 | z-man | 2011-11-20 12:28:42 +0100 (Sun, 20 Nov 2011) | 1 line
Backport fix: Switching to glColor4f because Intel drivers don't like it if you alternate between them and glColor3f in different glBegin()/glEnd() blocks.
(not merging, already here)
------------------------------------------------------------------------
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10389&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10400&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10394&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10004&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10393&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10262&view=rev
Modified Paths:
--------------
armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg
Property Changed:
----------------
armagetronad/branches/0.4/
Property changes on: armagetronad/branches/0.4
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10389
/armagetronad/branches/0.2.8.3:9309-10004
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10402
/armagetronad/branches/0.2.8.3:9309-10393
Modified: armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg
===================================================================
--- armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg 2012-04-16 07:25:38 UTC (rev 10402)
+++ armagetronad/branches/0.4/armagetronad/config/settings_dedicated.cfg 2012-04-16 07:33:58 UTC (rev 10403)
@@ -237,7 +237,7 @@
PING_FLOOD_TIME_50 20.0 # Minimum time for 50 ping packets to arrive.
PING_FLOOD_TIME_100 100.0 # Minimum time for 100 ping packets to arrive.
PING_FLOOD_GLOBAL .1 # The same times, multiplied by this value, count for all pings from all machines. Negative values disable global flood protection.
-CONNECTION_FLOOD_SENSITIVITY .1 # The times PING_FLOOD_TIME_X, multiplied by this value, count for all incoming messages from clients not connected already. A flood here activates turtle mode. Negative values disable global flood protection.
+CONNECTION_FLOOD_SENSITIVITY .01 # The times PING_FLOOD_TIME_X, multiplied by this value, count for all incoming messages from clients not connected already. A flood here activates turtle mode. Negative values disable global flood protection.
CONNECTION_LIMIT 100 # Maximum number of packets from unknown peers to handle at one
ANTI_SPOOF 0 # If set to 1, checks connecting clients for spoofed IPs are done. Only clients passing a connectivity test are allowed in. This is done in turtle mode automatically, but may be useful to have on at all times.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|