Revision: 10060
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10060&view=rev
Author: z-man
Date: 2011-10-21 16:42:30 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 10055 to 10059:
------------------------------------------------------------------------
r10059 | bazaaarmagetron | 2011-10-21 18:11:32 +0200 (Fri, 21 Oct 2011) | 2 lines
Manuel Moos: Bigger documentation update.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10055&view=revhttp://armagetronad.svn.sourceforge.net/armagetronad/?rev=10059&view=rev
Modified Paths:
--------------
armagetronad/branches/0.4/armagetronad/src/doc/Makefile.am
armagetronad/branches/0.4/armagetronad/src/doc/index.html.m4
armagetronad/branches/0.4/armagetronad/src/doc/network.html.m4
armagetronad/branches/0.4/armagetronad/src/doc/versions.html.m4
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-10055
/armagetronad/branches/0.2.8.3:9309-10004
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10059
/armagetronad/branches/0.2.8.3:9309-10004
Modified: armagetronad/branches/0.4/armagetronad/src/doc/Makefile.am
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/Makefile.am 2011-10-21 16:11:32 UTC (rev 10059)
+++ armagetronad/branches/0.4/armagetronad/src/doc/Makefile.am 2011-10-21 16:42:30 UTC (rev 10060)
@@ -30,20 +30,20 @@
# install generated html files and put them directly into the distribution
textdir=$(aa_datadir)/doc
-text_DATE=$(doc_txt_files)
+text_DATA=$(doc_txt_files)
htmldir=$(aa_datadir)/doc
html_DATA=$(doc_html_files)
distclean-local:
rm -f COPYING.txt
-dist-hook: htmldist-hook ${srcdir}/commands.txt ${doc_html_files}
+dist-hook: htmldist-hook ${srcdir}/commands.txt ${docfiles}
cp ${srcdir}/commands.txt $(distdir)
cp -R ${srcdir}/Content_Creation $(distdir)
cp -R ${doc_html_files} $(distdir)
# make target for testing documentation without installing
-localtest: all Howto-Maps.txt
+localtest: all Howto-Maps.txt ${docfiles}
Howto-Maps.txt:
ln -s ${srcdir}/Content_Creation/$@ $@
Modified: armagetronad/branches/0.4/armagetronad/src/doc/index.html.m4
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/index.html.m4 2011-10-21 16:11:32 UTC (rev 10059)
+++ armagetronad/branches/0.4/armagetronad/src/doc/index.html.m4 2011-10-21 16:42:30 UTC (rev 10060)
@@ -106,10 +106,11 @@
about PROGTITLE and the latest stable builds. Check out the
ELINK([forums.armagetronad.net/],Forums) for keeping in touch with
current development and venting your anger that we broke your favorite feature
-in the current release. Visit the
+in the current release. Check the ELINK([wiki.armagetronad.net],Wiki) for community maintained documentation, the pages you're reading right now only scratch the surface. Visit the
ELINK(sourceforge.net/projects/armagetronad/,SourceForge project page) to get
-informed by email or RSS when a new release is out. Get the latest
-alpha and beta builds on ELINK(beta.armagetronad.net/,AABeta).
+informed by email or RSS when a new release is out. Most of our current development is managed
+on ELINK(launchpad.net/armagetronad,Launchpad). Get the latest
+snapshot builds in various flavors from ELINK(sourceforge.net/projects/armagetronad/files/snapshots/,the SourceForge file release system).
])
SECTION(Credits:)
@@ -140,8 +141,7 @@
This program is free software; you can redistribute it and/or
modify it under the terms of the
LINK(COPYING.txt,GNU General Public License)
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+as published by the Free Software Foundation, version 2.
])
PARAGRAPH([
Modified: armagetronad/branches/0.4/armagetronad/src/doc/network.html.m4
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/network.html.m4 2011-10-21 16:11:32 UTC (rev 10059)
+++ armagetronad/branches/0.4/armagetronad/src/doc/network.html.m4 2011-10-21 16:42:30 UTC (rev 10060)
@@ -18,7 +18,7 @@
SUBSECTION(LAN game )
PARAGRAPH([
The fastest computer in your network should
-act as the server. There, go to the network menu and hit the "LAN Game"-
+act as the server. There, go to the "Play Game"/"Multiplayer" menu and hit the "LAN Game"-
menu item. After a second, PROGTITLE should tell you that there are no servers
currently available, but offer a "Host Game" item. Press Return on it. In
the following menu, you can select a name for your server and the game options.
@@ -38,7 +38,7 @@
SUBSECTION(Internet game)
PARAGRAPH([
-An internet game works the same way; you just have to choose "Internet Game" instead of "LAN Game"
+An internet game works the same way; you just have to choose "Online Game" instead of "LAN Game"
in the menu. Note that the number of users currently online on each server is displayed
by the server browser, too.
])
@@ -52,60 +52,29 @@
])
PARAGRAPH([Internet server browsing would not be possible without master servers. We currently
-use four masters,
-one in Texas run by Lucifer, one in Virginia run by antix of
-ELINK(distortgaming.com,DistortGaming)
-(Who will gladly host your game server, Armagetronad or other. Shameless plug end.)
-one run on Z-Man's old, trusty laptop-gone-router in Germany, and another one in Germany run
-by iF.
+use four masters, two run by Tank Program, two by Z-Man.
DNS service for swapping out masters without you having to update your configuration
is provided by Tank.])
SUBSUBSECTION(Current status)
PARAGRAPH([
-Current counts show about 40 active servers.
+Current counts show about 200 active servers.
If you're not picky about your fellow players, there should be
someone to battle against on one of those. The problems start as soon as you
develop a preference for certain server settings, because there are quite a
number of flavors around.
])
-ifelse(,,,
-[
-PARAGRAPH([
-At the time of this writing, there are about ten dedicated servers available, so you should
-not need to start your own. Most of them will let you fight against a bunch of AIs
-while you wait for other players to join in.
-])
-
-PARAGRAPH([
-Finding an opponent to play against should not be a problem these times; nevertheless,
-there still is the ELINK(WEBBASE/meeting.html, meeting
-page). Check it out, be online when the countdown reaches zero and
-you will certainly find another player online. I'm usually playing at these times and
-specially like to be on a server that allows cockpit view only.
-])
-])
-
SUBSECTION(Bookmarks,bookmarks)
PARAGRAPH([
You can access and edit your server bookmarks in the "Server Bookmarks"
submenu of the "Network Game" menu. You can add bookmarks from the server
-browser or manually add bookmarks via the "Edit Bookmarks" menu.
+browser or manually add bookmarks via the "Edit Bookmarks" menu. The only way to delete
+bookmarks currently is to edit out the server name of one, sorry for the inconvenience.
])
-ifelse(,,,[
-SUBSECTION(Fallback)
-
-PARAGRAPH([
-If the server browser does not work for some reason (i.e. no master server
-available), you can still connect to a server if you know its network address or
-hostname and the port it runs on. The "Custom Connect" menu item in the network
-game menu serves that purpose.])
-])
-
SUBSECTION(Version Control)
PARAGRAPH([
@@ -173,17 +142,21 @@
SUBSECTION(Chat)
PARAGRAPH([
Send your fellow players messages by hitting the chat key configurable in the "Player Setup" menu
-(defaults to "s"). Usually, the message will go out to all players. Servers from 0.2.8.0 on support
+(defaults to "Enter"). Usually, the message will go out to all players. Servers from 0.2.8.0 on support
IRC style extensions: By starting your message with "/msg <playername>", you can send selected
players personal messages. With "/me", you can tell the others what you do; "/me falls asleep"
-will print "Walruss walls asleep" if you're Walruss.
+will print "Walruss walls asleep" if you're Walruss. "/team" sends messages to your
+teammates only; if you're a spectator, those will be the other spectators. Some servers make
+that the default chat mode even without command prefix; on those, you may be allowed to address
+all players by using "/shout".
])
PARAGRAPH([
If another player annoys you, the silencing menu comes in handy: it can be reached by
pressing ESC, then selecting "Player Police/Silence Menu". If you're annoyed by chat in
-general, edit FILE(settings.cfg) and activate SILENCE_ALL. This has the effect that new
-players get silenced by default and have to be unsilenced if you want to hear them.
+general, edit FILE(settings.cfg) and activate SILENCE_DEFAULT (add the line SILENCE_DEFAULT 1).
+This has the effect that new players get silenced by default and have to be unsilenced
+if you want to hear them. If you really never want to hear chat, add the line ENABLE_CHAT 0.
])
SUBSUBSECTION(Instant Chat)
Modified: armagetronad/branches/0.4/armagetronad/src/doc/versions.html.m4
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/versions.html.m4 2011-10-21 16:11:32 UTC (rev 10059)
+++ armagetronad/branches/0.4/armagetronad/src/doc/versions.html.m4 2011-10-21 16:42:30 UTC (rev 10060)
@@ -14,7 +14,10 @@
TROW2(0.2.8.0_beta2,7 )
TROW2(0.2.8.0_beta3,8 )
TROW2(0.2.8.0_beta4,9 )
-TROW2(0.2.8.0 - ,10 )
+TROW2(0.2.8.0_rcX,10 )
+TROW2(0.2.8.0,11 )
+TROW2(0.2.8.2,13 )
+TROW2(0.2.8.3,16 )
],cellpadding="5" border="1")
])
@@ -29,12 +32,18 @@
TROW2(6,[Client support for server formatted chat messages.])
TROW2(7,[Doublebind countermeasures. Proper cycle speed and acceleration handling and syncing.])
TROW2(8,[Server bugfix: turns that were accepted from the client, but not yet executed, are not claimed to be executed in sync messages.])
-TROW2(10,[New server controlled voting items to add voting items that only require code on the server.])
+TROW2(10,[New server controlled voting items to add voting items that only require code on the server (code was broken and is no longer used).])
+TROW2(11,[No actual change, just the bump to 0.2.8.])
+TROW2(12,[Again, no actual change to be found. Z-Man wonders why.])
+TROW2(13,[Spectators can now be visible and chat, clients no longer send redundant brake commands.])
+TROW2(14,[Clientside lag compensation and server controlled ping charity, fullscreen messages.])
+TROW2(15,[Player authentication, new fixed version of the server controlled vote items.])
+TROW2(16,[Bugfix: clients no longer get confused if they have to move a cycle backwards during a sync from the server.])
],cellpadding="5" border="1")
])
PARAGRAPH([
-Note: Some protocol versions were only available in CVS, so not every protocol version corresponds to a PROGTITLE version.
+Note: Some protocol versions were only available in CVS/SVN/BZR, so not every protocol version corresponds to a PROGTITLE version. Likewise, not every version had a network protocol change.
])
include(sig.m4)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10064
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10064&view=rev
Author: z-man
Date: 2011-10-21 18:50:45 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 10059 to 10063:
------------------------------------------------------------------------
r10063 | bazaaarmagetron | 2011-10-21 20:03:45 +0200 (Fri, 21 Oct 2011) | 2 lines
Manuel Moos: More documentation updates. Should be the last big one for this branch.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=10059&view=revhttp://armagetronad.svn.sourceforge.net/armagetronad/?rev=10063&view=rev
Modified Paths:
--------------
armagetronad/branches/0.4/armagetronad/src/doc/HtmlMakefile
armagetronad/branches/0.4/armagetronad/src/doc/Makefile.am
armagetronad/branches/0.4/armagetronad/src/doc/compile.html.m4
armagetronad/branches/0.4/armagetronad/src/doc/config.html.m4
armagetronad/branches/0.4/armagetronad/src/doc/faq.html.m4
armagetronad/branches/0.4/armagetronad/src/doc/install_linux.html.m4
armagetronad/branches/0.4/armagetronad/src/doc/install_result.html.m4
armagetronad/branches/0.4/armagetronad/src/doc/install_windows.html.m4
armagetronad/branches/0.4/armagetronad/src/doc/network.html.m4
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-10059
/armagetronad/branches/0.2.8.3:9309-10004
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10063
/armagetronad/branches/0.2.8.3:9309-10004
Modified: armagetronad/branches/0.4/armagetronad/src/doc/HtmlMakefile
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/HtmlMakefile 2011-10-21 18:03:45 UTC (rev 10063)
+++ armagetronad/branches/0.4/armagetronad/src/doc/HtmlMakefile 2011-10-21 18:50:45 UTC (rev 10064)
@@ -15,9 +15,9 @@
if HAVE_M4
%.html : $(srcdir)/%.html.m4 %.html.dep $(htmlm4) Makefile
if DATE_R
- { echo "define(CHANGEDATE,`date +"%b %d %Y" -r $<`) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@
+ { echo "define(CHANGEDATE,`date +"%b %d %Y" -r $<`) include($(htmlm4)) include($<)" ; } | m4 -I ${srcdir} > $@ || cp $< $@
else
- { echo "define(CHANGEDATE,`date +"%b %d %Y"`) include($(htmlm4))" ; cat $< ; } | m4 -I ${srcdir} > $@ || cp $< $@
+ { echo "define(CHANGEDATE,`date +"%b %d %Y"`) include($(htmlm4)) include($<)" ; } | m4 -I ${srcdir} > $@ || cp $< $@
endif
%.dep: %.m4 Makefile
Modified: armagetronad/branches/0.4/armagetronad/src/doc/Makefile.am
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/Makefile.am 2011-10-21 18:03:45 UTC (rev 10063)
+++ armagetronad/branches/0.4/armagetronad/src/doc/Makefile.am 2011-10-21 18:50:45 UTC (rev 10064)
@@ -21,7 +21,7 @@
$(srcdir)/commands.txt: ${top_srcdir}/language/*
rm -f $@
- cd $(top_builddir)/src && $(MAKE) armagetronad_main$(EXEEXT) && cd .. && ./src/armagetronad_main$(EXEEXT) --doc --userdatadir /doesnotexist 2>&1 | sed -e "s,^\[0\] ,," | grep -v "_help$$" | grep -v "^changed" | grep -v "^Executable path: " | grep -v "^TestPath" | grep -v "^Testing data path: " | grep -v "^Testing configuration path: " | grep -v "^Closing socket" | grep -v "^Locale item" > src/doc/commands.txt || true
+ cd $(top_builddir)/src && $(MAKE) armagetronad_main$(EXEEXT) && cd .. && ./src/armagetronad_main$(EXEEXT) --vardir ./rubbish --doc 2>&1 | sed -e "s,^\[0\] ,," | grep -v "_help$$" | grep -v "^changed" | grep -v "^Executable path: " | grep -v "^TestPath" | grep -v "^Testing data path: " | grep -v "^Testing configuration path: " | grep -v "^Closing socket" | grep -v "^Locale item" > src/doc/commands.txt || true
test -r commands.txt || echo "Sorry, command help generation failed." > commands.txt
test -r $@ || mv commands.txt $@
Modified: armagetronad/branches/0.4/armagetronad/src/doc/compile.html.m4
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/compile.html.m4 2011-10-21 18:03:45 UTC (rev 10063)
+++ armagetronad/branches/0.4/armagetronad/src/doc/compile.html.m4 2011-10-21 18:50:45 UTC (rev 10064)
@@ -29,9 +29,9 @@
SECTION(Packaging)
PARAGRAPH([
-We manage distribution building with an additional CVS module we don't put into regular releases;
-it is called FILE(armagetronad_build) and also hosted at SourceForge. Get it with
-CMDLINE(CVSROOT=:pserver:anonymous@...:/cvsroot/armagetronad co armagetronad_build)
+We manage distribution building with an additional module we don't put into regular releases;
+it is called FILE(build) and also hosted at Launchpad. Get it with
+CMDLINE(bzr branch http://bazaar.launchpad.net/%7Earmagetronad-dev/armagetronad/0.2.8-build-work/)
enter it and type FILE(make) once to configure it to your system. Edit FILE(make.conf) to put
in the missing details. Then, drop a tarball from our distribution into the FILE(tarballs)
subdirectory and use FILE(make) to build the package of your choice. See the enclosed README.txt
Modified: armagetronad/branches/0.4/armagetronad/src/doc/config.html.m4
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/config.html.m4 2011-10-21 18:03:45 UTC (rev 10063)
+++ armagetronad/branches/0.4/armagetronad/src/doc/config.html.m4 2011-10-21 18:50:45 UTC (rev 10064)
@@ -16,10 +16,10 @@
SUBSUBSECTION(Main Menu)
<ul>
-MI(Game,start and setup a game)
+MI(Play Game,start and setup a game)
<ul>
+MI(Multiplayer,Connects to or creates a network game)
MI(Local Game,Starts a local game)
-MI(Network Game,Connects to or creates a network game)
MI(Game Setup,Sets your favourite single player game mode: number of AI opponents, game speed, arena size)
</ul>
MI(Player Setup,Player customisation: [keyboard input, camera setup, multiplayer
@@ -32,6 +32,7 @@
MI(Camera Setup,camera mode options)
MI(Instant Chat,things you can say with one keystroke)
</ul>
+MI(Viewports,selects the splitscreen mode)
MI(Assign Viewports To Players,which player sees himself on which part of
the screen)
</ul>
@@ -45,6 +46,7 @@
system's OpenGL power)
MI(Performance Tweaks,[settings that increase graphics speed, but
may not work on your system])
+MI(Load Defaults,[Reverts critical settings to default values we believe to be safe.])
</ul>
MI(Sound Settings,sound quality)
MI(Misc Stuff,things that did not fit anywhere else: [Moviepack, console text
@@ -52,6 +54,7 @@
<ul>
MI(Global Keyboard Configuration,[keyboard setup for player-independent functions (console, scores)])
MI(Language settings,[Choose the language of PROGTITLE here])
+MI(Redo First Setup,[Repeats the simple setup you saw when first starting the game])
</ul>
</ul>
</ul>
@@ -135,10 +138,14 @@
SUBSECTION(Protect Your Passwords)
PARAGRAPH([
Since all network traffic is logged and the ingame admin password is currently sent unencrypred,
-it is not a good idea to publish server recordings where you or anyone else logs in as admin.
+it is not a good idea to publish server recordings where you or anyone else logs in as admin using the old SI(ADMIN_PASS) method.
The same holds for a client session recording where you log in anywhere; remember that all your
-keypresses are recorded without exception.
+keypresses are recorded almost without exception.
])
+PARAGRAPH([
+Everything surrounding the new account based authentication is safe, though. Keypresses in the pasword entry form are not recorded and passwords stored in your user.cfg are not copied over, either.
+])
+
SUBSECTION(Primary Use: Bug Reports)
PARAGRAPH([
Sometimes, when you report a bug, the team may ask you do send a recording of
@@ -174,7 +181,7 @@
Take a look at the files
FILE(settings.cfg) and FILE(settings_dedicated.cfg) for the dedicated server
(best save all your changes to
-FILE(autoexec.cfg) if you don't want the next
+FILE(autoexec.cfg) or FILE(settings_custom.cfg) if you don't want the next
release of PROGTITLE to overwrite them). They contain a lot of settings
inaccessible from the menu system. All relevant settings are synced from the
server to the connected clients.
Modified: armagetronad/branches/0.4/armagetronad/src/doc/faq.html.m4
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/faq.html.m4 2011-10-21 18:03:45 UTC (rev 10063)
+++ armagetronad/branches/0.4/armagetronad/src/doc/faq.html.m4 2011-10-21 18:50:45 UTC (rev 10064)
@@ -73,13 +73,7 @@
],
[
You probably installed a binary version of PROGTITLE that is incompatible with your system.
-Check if you have installed all the required LINK(install_linux.html#libs
-,libraries).
-One of the ELINK(armagetron.sf.net/download_linux.html#thirdparty
-,[third party packages]) may fit better to your system.
-Or, if you want the latest version, try installing from source.<br>
-If you installed PROGTITLE from a RPM without warnings, that RPM is broken; please
-ELINK([armagetron.sf.net/contact.html],inform me) about it.
+If you consider your system reasonably up to date, this is probably a bug you should report.
])
ifelse(,,,[
Modified: armagetronad/branches/0.4/armagetronad/src/doc/install_linux.html.m4
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/install_linux.html.m4 2011-10-21 18:03:45 UTC (rev 10063)
+++ armagetronad/branches/0.4/armagetronad/src/doc/install_linux.html.m4 2011-10-21 18:50:45 UTC (rev 10064)
@@ -27,7 +27,7 @@
SECTION(Required libraries,libs)
ULIST([
-ITEM(ELINK(http://www.xmlsoft.org/,LibXML2) version 2.6.0 (some binaries: 2.6.12) or later for map file parsing)
+ITEM(ELINK(www.xmlsoft.org/,LibXML2) version 2.6.0 (some binaries: 2.6.12) or later for map file parsing)
ITEM([OpenGL or ELINK(mesa3d.sourceforge.net/,Mesa) for rendering])
ITEM(ELINK(www.libsdl.org,SDL) version 1.2.x (Simple Direct Media Layer) for input and sound output)
ITEM(ELINK(www.freetype.org,FreeType 2) for font loading)
@@ -37,13 +37,8 @@
which itself needs the libs)
ITEM(ELINK(www.libpng.org/pub/png/pngcode.html,pnglib and zlib)
(they should be included in your distribution))
-ITEM([Binary versions only: libstdc++ 5.0.7 (any 5.x.y or whatever came with
-your System if it uses GCC 3.2 or higher should do). Use
-ELINK([rpmfind.net/linux/rpm2html/search.php?query=libstdc%2B%2B&submit=Search+...&system=&arch=],rpmfind)
-or
-ELINK([www.google.com/search?hl=en&lr=&q=libstdc%2B%2B+5.0.7&btnG=Search],google)
-to find a RPM with that library for your system. Sorry, Debian users: I don't know what you need to do; use the
-source packages instead.])
+ITEM([Binary versions only: libstdc++.so.6 (any version that came with
+your System if it uses GCC 4.1 or higher should do).])
])
SECTION(Optional libraries,libs_opt)
@@ -78,6 +73,7 @@
resolve; the goal is to make it work on as many systems as possible.
])
+ifelse(,,,
SUBSECTION(Binary RPM,rpm)
PARAGRAPH([
Type CMDLINE(rpm -i filename.rpm) The RPM build is quite untested, so it may be
@@ -109,6 +105,7 @@
if not likely, that the automatic dependency generation of RPM produces
junk.)
])
+)
SUBSECTION(Non-Root install)
PARAGRAPH([
Modified: armagetronad/branches/0.4/armagetronad/src/doc/install_result.html.m4
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/install_result.html.m4 2011-10-21 18:03:45 UTC (rev 10063)
+++ armagetronad/branches/0.4/armagetronad/src/doc/install_result.html.m4 2011-10-21 18:50:45 UTC (rev 10064)
@@ -46,28 +46,28 @@
PARAGRAPH([
containing ONLY files and no subdirectories.
-When you have run PROGTITLE, you'll see the additional files
+dnl When you have run PROGTITLE, you'll see the additional files
])
-<table>
-FI([highscores.txt,ladder.txt,won_matches.txt and won_rounds.txt],
-score statistics files)
-FI(user.cfg,PROGTITLE custom configuration file)
-</table>
+dnl <table>
+dnl FI([highscores.txt,ladder.txt,won_matches.txt and won_rounds.txt],
+dnl score statistics files)
+dnl FI(user.cfg,PROGTITLE custom configuration file)
+dnl </table>
-PARAGRAPH([
-Inside VAR,
-You may want to create your own
-<a href="config.html#files">configuration files</a>
-])
+dnl PARAGRAPH([
+dnl Inside VAR,
+dnl You may want to create your own
+dnl <a href="config.html#files">configuration files</a>
+dnl ])
-<table>
-FI(autoexec.cfg,config file read at every start)
-</table>
-inside VAR or the
-FILE(config) subdirectory for your
-custom modifications; that way, they don't get overwritten by the defaults the
-next time you install an update.
+dnl <table>
+dnl FI(autoexec.cfg,config file read at every start)
+dnl </table>
+dnl inside VAR or the
+dnl FILE(config) subdirectory for your
+dnl custom modifications; that way, they don't get overwritten by the defaults the
+dnl next time you install an update.
define(CL,<tr><td valign=top width=200><strong>$1</strong> </td><td>$2</td></tr>)
Modified: armagetronad/branches/0.4/armagetronad/src/doc/install_windows.html.m4
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/install_windows.html.m4 2011-10-21 18:03:45 UTC (rev 10063)
+++ armagetronad/branches/0.4/armagetronad/src/doc/install_windows.html.m4 2011-10-21 18:50:45 UTC (rev 10064)
@@ -34,40 +34,6 @@
define(DOCSTYLE_RESULT,windows)
include(install_result.html.m4)
-SECTION(OpenGL Driver)
-PARAGRAPH([
-PROGTITLE uses OpenGL for the 3D graphics. A software implementation of OpenGL comes
-with all Windows versions and PROGTITLE can use it. Of course, if you have a 3D accelerator card,
-you want to use that; usually, when you installed the driver for your card, an accelerated implementation
-of OpenGL was registered with Windows.
-])
-PARAGRAPH([
-If you experience problems with the graphics or if PROGTITLE does not even start correctly, try
-installing the most recent drivers for your graphics card you can find.])
-
-SUBSUBSECTION(Special notes for VooDoo addon cards (i.e. VooDoo 1,VooDoo 2):)
-PARAGRAPH([
- A small problem here: the standard OPENGL32.DLL has no hardware
- acceleration. Instead, 3DFX supplies you with a file called
- 3dfxVGL.DLL [or 3dfxOGL.DLL] (found in your windows\system folder).
- Simply copy (drag it with the right mouse button and select "copy" from the
- pop-up-menu) it into the folder "PROGNAME.exe" is in and rename it
- there to "OPENGL32.DLL". Then, "PROGNAME.exe" will use this file
- instead of Microsoft's standard OPENGL32.DLL. If you cannot find
- 3dfxVGL.DLL or 3dfxOGL.DLL, you should first check whether you can
- find ANY .DLL files in the folder; if not, you'll have to enable
- the item "show all files" (or similar) in the folder options.
- <br>
- If you have problems with that procedure or get crashes in glide3x.*,
- ELINK(WEBBASE/download/opengl32.zip,download this working version) for VooDoo 2 (maybe 1)
- and unpack it into your PROGTITLE directory. According to the driver, you
- need at least Glide 2.56 installed; it really should work if you use
- the driver version 3.02.02 (or higher?).
-])
-
-You need to be in 16 bit colour depth mode to run PROGTITLE on some cards
-(Riva 128, some VooDoos).
-
include(sig.m4)
include(navbar.html.m4)
</body>
Modified: armagetronad/branches/0.4/armagetronad/src/doc/network.html.m4
===================================================================
--- armagetronad/branches/0.4/armagetronad/src/doc/network.html.m4 2011-10-21 18:03:45 UTC (rev 10063)
+++ armagetronad/branches/0.4/armagetronad/src/doc/network.html.m4 2011-10-21 18:50:45 UTC (rev 10064)
@@ -171,7 +171,10 @@
pressing the corresponding key will not send the string immediately, but will let you
append to it first.])
-SUBSECTION(Ingame Admin)
+SECTION(Authentication)
+SUBSECTION(The old way: ADMIN_PASS)
+PARAGRAPH([This paragraph applies if your server was compiled without --enable-armathentication.])
+PARAGRAPH([
The server administrator can allow selected players to control the server settings through chat
commands; the setting SI(ADMIN_PASS) has to be modified to a nondefault value. Whoever knows
this value can log in by saying "/login &lt;password&gt;". After that, it's possible to issue regular
@@ -179,8 +182,28 @@
<br>
<strong>WARNING: currently, chat messages and therefore the password are sent unencrypted. This
means that everyone with physical access to the network flow, which is, among others, anyone
-on the server's or the player's LAN, can steal the password.</strong>
+on the server's or the player's LAN, can steal the password.</strong>])
+SUBSECTION(The new way)
+PARAGRAPH([This paragraph applies if your server was compiled with --enable-armathentication.])
+PARAGRAPH([
+The new authentication code allows you to securely log into servers using various accounts;
+ check out the ELINK([wiki.armagetronad.net/index.php?title=HostingFAQ#Signing_in_.28Authentication.29],Wiki FAQ)
+for details.
+The quick and simple way to get an account you can use is if you sign up on the ELINK([forums.armagetronad.net],Forums);
+pick a simple username without fancy characters.
+Your Global ID (GID) associated with that account will then be "&lt;your username&gt;@forums".
+Enter that in the "Global ID" field of your "Player Setup" menu and activate "Auto Login".
+Every time you enter a server that supports authentication, you'll be prompted for your forum
+password.
+])
+PARAGRAPH([ If you administer a server with --enable-armathentication compiled in, you can
+grant yourself remote admin rights with the configuration line SI(USER_LEVEL &lt;your GID&gt; 0).
+Replace the 0 with your desired access level: 0 gives full access, 1 admin access (a few things
+like QUIT are locked, then) and 2 is moderator access, blocking most setting changes and only
+leaving commands required to moderate a server.
+])
+
SUBSECTION(Kicking and Banning)
PARAGRAPH([
You can kick players with the SI(KICK user) command; it accepts either the network user ID or
@@ -193,8 +216,7 @@
PARAGRAPH([
You can get a list of currently banned IP addresses with SI(BAN_LIST). To unban one of these,
use SI(UNBAN_IP ip). To ban an IP address explicitly, use SI(BAN_IP ip). Bans are persistent
-when you shut down and restart the server; the data is stored in FILE(var/bans.txt) as
-IP/duration in seconds pairs.
+when you shut down and restart the server; the data is stored in FILE(var/bans.txt).
])
SUBSUBSECTION([Autobanning])
PARAGRAPH([
@@ -213,7 +235,7 @@
will automatically pop up between rounds and remind you to vote. You can accept or reject
a suggestion, or explicitly say you don't care about it.
<br>
-The only thing possible to vote on are player kicks. To start a kick vote, press ESC and enter
+For example, to start a kick vote, press ESC and enter
the "Player Police/Kick Menu" menu and select the player you want kicked. Prepare to get kicked
yourself if you abuse the system.
@@ -224,20 +246,20 @@
a cycle itself, and CI(CYCLE_SYNC_INTERVAL_ENEMY) determines the interval for everyone else.
])
-New clients since 0.2.7.1 send the time of turn commands to the server.
+SECTION(Advanced Topics)
+
+PARAGRAPH([New clients since 0.2.7.1 send the time of turn commands to the server.
This makes it possible to avoid grinding lag sliding
(you move towards a wall, grind it shortly and turn away again, and you'll slide)
by letting the cycle on the server turn not before the time sent by the client.
At the low speeds before the grind, the positional command interpretion
is inaccurate and will usually turn the cycle too early.
- Now, old clients don't send the command time, so this code can't work. The lag sliding is a clear disadvantage, but the earlier turn is an advantage in some situations because it makes you cover more ground, so both the new and the old players have plenty of reason to complain if they are not treated equally. Therefore, when CYCLE_FAIR_ANTILAG is set to 1 and old clients are present, this code is deactivated.
+ Now, old clients don't send the command time, so this code can't work. The lag sliding is a clear disadvantage, but the earlier turn is an advantage in some situations because it makes you cover more ground, so both the new and the old players have plenty of reason to complain if they are not treated equally. Therefore, when CYCLE_FAIR_ANTILAG is set to 1 and old clients are present, this code is deactivated. ])
- When a cycle turns in free space, the server will try to follow the client's request by matching the turn position as closely as possible. Sometimes however there are large desyncs and clients sent silly turns halfway across the grid from their current position. So, for clients that send the command time, the server will execute turns only in a time window around that command time. The width of that window is determined by CYCLE_TIME_TOLERANCE.
+PARAGRAPH([ When a cycle turns in free space, the server will try to follow the client's request by matching the turn position as closely as possible. Sometimes however there are large desyncs and clients sent silly turns halfway across the grid from their current position. So, for clients that send the command time, the server will execute turns only in a time window around that command time. The width of that window is determined by CYCLE_TIME_TOLERANCE. ])
- I observed that old clients ( 0.2.7.0 and earlier ) would be more likely to pass through walls when they received a sync from the server shortly before. So, if you set CYCLE_AVOID_OLDCLIENT_BAD_SYNC to 1, the server will not send those syncs. Whether this helps or makes matters worse by not sending enough syncs is unknown, that's why it is a setting.
+PARAGRAPH([ I observed that old clients ( 0.2.7.0 and earlier ) would be more likely to pass through walls when they received a sync from the server shortly before. So, if you set CYCLE_AVOID_OLDCLIENT_BAD_SYNC to 1, the server will not send those syncs. Whether this helps or makes matters worse by not sending enough syncs is unknown, that's why it is a setting. ])
-SECTION(Technical details)
-
PARAGRAPH([
You are not limited to one player per computer;
on each of them you can play with up to four people. In the
@@ -266,7 +288,8 @@
SECTION(The dedicated server,dedicated)
PARAGRAPH([
-Following the model of Quake 1-3, there is a special binary version of
+Following the model of Quake 1-3 and NOT Modern Warfare 2,
+there is a special binary version of
the game available for download (or compile it yourself giving the
option OPTION(--disable-glout) to configure) that has all input/output
features disabled. If you start it, it will read the normal configuration files and
@@ -351,17 +374,10 @@
PARAGRAPH([
In the player menu, there is the "Spectator mode" toggle; If you just
want to watch an internet game, connect to the server with spectator
-mode enabled. Note that you will be almost completely ignored in
-spectator mode: the other players won't know you are there at all,
-you can't chat and the dedicated server will not bother to start
-a game if only spectators are online (all you are going to get is
-a black screen). Only the server administrator will get a message
-that a client connected.
+mode enabled, or enable it while already online and you will leave active play.
+You can also bind a key to toggling spectator mode in your player keyboard setup,
+that allows you to enter and leave quickly.
])
-PARAGRAPH([
-Please note that this feature is unsupported; future servers may not allow
-spectating in this way.
-])
SECTION(Scores)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.