Menu
▾
▴
[Armagetronad-commits] SF.net SVN: armagetronad: [8441] armagetronad/trunk/armagetronad
|
From: <wrt...@us...> - 2008-04-25 18:02:04
|
Revision: 8441
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8441&view=rev
Author: wrtlprnft
Date: 2008-04-25 11:00:53 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
Merging branch 0.2.8 from revision 8363 to 8438:
------------------------------------------------------------------------
r8003 | wrtlprnft | 2008-02-19 13:49:32 +0100 (Tue, 19 Feb 2008) | 2 lines
got rid of the warnings that appeared when loading the default cockpit
------------------------------------------------------------------------
r8008 | wrtlprnft | 2008-02-19 16:32:57 +0100 (Tue, 19 Feb 2008) | 1 line
Added tPolynomial* to windows project
------------------------------------------------------------------------
r8022 | wrtlprnft | 2008-02-20 22:29:35 +0100 (Wed, 20 Feb 2008) | 2 lines
Updated the file with the stuff I found a bit hard to find out at first
------------------------------------------------------------------------
r8035 | wrtlprnft | 2008-02-21 18:11:33 +0100 (Thu, 21 Feb 2008) | 2 lines
If alpha blending is disabled at least enable the alpha test for rendering rectangular cockpit widgets
------------------------------------------------------------------------
r8042 | wrtlprnft | 2008-02-22 10:22:32 +0100 (Fri, 22 Feb 2008) | 2 lines
New setting to determine the color of the seperator line between the foregroud and background of bar gauges
------------------------------------------------------------------------
r8060 | philippeqc | 2008-02-22 20:06:12 +0100 (Fri, 22 Feb 2008) | 1 line
do not change dtd that are in use
------------------------------------------------------------------------
r8076 | philippeqc | 2008-02-23 11:09:12 +0100 (Sat, 23 Feb 2008) | 1 line
changed influenceSlide, influenceAdd and influenceSet to influence in the InfluenceMonitorchanged rotationSpeed and rotationAngle to rotation in the ZoneInfluenceItemRotation
------------------------------------------------------------------------
r8081 | philippeqc | 2008-02-23 16:19:25 +0100 (Sat, 23 Feb 2008) | 1 line
Added a parser to tPolynomial, to enable better integration in gParser.Added substitute method to tPolynomial
------------------------------------------------------------------------
r8082 | philippeqc | 2008-02-23 17:53:34 +0100 (Sat, 23 Feb 2008) | 7 lines
Separated tPolynomialMarshaler from tPolynomial.h
Made tPolynomialMarshaler a template class, so removed the file tPolynomial.cpp
tPolynomialMarshaler now relies on 2 tPolynomial internally rather than 2 arrays of numbers
tPolynomial has a parsing constructor
Updated relevant unit test
------------------------------------------------------------------------
r8094 | philippeqc | 2008-02-24 10:44:32 +0100 (Sun, 24 Feb 2008) | 1 line
Applied change from tPolynomialMarshaler to a template class to the whole project
------------------------------------------------------------------------
r8095 | philippeqc | 2008-02-24 12:44:10 +0100 (Sun, 24 Feb 2008) | 4 lines
Some backward compatibility in the parser to tolerate deprecated notation influenceSlide and influenceAdd for the MonitorInfluence element.
Some backward compatibility in the parser to tolerate deprecated notation rotationAngle and rotationSpeed for the Rotation element.
------------------------------------------------------------------------
r8201 | bazaarmagetron | 2008-03-01 10:45:44 +0100 (Sat, 01 Mar 2008) | 2 lines
Manuel Moos: Disabling title screen when entering the game.
------------------------------------------------------------------------
r8231 | z-man | 2008-03-03 23:08:03 +0100 (Mon, 03 Mar 2008) | 54 lines
Merging branch 0.2.8 from revision 7995 to 8230:
------------------------------------------------------------------------
r8227 | z-man | 2008-03-03 13:51:03 +0100 (Mon, 03 Mar 2008) | 2 lines
Repaired dedicated server.
------------------------------------------------------------------------
r8226 | z-man | 2008-03-03 13:48:06 +0100 (Mon, 03 Mar 2008) | 2 lines
Added ESC button to server connection that aborts the connection attempt.
------------------------------------------------------------------------
r8225 | z-man | 2008-03-03 12:39:47 +0100 (Mon, 03 Mar 2008) | 8 lines
Broke the unfortunate chain of events that leads to severe FPS drops on old clients on several links:
- server no longer sends redundant cycle death sync messages.
- client ignores redundant cycle death messages; they caused calls to eGameObject::Move on objects already removed from the activity list.
- game objects removed from the active lists no longer have currentFace set
- game objects removed from the list, when they move, just update their position and don't get a new currentFace.
The root of the problem are inactive game objects that still have a currentFace set. That causes that face and all its replacement in the
grid reordering code to be marked as "not to be simplified".
------------------------------------------------------------------------
r8224 | z-man | 2008-03-03 12:00:19 +0100 (Mon, 03 Mar 2008) | 2 lines
Not contacting master servers when the hostnames don't resolve.
------------------------------------------------------------------------
r8200 | wrtlprnft | 2008-02-29 19:51:16 +0100 (Fri, 29 Feb 2008) | 2 lines
Fixed a typo. Maybe this will be another test for the bzr merging thing.
------------------------------------------------------------------------
r8199 | bazaarmagetron | 2008-02-29 19:36:32 +0100 (Fri, 29 Feb 2008) | 2 lines
Manuel Moos: Extended allowed letters in authority URLs.
------------------------------------------------------------------------
r8024 | bazaarmagetron | 2008-02-20 23:21:06 +0100 (Wed, 20 Feb 2008) | 2 lines
Manuel Moos: Another workaround attempt for the "perfectly stable" OS ATI driver :) Same problem as last time, glColor() call at the end of a glBegin()/glEnd() block.
------------------------------------------------------------------------
r8020 | wrtlprnft | 2008-02-20 21:47:26 +0100 (Wed, 20 Feb 2008) | 2 lines
No longer print successful calls to ACCESS_LEVEL and USER_LEVEL to the console when loading a config file at start
------------------------------------------------------------------------
r8019 | wrtlprnft | 2008-02-20 20:39:54 +0100 (Wed, 20 Feb 2008) | 2 lines
Added logging of /admin commands
------------------------------------------------------------------------
------------------------------------------------------------------------
r8270 | bazaarmagetron | 2008-03-07 01:07:37 +0100 (Fri, 07 Mar 2008) | 2 lines
Removed incomplete sentence :)
------------------------------------------------------------------------
r8271 | z-man | 2008-03-07 01:09:25 +0100 (Fri, 07 Mar 2008) | 204 lines
Merging branch 0.2.8 from revision 8230 to 8269:
------------------------------------------------------------------------
r8269 | bazaarmagetron | 2008-03-06 19:48:38 +0100 (Thu, 06 Mar 2008) | 2 lines
Manuel Moos: added FORTRESS_COLLAPSE_SPEED to control the time between the conquest of a zone and the vanishing (and killing of the team members)
------------------------------------------------------------------------
r8268 | z-man | 2008-03-06 15:37:25 +0100 (Thu, 06 Mar 2008) | 2 lines
Fixed screen name reservation.
------------------------------------------------------------------------
r8267 | z-man | 2008-03-06 15:37:02 +0100 (Thu, 06 Mar 2008) | 2 lines
Strings get excess zeroes clamped away before they are written over the net. This fixes sporadic network message length discrepancies on playback. I hope the extra zeroes don't do harm elsewhere (string comparison is safe).
------------------------------------------------------------------------
r8266 | z-man | 2008-03-06 13:33:14 +0100 (Thu, 06 Mar 2008) | 2 lines
Adding method suffix and prefix to recording.
------------------------------------------------------------------------
r8265 | z-man | 2008-03-06 13:28:06 +0100 (Thu, 06 Mar 2008) | 2 lines
Fixed spurious rename message bug; it happened when you authenticated and changed your color during the same round.
------------------------------------------------------------------------
r8264 | z-man | 2008-03-06 13:15:37 +0100 (Thu, 06 Mar 2008) | 2 lines
Added login failure reason to playback.
------------------------------------------------------------------------
r8263 | bazaarmagetron | 2008-03-06 01:28:01 +0100 (Thu, 06 Mar 2008) | 2 lines
Manuel Moos: Restored behavior that kick votes over the chat interface don't get transformed to removal votes.
------------------------------------------------------------------------
r8262 | bazaarmagetron | 2008-03-06 01:27:22 +0100 (Thu, 06 Mar 2008) | 8 lines
author: Manuel Moos
All votes are now handled over the new server controlled system
internally. For old clients (pre 0.2.8), the vote items disguise as
kick votes (if they are kick or suspend votes) and are plainly
invisible for include and command votes.
The decision to transform a kick into a suspension is now made on vote
creation time.
------------------------------------------------------------------------
r8261 | bazaarmagetron | 2008-03-05 22:42:41 +0100 (Wed, 05 Mar 2008) | 2 lines
Manuel Moos: Implemented "include" and "command" votes.
------------------------------------------------------------------------
r8260 | bazaarmagetron | 2008-03-05 19:43:01 +0100 (Wed, 05 Mar 2008) | 2 lines
Manuel Moos: If the team owning a zone is dead at round end, the zone does not collapse harmlessly; instead, it gets "touchy" and will collapse at the slightest contact with an enemy.
------------------------------------------------------------------------
r8259 | bazaarmagetron | 2008-03-05 15:49:01 +0100 (Wed, 05 Mar 2008) | 2 lines
Manuel Moos: Default hiding level adapted to docs: no hiding for anyone.
------------------------------------------------------------------------
r8258 | bazaarmagetron | 2008-03-05 13:20:54 +0100 (Wed, 05 Mar 2008) | 4 lines
author: Manuel Moos
Added access levels and individual biases for kick and suspend votes.
Also added texts and config items for include and direct command votes.
------------------------------------------------------------------------
r8257 | bazaarmagetron | 2008-03-05 12:28:57 +0100 (Wed, 05 Mar 2008) | 2 lines
Manuel Moos: Shuffled around access levels. Authenticated now is all on the bottom, only barely above "Program". Default access level for remote users stays 15, only that it's now named "Remote User".
------------------------------------------------------------------------
r8256 | bazaarmagetron | 2008-03-05 11:59:41 +0100 (Wed, 05 Mar 2008) | 2 lines
Manuel Moos: Updated config file with new access levels.
------------------------------------------------------------------------
r8255 | bazaarmagetron | 2008-03-05 11:58:43 +0100 (Wed, 05 Mar 2008) | 2 lines
Manuel Moos: Added two access levels below authenticated that you can USER_LEVEL players to; intended to be used to take away rights authenticated players usually get (like, starting votes) for selected users.
------------------------------------------------------------------------
r8253 | z-man | 2008-03-05 01:44:40 +0100 (Wed, 05 Mar 2008) | 2 lines
Fixed oversized hole bug.
------------------------------------------------------------------------
r8252 | z-man | 2008-03-05 01:09:13 +0100 (Wed, 05 Mar 2008) | 3 lines
Disabled debug mode exception for chatbot settings on the server (for debug replays).
------------------------------------------------------------------------
r8251 | z-man | 2008-03-05 01:06:54 +0100 (Wed, 05 Mar 2008) | 2 lines
Faster logins in recording mode.
------------------------------------------------------------------------
r8250 | z-man | 2008-03-05 01:06:20 +0100 (Wed, 05 Mar 2008) | 2 lines
Ping improvements. I though I committed this yesterday.
------------------------------------------------------------------------
r8249 | bazaarmagetron | 2008-03-04 19:25:58 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: Added VOTE_KICK_REASON.
------------------------------------------------------------------------
r8248 | bazaarmagetron | 2008-03-04 19:25:15 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: Added new commands here, too.
------------------------------------------------------------------------
r8247 | bazaarmagetron | 2008-03-04 19:24:48 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: Added new voting settings items.
------------------------------------------------------------------------
r8246 | z-man | 2008-03-04 18:28:18 +0100 (Tue, 04 Mar 2008) | 2 lines
Fixed armathentication compilation.
------------------------------------------------------------------------
r8245 | bazaarmagetron | 2008-03-04 17:47:12 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: Suspension count is now stored in the eVoter data structure and has limited reconnection resistance.
------------------------------------------------------------------------
r8244 | bazaarmagetron | 2008-03-04 17:29:31 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: Err, actually letting players into the game again :)
------------------------------------------------------------------------
r8243 | bazaarmagetron | 2008-03-04 17:28:23 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: Giving players better reasons why they can't join the game.
------------------------------------------------------------------------
r8242 | bazaarmagetron | 2008-03-04 17:16:12 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: VOTING_KICK_MINHARM now only affects votes that came via the menu.
------------------------------------------------------------------------
r8241 | bazaarmagetron | 2008-03-04 16:39:35 +0100 (Tue, 04 Mar 2008) | 4 lines
author: Manuel Moos
Added VOTING_HARM_TIME to complement VOTING_KICK_TIME (applies to all harmful votes, currently kicks and suspensions).
Added VOTING_KICK_MINHARM to transform the first kick votes against a poor newbie into suspensions automatically.
------------------------------------------------------------------------
r8240 | bazaarmagetron | 2008-03-04 16:15:16 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: Added VOTING_SUSPEND_ROUNDS to control suspend vote duration.
------------------------------------------------------------------------
r8239 | bazaarmagetron | 2008-03-04 16:14:41 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: Added "/vote suspend <player>".
------------------------------------------------------------------------
r8238 | bazaarmagetron | 2008-03-04 16:13:56 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: added "/callvote"
------------------------------------------------------------------------
r8237 | bazaarmagetron | 2008-03-04 15:29:47 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: finished "/vote kick" vote interface.
------------------------------------------------------------------------
r8236 | bazaarmagetron | 2008-03-04 15:29:00 +0100 (Tue, 04 Mar 2008) | 4 lines
author: Manuel Moos
Avoiding redundant wall coordinates during holing. This makes the holer information a bit inaccurate; if someone "enlarges" a reviously existing hole, it will belong entirely to him, and not just the new bits.
Duplicating last wall coordinate on Update() if there was a hole up to the wall end; this avoids "dragging" the hole along.
------------------------------------------------------------------------
r8235 | bazaarmagetron | 2008-03-04 15:28:00 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: Filled vote stub for kick votes.
------------------------------------------------------------------------
r8234 | bazaarmagetron | 2008-03-04 15:27:20 +0100 (Tue, 04 Mar 2008) | 2 lines
Manuel Moos: Added chat interface stub for votes.
------------------------------------------------------------------------
r8233 | bazaarmagetron | 2008-03-03 23:20:59 +0100 (Mon, 03 Mar 2008) | 2 lines
Manuel Moos: Fix ammendment: avoiding short flicker.
------------------------------------------------------------------------
r8232 | bazaarmagetron | 2008-03-03 23:20:29 +0100 (Mon, 03 Mar 2008) | 5 lines
author: Manuel Moos
Deactivation events no longer minimize the application from fullscreen
mode in Linux. The only known source for deactivation events is the
screensaver, and ignoring them appears to scare it off :)
------------------------------------------------------------------------
------------------------------------------------------------------------
r8274 | nemostultae | 2008-03-07 20:21:14 +0100 (Fri, 07 Mar 2008) | 12 lines
Fixed bug which caused first build to forever hang when sorting resources. We were using absolute paths--not relative. Thus:
>>> os.path.split("/foo")
('/', 'foo')
caused an infinite loop, and the expected result:
>>> os.path.split("foo")
('', 'foo')
would not cause an infinite loop...
------------------------------------------------------------------------
r8277 | nemostultae | 2008-03-08 05:27:36 +0100 (Sat, 08 Mar 2008) | 2 lines
Only send a Growl update if not dedicated
------------------------------------------------------------------------
r8286 | nemostultae | 2008-03-08 16:27:37 +0100 (Sat, 08 Mar 2008) | 2 lines
gServerInfoFavorite -> nServerInfoRedirect
------------------------------------------------------------------------
r8287 | z-man | 2008-03-08 17:55:06 +0100 (Sat, 08 Mar 2008) | 67 lines
Merging branch 0.2.8 from revision 8269 to 8286:
------------------------------------------------------------------------
r8285 | z-man | 2008-03-08 15:24:06 +0100 (Sat, 08 Mar 2008) | 3 lines
Experimenting with different visuals for slowly collapsing zones.
Take 1: When conquered, the zone lights up in white, then slows down. When the rotation stops, it darkens.
------------------------------------------------------------------------
r8284 | z-man | 2008-03-08 15:06:41 +0100 (Sat, 08 Mar 2008) | 3 lines
Voter datastructure (with a little more persistence than ePlayerNetID) is only used to store suspensions while the ePlayerNetID object does not exist.
This avoids suspending everyone connecting from the same LAN all at once.
------------------------------------------------------------------------
r8283 | z-man | 2008-03-08 14:53:19 +0100 (Sat, 08 Mar 2008) | 2 lines
Re-added VOTE_USE_SERVER_CONTROLLED_KICK config item on the client to avoid UPGRADE messages.
------------------------------------------------------------------------
r8282 | z-man | 2008-03-08 13:51:07 +0100 (Sat, 08 Mar 2008) | 2 lines
Fixed clientside reception of server controlled vote items.
------------------------------------------------------------------------
r8281 | z-man | 2008-03-08 13:49:37 +0100 (Sat, 08 Mar 2008) | 2 lines
Added -O0 to debug configuration, just in case.
------------------------------------------------------------------------
r8280 | z-man | 2008-03-08 13:48:27 +0100 (Sat, 08 Mar 2008) | 2 lines
Recording fixes for the case when there are errors talking to the authority.
------------------------------------------------------------------------
r8279 | z-man | 2008-03-08 11:49:26 +0100 (Sat, 08 Mar 2008) | 2 lines
Added full user name to recording.
------------------------------------------------------------------------
r8278 | z-man | 2008-03-08 11:48:51 +0100 (Sat, 08 Mar 2008) | 2 lines
Fixed extra trailing \0 in playback strings.
------------------------------------------------------------------------
r8276 | bazaarmagetron | 2008-03-08 00:57:06 +0100 (Sat, 08 Mar 2008) | 2 lines
Manuel Moos: Fixed one vote item delivery bug. There must be another one hiding somewhere, though.
------------------------------------------------------------------------
r8275 | bazaarmagetron | 2008-03-08 00:56:32 +0100 (Sat, 08 Mar 2008) | 2 lines
Manuel Moos: Fixed blank screen bug; it was caused by bad tToDo recursion.
------------------------------------------------------------------------
r8273 | z-man | 2008-03-07 14:20:40 +0100 (Fri, 07 Mar 2008) | 2 lines
Don't show "IP=<empty>" in /players output.
------------------------------------------------------------------------
r8272 | z-man | 2008-03-07 12:03:02 +0100 (Fri, 07 Mar 2008) | 4 lines
Added eGameObject::OnRoundBegin(), called after game object creation.
Used it in the zone code to fix the flickering empty zone glitch in sumo,
and to avoid rare midgame zone ownership changes.
------------------------------------------------------------------------
------------------------------------------------------------------------
r8288 | nemostultae | 2008-03-08 19:11:48 +0100 (Sat, 08 Mar 2008) | 2 lines
Typo, don't include gWinZone.cpp
------------------------------------------------------------------------
r8295 | wrtlprnft | 2008-03-09 16:57:55 +0100 (Sun, 09 Mar 2008) | 1 line
re-added gWinZone.* to the codeblocks project, it got removed for some reason
------------------------------------------------------------------------
r8297 | nemostultae | 2008-03-09 19:02:20 +0100 (Sun, 09 Mar 2008) | 2 lines
Restored building trunk on Mac OS X
------------------------------------------------------------------------
r8298 | nemostultae | 2008-03-09 19:15:53 +0100 (Sun, 09 Mar 2008) | 2 lines
Don't copy Info.plist to the Resources/ directory
------------------------------------------------------------------------
r8307 | nemostultae | 2008-03-11 02:35:28 +0100 (Tue, 11 Mar 2008) | 3 lines
Added rakefile.rb and xcode.rake to project. Moved shared.xcconfig to MacOS
group.
------------------------------------------------------------------------
r8319 | nemostultae | 2008-03-15 00:44:37 +0100 (Sat, 15 Mar 2008) | 2 lines
Possibly fixes baddog144's error?
------------------------------------------------------------------------
r8338 | wrtlprnft | 2008-03-18 20:30:26 +0100 (Tue, 18 Mar 2008) | 2 lines
Make clientside completion aware of the new commands that accept player names
------------------------------------------------------------------------
r8353 | wrtlprnft | 2008-03-19 20:15:20 +0100 (Wed, 19 Mar 2008) | 4 lines
Paste support: press ctrl-v in any place that expects text to paste the clipboard contents. Tested on linux and windows, it should work on macos, too, in theory. No clue if it really does, though, someone will need to test that.
The code for getting the clipboard contents comes from http://www.libsdl.org/projects/scrap/ and is released in the public domain
------------------------------------------------------------------------
r8355 | wrtlprnft | 2008-03-19 20:21:30 +0100 (Wed, 19 Mar 2008) | 1 line
Add new files for copy and paste support
------------------------------------------------------------------------
r8364 | z-man | 2008-03-20 00:47:02 +0100 (Thu, 20 Mar 2008) | 352 lines
Merging branch 0.2.8 from revision 8286 to 8363:
------------------------------------------------------------------------
r8363 | z-man | 2008-03-19 21:31:09 +0100 (Wed, 19 Mar 2008) | 2 lines
Undid test commits.
------------------------------------------------------------------------
r8362 | bazaarmagetron | 2008-03-19 21:24:54 +0100 (Wed, 19 Mar 2008) | 45 lines
author: Manuel Moos
Automatic merging of commits that would change history order:
------------------------------------------------------------
revno: 775.1.2
committer: Manuel Moos <z-...@us...>
branch nick: armagetronad
timestamp: Wed 2008-03-19 21:02:00 +0100
message:
Test commit from bzr.
------------------------------------------------------------
revno: 775.1.1
committer: Manuel Moos <z-...@us...>
branch nick: 0.2.8-armagetronad-work
timestamp: Wed 2008-03-19 20:45:00 +0100
message:
Empty merge to keep the peace between svn and bzr.
------------------------------------------------------------
revno: 770.1.4
committer: epsy
branch nick: 0.2.8
timestamp: Wed 2008-03-19 20:21:23 +0100
message:
redo
------------------------------------------------------------
revno: 770.1.3
committer: epsy
branch nick: 0.2.8
timestamp: Wed 2008-03-19 20:19:36 +0100
message:
undo
------------------------------------------------------------
revno: 770.1.2
committer: Manuel Moos <z-...@us...>
branch nick: 0.2.8-armagetronad-work
timestamp: Wed 2008-03-19 20:12:10 +0100
message:
Empty merge to keep the peace between svn and bzr.
------------------------------------------------------------
revno: 770.1.1
committer: Manuel Moos <z-...@us...>
branch nick: 0.2.8
timestamp: Wed 2008-03-19 19:56:58 +0100
message:
Fixed AI player names in client and removed debug breakpoints from tColoredString:RemoveColors
------------------------------------------------------------------------
r8361 | z-man | 2008-03-19 21:03:11 +0100 (Wed, 19 Mar 2008) | 2 lines
Test commit from svn.
------------------------------------------------------------------------
r8360 | bazaarmagetron | 2008-03-19 20:48:16 +0100 (Wed, 19 Mar 2008) | 2 lines
Manuel Moos: redo
------------------------------------------------------------------------
r8359 | bazaarmagetron | 2008-03-19 20:47:38 +0100 (Wed, 19 Mar 2008) | 2 lines
Manuel Moos: undo
------------------------------------------------------------------------
r8358 | bazaarmagetron | 2008-03-19 20:47:00 +0100 (Wed, 19 Mar 2008) | 1 line
Manuel Moos: Empty merge to keep the peace between svn and bzr.
------------------------------------------------------------------------
r8357 | bazaarmagetron | 2008-03-19 20:46:37 +0100 (Wed, 19 Mar 2008) | 2 lines
Manuel Moos: Fixed AI player names in client and removed debug breakpoints from tColoredString:RemoveColors
------------------------------------------------------------------------
r8352 | z-man | 2008-03-19 20:05:44 +0100 (Wed, 19 Mar 2008) | 2 lines
Removing annoying debug breakpoints.
------------------------------------------------------------------------
r8351 | z-man | 2008-03-19 20:03:27 +0100 (Wed, 19 Mar 2008) | 3 lines
Only clients really supporting the new votes get them now, and only they count for the totals.
Undesired side effect so far: MIN_VOTERS is not taken into account properly, that still uses the total number of voters.
------------------------------------------------------------------------
r8350 | z-man | 2008-03-19 12:06:46 +0100 (Wed, 19 Mar 2008) | 2 lines
Fixed one-off error with kick vote to suspend vote transmogrification, converted epsy's TABS to spaces.
------------------------------------------------------------------------
r8347 | nemostultae | 2008-03-19 01:06:06 +0100 (Wed, 19 Mar 2008) | 3 lines
* Removed rDisplayList.h from Copy Headers task
* Moved tColor.cpp to tools/ subgroup
------------------------------------------------------------------------
r8346 | bazaarmagetron | 2008-03-19 01:01:29 +0100 (Wed, 19 Mar 2008) | 1 line
Manuel Moos: Empty merge to keep the peace between svn and bzr.
------------------------------------------------------------------------
r8345 | wrtlprnft | 2008-03-18 23:09:08 +0100 (Tue, 18 Mar 2008) | 6 lines
- fixed a client compilation warning
- /rtfm now prints the message to the invoker, too, to catch errors
- some language file fixes
- whitespace corrections
------------------------------------------------------------------------
r8344 | bazaarmagetron | 2008-03-18 21:43:49 +0100 (Tue, 18 Mar 2008) | 1 line
Manuel Moos: Empty merge to keep the peace between svn and bzr.
------------------------------------------------------------------------
r8343 | wrtlprnft | 2008-03-18 21:32:00 +0100 (Tue, 18 Mar 2008) | 2 lines
Fixed a bug with the display of authenticated names in the server browser.
------------------------------------------------------------------------
r8342 | bazaarmagetron | 2008-03-18 21:13:57 +0100 (Tue, 18 Mar 2008) | 1 line
Manuel Moos: Empty merge to keep the peace between svn and bzr.
------------------------------------------------------------------------
r8341 | bazaarmagetron | 2008-03-18 21:13:30 +0100 (Tue, 18 Mar 2008) | 2 lines
Manuel Moos: eek, forgot help texts
------------------------------------------------------------------------
r8340 | bazaarmagetron | 2008-03-18 21:11:35 +0100 (Tue, 18 Mar 2008) | 4 lines
author: Manuel Moos
* FILTER_COLOR_TEAM filters color in team messages
* FILTER_DARK_COLOR_(STRINGS|SERVER_NAMES|NAMES|TEAM)
------------------------------------------------------------------------
r8339 | wrtlprnft | 2008-03-18 20:33:05 +0100 (Tue, 18 Mar 2008) | 2 lines
Durka's xcode file that includes tColor.cpp
------------------------------------------------------------------------
r8337 | wrtlprnft | 2008-03-18 20:06:36 +0100 (Tue, 18 Mar 2008) | 2 lines
new /rtfm command to send help messages to other players.
------------------------------------------------------------------------
r8336 | bazaarmagetron | 2008-03-18 17:58:29 +0100 (Tue, 18 Mar 2008) | 2 lines
Manuel Moos: "we" forgot to initialize the alpha value :)
------------------------------------------------------------------------
r8335 | bazaarmagetron | 2008-03-18 17:48:19 +0100 (Tue, 18 Mar 2008) | 2 lines
Manuel Moos: Fixed performance problems (string duplication) and bugs in color code interpretation.
------------------------------------------------------------------------
r8334 | bazaarmagetron | 2008-03-18 16:53:02 +0100 (Tue, 18 Mar 2008) | 2 lines
Manuel Moos: Avoiding needless copies of default help topics in memory (and fixing array element count bug on the go).
------------------------------------------------------------------------
r8333 | wrtlprnft | 2008-03-18 15:21:36 +0100 (Tue, 18 Mar 2008) | 2 lines
Primitive help system. See settings_dedicated.cfg:339 for a description of the new commands
------------------------------------------------------------------------
r8332 | bazaarmagetron | 2008-03-17 21:47:10 +0100 (Mon, 17 Mar 2008) | 4 lines
author: epsy
Ah, i shouldn't code on mornings, names on client will really, i promise, appear again.
Also restructured tColor, changed it to a class, added tColor::IsDark() and construction of a tColor from a color code. Set rFont.cpp to use it.
------------------------------------------------------------------------
r8331 | bazaarmagetron | 2008-03-17 12:06:52 +0100 (Mon, 17 Mar 2008) | 2 lines
Manuel Moos: numeric access level -> named access level in one server message.
------------------------------------------------------------------------
r8330 | bazaarmagetron | 2008-03-17 11:46:09 +0100 (Mon, 17 Mar 2008) | 2 lines
Manuel Moos: Better feedback messages; the vote submitter is now always informed that his vote was accepted, and the new vote notification is back.
------------------------------------------------------------------------
r8329 | z-man | 2008-03-17 11:15:44 +0100 (Mon, 17 Mar 2008) | 2 lines
Added missing output parameter.
------------------------------------------------------------------------
r8328 | bazaarmagetron | 2008-03-17 08:36:18 +0100 (Mon, 17 Mar 2008) | 2 lines
epsy: Player names really appears again. :)
------------------------------------------------------------------------
r8326 | wrtlprnft | 2008-03-16 23:16:35 +0100 (Sun, 16 Mar 2008) | 2 lines
Append (and parse) a list of authenticated names to the big server info messages (the ones that make up the details you see on the server browser)
------------------------------------------------------------------------
r8325 | bazaarmagetron | 2008-03-16 16:40:57 +0100 (Sun, 16 Mar 2008) | 2 lines
epsy: The Players name appear again in standalone mode. Also added VOTING_SUSPEND and RENAME to NEWS.
------------------------------------------------------------------------
r8324 | bazaarmagetron | 2008-03-16 16:40:09 +0100 (Sun, 16 Mar 2008) | 4 lines
author: Manuel Moos
Full case insensitive matches now take precedence over partial case
sensitive matches. "KILL Z", if players z and Z-Man are online, now kills z.
------------------------------------------------------------------------
r8323 | wrtlprnft | 2008-03-16 16:17:24 +0100 (Sun, 16 Mar 2008) | 2 lines
Minor annoyance: the round end zone on freestyle game is now announced correctly
------------------------------------------------------------------------
r8322 | bazaarmagetron | 2008-03-16 00:56:03 +0100 (Sun, 16 Mar 2008) | 2 lines
Manuel Moos: Map load failures (including missing spawn points) now let the map be reverted to the last known working map.
------------------------------------------------------------------------
r8321 | bazaarmagetron | 2008-03-15 01:56:28 +0100 (Sat, 15 Mar 2008) | 2 lines
Manuel Moos: Voter always gets messages about the voting, no matter what privacy level is set.
------------------------------------------------------------------------
r8320 | bazaarmagetron | 2008-03-15 01:55:56 +0100 (Sat, 15 Mar 2008) | 2 lines
Manuel Moos: Typo.
------------------------------------------------------------------------
r8318 | bazaarmagetron | 2008-03-14 13:35:44 +0100 (Fri, 14 Mar 2008) | 2 lines
Manuel Moos: Added settings_authentication.cfg to list of configuration files to be distributed and installed. Whoops.
------------------------------------------------------------------------
r8317 | nemostultae | 2008-03-14 03:22:19 +0100 (Fri, 14 Mar 2008) | 2 lines
Only use ZThread in dedicated build
------------------------------------------------------------------------
r8316 | wrtlprnft | 2008-03-13 23:54:34 +0100 (Thu, 13 Mar 2008) | 2 lines
Have the server log the version of each connecting clients (I hope the max version the client sends is its current version)
------------------------------------------------------------------------
r8315 | wrtlprnft | 2008-03-12 21:56:31 +0100 (Wed, 12 Mar 2008) | 2 lines
Don't look at this patch. Especially not z-man.
------------------------------------------------------------------------
r8313 | z-man | 2008-03-12 12:31:32 +0100 (Wed, 12 Mar 2008) | 2 lines
Shuffling no longer uses tString::toInt so it can (and does) report input errors.
------------------------------------------------------------------------
r8312 | wrtlprnft | 2008-03-12 11:15:46 +0100 (Wed, 12 Mar 2008) | 2 lines
Add new default settings to settings_authentication.cfg
------------------------------------------------------------------------
r8311 | bazaarmagetron | 2008-03-11 23:26:57 +0100 (Tue, 11 Mar 2008) | 4 lines
author: Manuel Moos
No more double "not allowed to rename" messages.
Immediate response to admin player rename is "player will be renamed".
------------------------------------------------------------------------
r8310 | bazaarmagetron | 2008-03-11 23:25:06 +0100 (Tue, 11 Mar 2008) | 2 lines
Manuel Moos: Applied epsy's name forcing patch with minor adaptions.
------------------------------------------------------------------------
r8309 | wrtlprnft | 2008-03-11 20:51:24 +0100 (Tue, 11 Mar 2008) | 2 lines
more helpful "you can't shuffle up" message
------------------------------------------------------------------------
r8308 | wrtlprnft | 2008-03-11 20:36:35 +0100 (Tue, 11 Mar 2008) | 3 lines
Actually make ACCESS_LEVEL_SHUFFLE_UP work...
Don't look at the error, and if you do, please don't remember that I ever did such a stupid mistake.
------------------------------------------------------------------------
r8306 | nemostultae | 2008-03-11 02:20:36 +0100 (Tue, 11 Mar 2008) | 3 lines
Xcode changed something. armagetronad-dedicated is now explicitly known as
compiled.mach-o.executable filetype. Well done Xcode...
------------------------------------------------------------------------
r8305 | nemostultae | 2008-03-11 02:17:13 +0100 (Tue, 11 Mar 2008) | 2 lines
Updated Mac OS X build instructions.
------------------------------------------------------------------------
r8304 | bazaarmagetron | 2008-03-10 22:14:59 +0100 (Mon, 10 Mar 2008) | 4 lines
author: Manuel Moos
QUIT now also works in the 'waiting for players, only spectators online'
break.
------------------------------------------------------------------------
r8303 | bazaarmagetron | 2008-03-10 21:51:03 +0100 (Mon, 10 Mar 2008) | 2 lines
Manuel Moos: Disabling silly displaylist stats for the dedicated server.
------------------------------------------------------------------------
r8302 | bazaarmagetron | 2008-03-10 17:12:58 +0100 (Mon, 10 Mar 2008) | 4 lines
author: Manuel Moos
Cleaned up a bit of the configuration recording and playback chaos. "Quit" console command is broken on playback currently in some situations.
Silenced /msg chat no longer echoed to administrators and server console.
------------------------------------------------------------------------
r8301 | bazaarmagetron | 2008-03-09 21:52:55 +0100 (Sun, 09 Mar 2008) | 2 lines
Manuel Moos: Removed unused variable.
------------------------------------------------------------------------
r8300 | bazaarmagetron | 2008-03-09 21:52:19 +0100 (Sun, 09 Mar 2008) | 2 lines
Manuel Moos: Small fix: made non-krawall compilation of epsy's patch work.
------------------------------------------------------------------------
r8299 | bazaarmagetron | 2008-03-09 21:51:49 +0100 (Sun, 09 Mar 2008) | 2 lines
Manuel Moos: Applied epsy's VOTING_SUSPEND patch.
------------------------------------------------------------------------
r8296 | wrtlprnft | 2008-03-09 18:10:34 +0100 (Sun, 09 Mar 2008) | 2 lines
Added WAIT_FOR_EXTERNAL_SCRIPT, a feature found in armahacktron that facilitates stdio scripting. Thanks epsy for isolating it from the rest of armahacktron
------------------------------------------------------------------------
r8293 | z-man | 2008-03-09 16:07:30 +0100 (Sun, 09 Mar 2008) | 2 lines
Typo.
------------------------------------------------------------------------
r8292 | z-man | 2008-03-09 16:05:28 +0100 (Sun, 09 Mar 2008) | 2 lines
Added ROUND_SCORE_TEAM ladderlog message.
------------------------------------------------------------------------
r8291 | bazaarmagetron | 2008-03-08 21:25:28 +0100 (Sat, 08 Mar 2008) | 2 lines
Manuel Moos: added bits.
------------------------------------------------------------------------
------------------------------------------------------------------------
r8365 | z-man | 2008-03-20 01:26:15 +0100 (Thu, 20 Mar 2008) | 2 lines
Server compiles again.
------------------------------------------------------------------------
r8366 | nemostultae | 2008-03-20 06:46:38 +0100 (Thu, 20 Mar 2008) | 3 lines
* Added paste support for Mac OS X. I'd modify scrap but it's too much of a mess.
* Added tColor.cpp here too.
------------------------------------------------------------------------
r8367 | nemostultae | 2008-03-20 07:22:49 +0100 (Thu, 20 Mar 2008) | 2 lines
Better handling of return value for paste on Mac OS X
------------------------------------------------------------------------
r8372 | bazaarmagetron | 2008-03-20 15:00:05 +0100 (Thu, 20 Mar 2008) | 2 lines
wrtlprnft: Reverted a failed vim command (presumably) that "we" introduced in r7216 (concerning the addition of motion blur)
------------------------------------------------------------------------
r8388 | bazaarmagetron | 2008-03-24 21:32:10 +0100 (Mon, 24 Mar 2008) | 2 lines
Manuel Moos: Removed annoying instachat that never makes it through default chat spam settings on 0.2.8.3 and replaced it with official version of the SHIFT-ESC prank.
------------------------------------------------------------------------
r8391 | bazaarmagetron | 2008-03-26 12:20:15 +0100 (Wed, 26 Mar 2008) | 2 lines
Manuel Moos: Version 0 maps now also get zones v1 parsed.
------------------------------------------------------------------------
r8392 | bazaarmagetron | 2008-03-27 22:40:47 +0100 (Thu, 27 Mar 2008) | 2 lines
epsy: how come we were missing ZONE_ALPHA_TOGGLE on trunk? :-)
------------------------------------------------------------------------
r8393 | wrtlprnft | 2008-03-30 22:19:04 +0200 (Sun, 30 Mar 2008) | 2 lines
"fixed" a compiler warning
------------------------------------------------------------------------
r8395 | bazaarmagetron | 2008-04-02 14:34:13 +0200 (Wed, 02 Apr 2008) | 2 lines
wrtlprnft: Fixed erroneous update of spawnDir that caused the minimap to rotate sometimes when it wasn't supposed to.
------------------------------------------------------------------------
r8396 | bazaarmagetron | 2008-04-02 14:34:57 +0200 (Wed, 02 Apr 2008) | 2 lines
wrtlprnft: meh, always pull before you ci
------------------------------------------------------------------------
r8411 | bazaarmagetron | 2008-04-18 12:19:59 +0200 (Fri, 18 Apr 2008) | 2 lines
wrtlprnft: Fixed an include safeguard that probably caused voodoo quite a headache
------------------------------------------------------------------------
r8412 | bazaarmagetron | 2008-04-18 20:14:03 +0200 (Fri, 18 Apr 2008) | 2 lines
epsy46: Fixed client always thinking he was right about it's name, it somehow didn't happen in 0.2.8, also, let's see if my name gets detected properly :P
------------------------------------------------------------------------
r8414 | bazaarmagetron | 2008-04-19 00:54:32 +0200 (Sat, 19 Apr 2008) | 2 lines
epsy46: manual merge of 0.2.8:810, because i don't have a clue on how to do that and everyone is sleeping :)
------------------------------------------------------------------------
r8420 | bazaarmagetron | 2008-04-19 21:11:14 +0200 (Sat, 19 Apr 2008) | 2 lines
wrtlprnft: replaced strlen(<string>) >= 8 by strnlen(<string>, 8) >= 8 in three places
------------------------------------------------------------------------
r8438 | bazaarmagetron | 2008-04-23 19:25:57 +0200 (Wed, 23 Apr 2008) | 2 lines
wrtlprnft: replaced strnlen by our own implementation because it's nonstandard. If anyone knows how to use the (probably optimized) glibc version if it exists, please do it :-)
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8363&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7995&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8230&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8269&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8286&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/NEWS
armagetronad/trunk/armagetronad/config/default.cfg
armagetronad/trunk/armagetronad/config/settings_authentication.cfg
armagetronad/trunk/armagetronad/config/settings_dedicated.cfg
armagetronad/trunk/armagetronad/language/english_base.txt
armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp
armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
armagetronad/trunk/armagetronad/src/engine/ePlayer.h
armagetronad/trunk/armagetronad/src/engine/eTeam.cpp
armagetronad/trunk/armagetronad/src/engine/eVoter.cpp
armagetronad/trunk/armagetronad/src/engine/eVoter.h
armagetronad/trunk/armagetronad/src/network/nAuthentication.cpp
armagetronad/trunk/armagetronad/src/network/nNetwork.cpp
armagetronad/trunk/armagetronad/src/network/nNetwork.h
armagetronad/trunk/armagetronad/src/network/nSpamProtection.cpp
armagetronad/trunk/armagetronad/src/network/nSpamProtection.h
armagetronad/trunk/armagetronad/src/render/rFont.cpp
armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp
armagetronad/trunk/armagetronad/src/tools/tString.cpp
armagetronad/trunk/armagetronad/src/tron/gCycle.cpp
armagetronad/trunk/armagetronad/src/tron/gCycleMovement.cpp
armagetronad/trunk/armagetronad/src/tron/gGame.cpp
armagetronad/trunk/armagetronad/src/tron/gTeam.cpp
armagetronad/trunk/armagetronad/src/tron/gWall.cpp
armagetronad/trunk/armagetronad/src/tron/gWinZone.cpp
Modified: armagetronad/trunk/armagetronad/NEWS
===================================================================
--- armagetronad/trunk/armagetronad/NEWS 2008-04-25 16:45:31 UTC (rev 8440)
+++ armagetronad/trunk/armagetronad/NEWS 2008-04-25 18:00:53 UTC (rev 8441)
@@ -89,6 +89,10 @@
------------
New settings and commands:
+- MIN_PLAY_TIME_*: minimal play time required before you are allowed to
+ play on this server.
+- SPAM_AUTOKICK_COUNT: minimal number of spam warning messages you get in a
+ row before you get kicked.
- FORTRESS_COLLAPSE_SPEED: tune the collapse speed of fortress zones.
- VOTE_KICK_REASON: default reason given on kick votes.
- "/vote" chat interface to votes; "/vote kick <player>" issues a kick vote.
@@ -160,6 +164,14 @@
"[L] "
- PLAYER_MESSAGE <user ID or name> <Message>: Like /msg, but from the
console
+- All ladderlog outputs can be enabled or disabled separately by using
+ LADDERLOG_WRITE_*. LADDERLOG_WRITE_ALL enables or disables all ladderlog
+ output alltogether.
+- SLAP <player> [points] sends a message to everyone and subtracts a number
+ of points (default: 1) from <player>'s score. Negative points are
+ supported.
+- AUTO_TEAM_SPEC_SPAM to disable the spectator join/leave messages you get
+ when AUTO_TEAM is enabled
If --enable-armathentication was activated:
- ACCESS_LEVEL_IPS to let admins see IPs of players in the list.
@@ -179,11 +191,17 @@
- /lock, /unlock, /invite and /uninvite team management chat for players of
access level ACCESS_LEVEL_TEAM or better.
- /login chat command then uses the more secure hashed base logins
+- new chat commands /op and /deop to change other players' access rights
Featurelets
-----------
- /teams chat command that rougly prints team layout.
+- clientside play time tracking and server controlled minimal required experience
+ to be allowed to play.
+- color codes in chat increase the spam level logarithmically.
+- /team messages get a reduced spam level; reduction factor is given by
+ (team size)/(number of total players).
- /team messages can be used by spectators to chat with other spectators only.
- Performance optimizations. Using OpenGL display lists to cache geometry.
- Removed ztrick, antialiasing and perspective correction settings. They all had only one right
@@ -247,6 +265,7 @@
- /help command that supports multiple help topics. Use
HELP_INTRODUCTORY_BLURB and ADD_HELP_TOPIC to control its contents
- /rtfm command that allows moderators to send help messages to newbies
+- /players now shows the players' color and allows searching
Bugfixes
--------
Modified: armagetronad/trunk/armagetronad/config/default.cfg
===================================================================
--- armagetronad/trunk/armagetronad/config/default.cfg 2008-04-25 16:45:31 UTC (rev 8440)
+++ armagetronad/trunk/armagetronad/config/default.cfg 2008-04-25 18:00:53 UTC (rev 8441)
@@ -6,6 +6,12 @@
SERVER_NAME Unnamed Server
CM_LOCY -0.5
+# no play time
+PLAY_TIME_TOTAL 0
+PLAY_TIME_MULTIPLAYER 0
+PLAY_TIME_TEAM 0
+
+# default keyboard layout
KEYBOARD 333 PLAYER_BIND ZOOM_OUT 1
KEYBOARD 332 PLAYER_BIND ZOOM_IN 1
KEYBOARD 327 PLAYER_BIND BANK_DOWN 1
Modified: armagetronad/trunk/armagetronad/config/settings_authentication.cfg
===================================================================
--- armagetronad/trunk/armagetronad/config/settings_authentication.cfg 2008-04-25 16:45:31 UTC (rev 8440)
+++ armagetronad/trunk/armagetronad/config/settings_authentication.cfg 2008-04-25 18:00:53 UTC (rev 8441)
@@ -181,12 +181,12 @@
ACCESS_LEVEL_RTFM 2
-# To use the /op, /dop, /promote and /demote ad-hoc access level modifying
+# To use the /op and /deop ad-hoc access level modifying
# commands, you need ot have at least
ACCESS_LEVEL_OP 7
-# and these commands cannot raise the level of a user above
+# and that command cannot directly raise the level of a user above
ACCESS_LEVEL_OP_MAX 2
Modified: armagetronad/trunk/armagetronad/config/settings_dedicated.cfg
===================================================================
--- armagetronad/trunk/armagetronad/config/settings_dedicated.cfg 2008-04-25 16:45:31 UTC (rev 8440)
+++ armagetronad/trunk/armagetronad/config/settings_dedicated.cfg 2008-04-25 18:00:53 UTC (rev 8441)
@@ -172,9 +172,10 @@
SPAM_PROTECTION 4.0 # minimum average time between chat messages in seconds so they are not considered spamming. Increase for more spam protection.
SPAM_PROTECTION_VOTE 50.0 # Extra factor for SPAM_PROTECTION for votes. Increase for more spam protection.
-SPAM_PROTECTION_CHAT 1.0 # Extra factor for SPAM_PROTECTION for chat messages. Increase for more spam protection.
-SPAM_PENALTY 3.0 # spam penalty to add on spam detection
+SPAM_PROTECTION_CHAT .3 # Extra factor for SPAM_PROTECTION for chat messages. Increase for more spam protection.
+SPAM_PENALTY 0.0 # spam penalty to add on spam detection. This makes repeated spams extra painful.
SPAM_AUTOKICK 14.0 # spam protection value that causes someone to get instantly kicked
+SPAM_AUTOKICK_COUNT 3 # minimal number of spam warnings before someone is kicked for spam.
SPAM_MAXLEN 80 # maximal length of chat message
# voting
@@ -229,6 +230,17 @@
DEFAULT_KICK_TO_SERVER # default server to kick/move to (IP or hostname)
DEFAULT_KICK_TO_PORT 4534 # default port of the server to kick/move to
+# Minimal play time requirements. Clients starting from 0.2.8.3 record the play time
+# in three categories: total play time (all games count), online play time (games on
+# a server count) and team play time (only online games with teammates count).
+# With the following settings, you can keep players lacking experience in these
+# categories out of the game. Players not meeting the requirements will be forced
+# to spectate.
+
+MIN_PLAY_TIME_TOTAL 0.0 # required total play time in minutes
+MIN_PLAY_TIME_ONLINE 0.0 # required online play time in minutes
+MIN_PLAY_TIME_TEAM 0.0 # required team play time in minutes
+
############################################################################################
#
# Game settings
Modified: armagetronad/trunk/armagetronad/language/english_base.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/english_base.txt 2008-04-25 16:45:31 UTC (rev 8440)
+++ armagetronad/trunk/armagetronad/language/english_base.txt 2008-04-25 18:00:53 UTC (rev 8441)
@@ -197,11 +197,22 @@
auto_team_help Flag indicating whether players should be put into teams automatically.
no_spectators_allowed Sorry, does not work with automatic team assignment.\n
+auto_team_spec_spam_help If set to 0, spectators won't be announced when joining or leaving, provided AUTO_TEAM is set to 0.
allow_team_name_color_help Allow a team to be named after a color
allow_team_name_player_help Allow a team to be named after the leading player
allow_team_name_leader_help Set to 1 to allow team leader to set a team, 0 otherwise.
+play_time_total_help Total time in minutes someone has played with this client
+play_time_online_help Total time in minutes someone has played with this client online
+play_time_team_help Total time in minutes someone has played with this client in a team
+min_play_time_total_help Total play time in minutes required to play here
+min_play_time_online_help Online play time in minutes required to play here
+min_play_time_team_help Team play time in minutes required to play here
+play_time_total_lacking You cannot play here; first, you need to get more general experience. Play somewhere else (local games count) for \1 minutes, then you can come back here and play.\n
+play_time_online_lacking You cannot play here; first, you need to get more online experience. Play on other servers for \1 minutes, then you can come back here and play.\n
+play_time_team_lacking You cannot play here; first, you need to get more team play experience. Play on other team servers for \1 minutes, then you can come back here and play.\n
+
team_name_1_help name of team 1
team_name_2_help name of team 2
team_name_3_help name of team 3
@@ -370,6 +381,7 @@
spam_penalty_help Number of seconds to silence a spammer.
spam_maxlen_help Maximal length of chat message.
spam_autokick_help Spam score that causes you to get kicked instantly.
+spam_autokick_count_help Number of spam warnings before a player gets spamkicked.
silence_all_help If set to 1, new players will be silenced
enable_chat_help If set to 0, all chat will be surpressed (if reset on the server, messages from logged in players and private/team messages are still shown)
allow_team_change_help If set to 1, all players can change teams. If set to 0, players can only change teams if they've been specifically allowed to by ALLOW_TEAM_CHANGE_PLAYER
@@ -688,6 +700,10 @@
console_decorate_id_help Decorates every line of console output with the client ID
console_decorate_ip_help Decorates every line of console output with the client IP
console_ladder_log_help Sends ladder log output to the console
+ladderlog_write_all_help Set all the LADDER_LOG_WRITE_* settings to the same value
+ladderlog_write_all_usage Usage: LADDER_LOG_WRITE_ALL 1|0
+ladderlog_write_all_enabled Enabled full ladderlog output.
+ladderlog_write_all_disabled Disabled ladderlog output.
ladderlog_game_time_interval If nonnegative, write a line with the current game time to the ladder log every n seconds.
show_fps_help Enable fps display
floor_mirror_help Floor mirror mode
@@ -845,6 +861,8 @@
ban_list_help Prints a list of currently banned IPs.
unban_ip_help Revokes the ban of the specified IP address.
+player_list_hidden_player_prefix_help The prefix that is shown on hidden players' Global ID and access level when we can see it.
+
# communication
console_message_help Prints a message on the console of all connected clients.
center_message_help Prints a big message on the screen of all connected clients.
@@ -2218,6 +2236,9 @@
instant_death_activated Death zone activated! Avoid it!\n
player_admin_kill \1 0xRESETTwas smitten by an administrator.\n
+player_admin_slap_free \1 0xRESETThas been slapped by an administrator.\n
+player_admin_slap_win \1 has been hugged by an administrator and got \2 points.\n
+player_admin_slap_lose \1 has been slapped by an administrator and lost \2 points.\n
player_win_instant \1 was awarded \2 points for hitting the instant win zone.\n
player_win_conquest \1 was awarded \2 points for conquering the enemy base.\n
player_win_held_fortress \1 was awarded \2 points for holding the base.\n
@@ -2314,8 +2335,7 @@
remove_help_topic_success Removed help topic "\1".\n
remove_help_topic_notfound Help topic "\1" doesn't exist.\n
-rtfm_announcement \1 wants you to know about the following help topic:\n
-rtfm_success \1 got the following message:\n
+rtfm_announcement \2 wants \3 to know about /help \1.\n
help_introductory_blurb_help Message that is displayed before the list of help topics if someone uses /help without arguments
@@ -2332,11 +2352,10 @@
help_commands_team_text 0x88ff88/teamshuffle0xffff88: Shuffle yourself to be at the outside of your team's wingmen formation\n0x88ff88/teamshuffle <position>0xffff88: Shuffle yourself to be at a specific position\n0x88ff88/teamshuffle [+|-]<offset>0xffff88: Shuffle yourself up/down by a certain number of ranks\n0x88ff88/teamleave0xffff88: Leave your current team. Only works on some servers\n0x88ff88/teams0xffff88: Get a list of all teams with a somewhat graphic representation of their formation
help_commands_pp_shortdesc Player police commands
-help_commands_pp_text 0x88ff88/players0xffff88: Get a list of all players, along with some other information\n0x88ff88/vote kick|suspend <player>0xffff88: Start a poll to kick or suspend a player
+help_commands_pp_text 0x88ff88/players [<search>]0xffff88: Get a list of all players, along with some other information. You can also match specific users with the search argument.\n0x88ff88/vote kick|suspend <player>0xffff88: Start a poll to kick or suspend a player
help_commands_auth_shortdesc Authentication related commands
-help_commands_auth_text 0x88ff88/login [<user>]@<authority>0xffff88: Authenticate yourself using a given authority. Try @forums if you have an account at http://forums.armagetronad.net/\n0x88ff88/logout0xffff88: Log out so you can log back in as another player\n0x88ff88/vote include <file>0xffff88: Start a poll to include a given file\n0x88ff88/vote command <command>0xffff88: Start a poll to execute an admin command\n0x88ff88/admin <command>0xffff88: Execute a console command on the server if you have sufficient access rights\n0x88ff88/op <player> <optional access level>0xffff88: Gives another player a higher access level; the level defaults to the level one lower than you access level, which is also the maximal possible level\n0x88ff88/deop <player>0xffff88: Reverses /op; it takes away a player's access level, effectively making him unauthenticated again. Only works on players of lower access level than yours, of course.\n0x88ff88/promote <player> <optional steps>0xffff88: elevates a player's access level the given number of steps (default: one)\n0x88ff88/demote <player> <optional steps>0xffff88: lowers a player's access level the given number of steps (default: one)
-
+help_commands_auth_text 0x88ff88/login [<user>]@<authority>0xffff88: Authenticate yourself using a given authority. Try @forums if you have an account at http://forums.armagetronad.net/\n0x88ff88/logout0xffff88: Log out so you can log back in as another player\n0x88ff88/vote include <file>0xffff88: Start a poll to include a given file\n0x88ff88/vote command <command>0xffff88: Start a poll to execute an admin command\n0x88ff88/admin <command>0xffff88: Execute a console command on the server if you have sufficient access rights\n0x88ff88/op <player> [+|-]<optional access level>0xffff88: Gives another player a higher or a lower access level; the level defaults to the level one lower than you access level, which is also the maximal possible level\n0x88ff88/deop <player>0xffff88: Reverses /op; it takes away a player's access level, effectively making him unauthenticated again. Only works on players of lower access level than yours, of course.\n
help_commands_auth_levels_shortdesc List of all access levels
help_commands_auth_levels_text 0x88ff880 (Owner)0xffff88: The owner of the server. Commands entered on the server console are executed with these rights.\n0x88ff881 (Admin)0xffff88: A server administrator. By default, almost as powerful as the owner himself.\n0x88ff882 (Moderator)0xffff88: A server moderator. Is still allowed to use /admin, but is restricted to player management commands.\n0x88ff887 (Team Leader)0xffff88: Leader of a team. By default, no admin rights at all.\n0x88ff888 (Team Member)0xffff88: Member of a team. Local team accounts get this level.\n0x88ff8812 (Local User)0xffff88: Players with local accounts get this level.\n0x88ff8815 (Remote User)0xffff88: Players with remote accounts get this level by default.\n0x88ff8816 (Fallen from Grace)0xffff88: Authenticated players who ab...
[truncated message content] |