Revision: 9426
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9426&view=rev
Author: z-man
Date: 2010-08-06 07:05:46 +0000 (Fri, 06 Aug 2010)
Log Message:
-----------
Merging branch 0.2.8 from revision 9356 to 9425:
------------------------------------------------------------------------
r9424 | bazaarmagetron | 2010-06-28 17:45:41 +0200 (Mon, 28 Jun 2010) | 2 lines
Manuel Moos: Improving readability of console and in-game menu by fading the background to black with an alpha quad.
------------------------------------------------------------------------
r9423 | bazaarmagetron | 2010-06-25 16:03:21 +0200 (Fri, 25 Jun 2010) | 2 lines
Manuel Moos: Finishing passing of configuration directory from last merge.
------------------------------------------------------------------------
r9422 | bazaarmagetron | 2010-06-25 16:02:48 +0200 (Fri, 25 Jun 2010) | 5 lines
author: Manuel Moos
Merging own changes from earlier:
- Added passing down of $CONFIG directory in serverstarter scripts.
- Hovering over color menu items no longer breaks debug recording playback fast forward.
------------------------------------------------------------------------
r9421 | bazaarmagetron | 2010-06-24 01:04:25 +0200 (Thu, 24 Jun 2010) | 2 lines
Manuel Moos: Merging own forgotten changes.
------------------------------------------------------------------------
r9420 | bazaarmagetron | 2010-06-07 15:19:04 +0200 (Mon, 07 Jun 2010) | 2 lines
Manuel Moos: Avoiding player list read overflow. How did this go unnoticed for so long?
------------------------------------------------------------------------
r9419 | bazaarmagetron | 2010-05-27 13:36:19 +0200 (Thu, 27 May 2010) | 2 lines
Manuel Moos: Fixing aspect ratio calculations. In all practical cases, ensuring vertical fov did not happen; in those where something happened (really, really high screens), it overcompensated and distorted the image.
------------------------------------------------------------------------
r9418 | bazaarmagetron | 2010-05-26 15:04:31 +0200 (Wed, 26 May 2010) | 2 lines
Manuel Moos: Taking ownership of ALL network objects formerly belonging to a deleted user.
------------------------------------------------------------------------
r9417 | bazaarmagetron | 2010-05-26 15:03:55 +0200 (Wed, 26 May 2010) | 2 lines
Manuel Moos: Clearing send queue on new user login. Fixes one instance of odd authentication dialogs popping up.
------------------------------------------------------------------------
r9416 | bazaarmagetron | 2010-05-26 15:03:19 +0200 (Wed, 26 May 2010) | 2 lines
Manuel Moos: Simplified default login procedure for @forums accounts.
------------------------------------------------------------------------
r9415 | bazaarmagetron | 2010-04-25 23:27:21 +0200 (Sun, 25 Apr 2010) | 2 lines
Manuel Moos: Updated to current version from gnu.org. Address change, formatting, and LGPL is now the lesser GNU License.
------------------------------------------------------------------------
r9414 | bazaarmagetron | 2010-04-25 23:26:49 +0200 (Sun, 25 Apr 2010) | 2 lines
Manuel Moos: Using OUR version of COPYING.
------------------------------------------------------------------------
r9413 | bazaarmagetron | 2010-04-22 12:33:03 +0200 (Thu, 22 Apr 2010) | 2 lines
Manuel Moos: Avoiding reloading of title screen when textures are reloaded and it isn't actually getting displayed.
------------------------------------------------------------------------
r9412 | bazaarmagetron | 2010-04-19 20:02:56 +0200 (Mon, 19 Apr 2010) | 1 line
Luke Dashjr: replace references to guru3.sytes.net with working URIs at forums.armagetronad.net
------------------------------------------------------------------------
r9408 | bazaarmagetron | 2010-04-17 19:02:43 +0200 (Sat, 17 Apr 2010) | 1 line
Luke Dashjr: main is not a valid hack for AC_CHECK_LIB... use valid values
------------------------------------------------------------------------
r9400 | bazaarmagetron | 2010-03-19 23:41:45 +0100 (Fri, 19 Mar 2010) | 1 line
Luke Dashjr: png_sig_cmp is in both libpng12 and libpng14, where as png_check_sig is only libpng12 --ssuominen
------------------------------------------------------------------------
r9377 | bazaarmagetron | 2010-02-22 20:39:56 +0100 (Mon, 22 Feb 2010) | 1 line
Manuel Moos: partial portugese translation
------------------------------------------------------------------------
r9375 | bazaarmagetron | 2010-02-21 01:16:35 +0100 (Sun, 21 Feb 2010) | 2 lines
Manuel Moos: More typo fixes.
------------------------------------------------------------------------
r9368 | bazaarmagetron | 2010-02-20 18:08:58 +0100 (Sat, 20 Feb 2010) | 2 lines
Manuel Moos: Rebranding support for configure error messages.
------------------------------------------------------------------------
r9367 | bazaarmagetron | 2010-02-20 18:08:00 +0100 (Sat, 20 Feb 2010) | 2 lines
Manuel Moos: Merging start menu branch.
------------------------------------------------------------------------
r9366 | bazaarmagetron | 2010-02-20 18:06:37 +0100 (Sat, 20 Feb 2010) | 2 lines
Manuel Moos: Merging tooltip branch.
------------------------------------------------------------------------
r9365 | bazaarmagetron | 2010-02-20 18:04:54 +0100 (Sat, 20 Feb 2010) | 2 lines
Manuel Moos: Merging luke's spelling fix branch.
------------------------------------------------------------------------
r9364 | bazaarmagetron | 2010-02-19 19:25:59 +0100 (Fri, 19 Feb 2010) | 2 lines
Manuel Moos: "Winner..." message only shown if there is a non-zero win score. Yeah, we don't care if it's negative.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9356&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/COPYING.txt
armagetronad/trunk/armagetronad/batch/rcd_startstop.in
armagetronad/trunk/armagetronad/batch/serverstarter.in
armagetronad/trunk/armagetronad/bootstrap.sh
armagetronad/trunk/armagetronad/config/Makefile.am
armagetronad/trunk/armagetronad/config/default.cfg
armagetronad/trunk/armagetronad/config/settings.cfg
armagetronad/trunk/armagetronad/configure.ac
armagetronad/trunk/armagetronad/language/american.txt
armagetronad/trunk/armagetronad/language/british.txt
armagetronad/trunk/armagetronad/language/deutsch.txt
armagetronad/trunk/armagetronad/language/english_base.txt
armagetronad/trunk/armagetronad/language/english_base_notranslate.txt
armagetronad/trunk/armagetronad/src/doc/bugs.html.m4
armagetronad/trunk/armagetronad/src/doc/changelog.html.m4
armagetronad/trunk/armagetronad/src/engine/eCamera.cpp
armagetronad/trunk/armagetronad/src/engine/eCamera.h
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/network/nNetObject.cpp
armagetronad/trunk/armagetronad/src/network/nNetwork.cpp
armagetronad/trunk/armagetronad/src/render/rConsole.h
armagetronad/trunk/armagetronad/src/render/rConsoleGraph.cpp
armagetronad/trunk/armagetronad/src/render/rFont.h
armagetronad/trunk/armagetronad/src/render/rViewport.cpp
armagetronad/trunk/armagetronad/src/tools/tColor.h
armagetronad/trunk/armagetronad/src/tools/tRecorder.cpp
armagetronad/trunk/armagetronad/src/tools/tSysTime.cpp
armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp
armagetronad/trunk/armagetronad/src/tron/gCycle.cpp
armagetronad/trunk/armagetronad/src/tron/gGame.cpp
armagetronad/trunk/armagetronad/src/tron/gGame.h
armagetronad/trunk/armagetronad/src/tron/gLanguageMenu.cpp
armagetronad/trunk/armagetronad/src/tron/gLanguageMenu.h
armagetronad/trunk/armagetronad/src/tron/gLogo.cpp
armagetronad/trunk/armagetronad/src/tron/gMenus.cpp
armagetronad/trunk/armagetronad/src/tron/gTeam.cpp
armagetronad/trunk/armagetronad/src/ui/uInput.cpp
armagetronad/trunk/armagetronad/src/ui/uInput.h
armagetronad/trunk/armagetronad/src/ui/uMenu.cpp
armagetronad/trunk/armagetronad/src/ui/uMenu.h
Added Paths:
-----------
armagetronad/trunk/armagetronad/config/keys_cursor.cfg
armagetronad/trunk/armagetronad/config/keys_cursor_single.cfg
armagetronad/trunk/armagetronad/config/keys_twohand.cfg
armagetronad/trunk/armagetronad/config/keys_wasd.cfg
armagetronad/trunk/armagetronad/config/keys_x.cfg
armagetronad/trunk/armagetronad/config/keys_zqsd.cfg
armagetronad/trunk/armagetronad/language/portugese.txt
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9356
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9425
Modified: armagetronad/trunk/armagetronad/COPYING.txt
===================================================================
--- armagetronad/trunk/armagetronad/COPYING.txt 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/COPYING.txt 2010-08-06 07:05:46 UTC (rev 9426)
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,10 +277,10 @@
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+ How to Apply These Terms to Your New Programs
+
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
@@ -303,11 +303,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
@@ -336,5 +335,5 @@
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
Modified: armagetronad/trunk/armagetronad/batch/rcd_startstop.in
===================================================================
--- armagetronad/trunk/armagetronad/batch/rcd_startstop.in 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/batch/rcd_startstop.in 2010-08-06 07:05:46 UTC (rev 9426)
@@ -12,6 +12,7 @@
# export PIDDIR and VARDIR for service starter script
export PIDDIR
export VARDIR
+export CONFIG
# ps command listing all PIDs
PS="ps -a"
Modified: armagetronad/trunk/armagetronad/batch/serverstarter.in
===================================================================
--- armagetronad/trunk/armagetronad/batch/serverstarter.in 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/batch/serverstarter.in 2010-08-06 07:05:46 UTC (rev 9426)
@@ -4,6 +4,7 @@
[ X"${PIDDIR}" = X"" ] && PIDDIR=${HOME}/.@...@
[ X"${VARDIR}" = X"" ] && VARDIR=${HOME}/.@...
+[ X"${CONFIG}" = X"" ] && CONFIG=@aa_sysconfdir_reloc@
[ X"${BINDIR}" = X"" ] && BINDIR=@prefix_reloc@...
echo $$ > ${PIDDIR}/@progname@...
@@ -11,7 +12,7 @@
cd ${VARDIR}
run() {
- ${BINDIR}/@progname@...@ --userdatadir ${VARDIR} --daemon $* &
+ ${BINDIR}/armagetronad-dedicated --configdir ${CONFIG} --userdatadir ${VARDIR} --daemon $* &
jobs -p > ${PIDDIR}/@progname@...
[ -s ${PIDDIR}/@progname@... ] || { echo "Warning: main program PID unavailable, server can't be stopped reliably."; echo $$ > ${PIDDIR}/@progname@... ; }
wait
Modified: armagetronad/trunk/armagetronad/bootstrap.sh
===================================================================
--- armagetronad/trunk/armagetronad/bootstrap.sh 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/bootstrap.sh 2010-08-06 07:05:46 UTC (rev 9426)
@@ -14,6 +14,8 @@
echo "Generating version..."
echo "m4_define(AUTOMATIC_VERSION,["`sh batch/make/version $MYDIR`"])" > version || exit 1
fi
+echo "Copying license..."
+cp COPYING.txt COPYING
echo "Running aclocal..."
$ACLOCAL || { rm aclocal.m4; exit 1; }
Modified: armagetronad/trunk/armagetronad/config/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/config/Makefile.am 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/config/Makefile.am 2010-08-06 07:05:46 UTC (rev 9426)
@@ -8,6 +8,8 @@
subcultures.srv\
settings_visual.cfg\
settings_authentication.cfg\
+ keys_cursor.cfg keys_wasd.cfg keys_zqsd.cfg\
+ keys_twohand.cfg keys_x.cfg keys_cursor_single.cfg\
examples/breakfast_in_hell.cfg examples/single_use_turbo.cfg\
examples/fortress_soccer.cfg examples/death_zone.cfg\
examples/cvs_test/fortress_physics.cfg examples/cvs_test/fortress_scoring.cfg\
Modified: armagetronad/trunk/armagetronad/config/default.cfg
===================================================================
--- armagetronad/trunk/armagetronad/config/default.cfg 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/config/default.cfg 2010-08-06 07:05:46 UTC (rev 9426)
@@ -6,42 +6,52 @@
SERVER_NAME Unnamed Server
CM_LOCY -0.5
+# active tooltips
+ CHAT_TOOLTIP 1 1 1 1 1
+ CYCLE_BRAKE_TOOLTIP 1 1 1 1 1
+ CYCLE_TURN_LEFT_TOOLTIP 10 10 5 5 5
+ CYCLE_TURN_RIGHT_TOOLTIP 11 11 6 6 6
+ GLANCE_BACK_TOOLTIP 1 1 1 1 1
+ GLANCE_LEFT_TOOLTIP 3 3 3 3 3
+ GLANCE_RIGHT_TOOLTIP 3 3 3 3 3
+ SWITCH_VIEW_TOOLTIP 2 2 2 2 2
+ TOGGLE_SPECTATOR_TOOLTIP 2 2 2 2 2
+ INGAME_MENU_TOOLTIP 1 1 1 1 1
+
+KEYBOARD 27 PLAYER_BIND INGAME_MENU 0
+
# no play time
PLAY_TIME_TOTAL 0
PLAY_TIME_ONLINE 0
PLAY_TIME_TEAM 0
-# default keyboard layout
-KEYBOARD 333 PLAYER_BIND ZOOM_OUT 1
+# default keyboard layout, valid for all setups
+
+# camera on numpad and mouse
KEYBOARD 332 PLAYER_BIND ZOOM_IN 1
KEYBOARD 327 PLAYER_BIND BANK_DOWN 1
KEYBOARD 326 PLAYER_BIND BANK_UP 1
KEYBOARD 325 PLAYER_BIND LOOK_LEFT 1
KEYBOARD 324 PLAYER_BIND LOOK_RIGHT 1
-KEYBOARD 276 PLAYER_BIND CYCLE_TURN_LEFT 2
-KEYBOARD 275 PLAYER_BIND CYCLE_TURN_RIGHT 2
-KEYBOARD 274 PLAYER_BIND SWITCH_VIEW 2
-KEYBOARD 271 PLAYER_BIND MOVE_DOWN 1
-KEYBOARD 270 PLAYER_BIND MOVE_UP 1
+KEYBOARD 270 PLAYER_BIND MOVE_DOWN 1
+KEYBOARD 269 PLAYER_BIND MOVE_UP 1
KEYBOARD 262 PLAYER_BIND LOOK_RIGHT 1
KEYBOARD 261 PLAYER_BIND MOVE_FORWARD 1
KEYBOARD 260 PLAYER_BIND LOOK_LEFT 1
KEYBOARD 259 PLAYER_BIND MOVE_RIGHT 1
KEYBOARD 258 PLAYER_BIND MOVE_BACK 1
KEYBOARD 257 PLAYER_BIND MOVE_LEFT 1
-KEYBOARD 273 PLAYER_BIND GLANCE_FORWARD 1
-KEYBOARD 276 PLAYER_BIND GLANCE_LEFT 1
-KEYBOARD 275 PLAYER_BIND GLANCE_RIGHT 1
-KEYBOARD 274 PLAYER_BIND GLANCE_BACK 1
-KEYBOARD 122 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 121 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 119 PLAYER_BIND CYCLE_TURN_LEFT 1
-KEYBOARD 118 PLAYER_BIND CYCLE_BRAKE 1
-KEYBOARD 120 PLAYER_BIND CYCLE_TURN_RIGHT 1
-KEYBOARD 115 PLAYER_BIND CHAT 1
-KEYBOARD 113 PLAYER_BIND BANK_UP 1
-KEYBOARD 99 PLAYER_BIND SWITCH_VIEW 1
-KEYBOARD 97 PLAYER_BIND BANK_DOWN 1
+
+KEYBOARD 266 PLAYER_BIND GLANCE_RIGHT 1
+KEYBOARD 256 PLAYER_BIND GLANCE_LEFT 1
+KEYBOARD 278 PLAYER_BIND TOGGLE_SPECTATOR 1
+KEYBOARD 98 PLAYER_BIND TOGGLE_SPECTATOR 1
+
+#regular chat: enter and return
+KEYBOARD 13 PLAYER_BIND CHAT 1
+KEYBOARD 271 PLAYER_BIND CHAT 1
+
+#instachats: function and number keys
KEYBOARD 293 PLAYER_BIND INSTANT_CHAT_12 1
KEYBOARD 292 PLAYER_BIND INSTANT_CHAT_11 1
KEYBOARD 291 PLAYER_BIND INSTANT_CHAT_10 1
@@ -68,12 +78,16 @@
KEYBOARD 48 PLAYER_BIND INSTANT_CHAT_22 1
KEYBOARD 45 PLAYER_BIND INSTANT_CHAT_23 1
KEYBOARD 8 PLAYER_BIND INSTANT_CHAT_25 1
-KEYBOARD 13 PLAYER_BIND INSTANT_CHAT_26 1
+
+# global stuff, console, pause, screenshots
KEYBOARD 281 PLAYER_BIND MESS_DOWN 0
KEYBOARD 280 PLAYER_BIND MESS_UP 0
+KEYBOARD 279 PLAYER_BIND MESS_END 0
KEYBOARD 9 PLAYER_BIND SCORE 0
KEYBOARD 316 PLAYER_BIND SCREENSHOT 0
KEYBOARD 294 PLAYER_BIND SCREENSHOT 0
+KEYBOARD 319 PLAYER_BIND TOGGLE_FULLSCREEN 0
+KEYBOARD 110 PLAYER_BIND TOGGLE_FULLSCREEN 0
KEYBOARD 102 PLAYER_BIND TOGGLE_FULLSCREEN 0
KEYBOARD 96 PLAYER_BIND CONSOLE_INPUT 0
KEYBOARD 94 PLAYER_BIND CONSOLE_INPUT 0
Copied: armagetronad/trunk/armagetronad/config/keys_cursor.cfg (from rev 9425, armagetronad/branches/0.2.8/armagetronad/config/keys_cursor.cfg)
===================================================================
--- armagetronad/trunk/armagetronad/config/keys_cursor.cfg (rev 0)
+++ armagetronad/trunk/armagetronad/config/keys_cursor.cfg 2010-08-06 07:05:46 UTC (rev 9426)
@@ -0,0 +1,24 @@
+# Control over cursor keys
+KEYBOARD 276 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 275 PLAYER_BIND CYCLE_TURN_RIGHT 1
+KEYBOARD 274 PLAYER_BIND CYCLE_BRAKE 1
+KEYBOARD 118 PLAYER_BIND SWITCH_VIEW 1
+KEYBOARD 117 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 111 PLAYER_BIND CYCLE_TURN_RIGHT 1
+KEYBOARD 108 PLAYER_BIND GLANCE_RIGHT 1
+KEYBOARD 107 PLAYER_BIND GLANCE_BACK 1
+KEYBOARD 106 PLAYER_BIND GLANCE_LEFT 1
+KEYBOARD 105 PLAYER_BIND CYCLE_BRAKE 1
+KEYBOARD 99 PLAYER_BIND SWITCH_VIEW 1
+
+KEYBOARD 122 PLAYER_BIND GLANCE_LEFT 2
+KEYBOARD 120 PLAYER_BIND CYCLE_TURN_LEFT 2
+KEYBOARD 119 PLAYER_BIND GLANCE_LEFT 2
+KEYBOARD 115 PLAYER_BIND CYCLE_TURN_LEFT 2
+KEYBOARD 114 PLAYER_BIND GLANCE_RIGHT 2
+KEYBOARD 113 PLAYER_BIND SWITCH_VIEW 2
+KEYBOARD 102 PLAYER_BIND CYCLE_TURN_RIGHT 2
+KEYBOARD 101 PLAYER_BIND GLANCE_BACK 2
+KEYBOARD 100 PLAYER_BIND CYCLE_BRAKE 2
+KEYBOARD 32 PLAYER_BIND CYCLE_BRAKE 2
+
Copied: armagetronad/trunk/armagetronad/config/keys_cursor_single.cfg (from rev 9425, armagetronad/branches/0.2.8/armagetronad/config/keys_cursor_single.cfg)
===================================================================
--- armagetronad/trunk/armagetronad/config/keys_cursor_single.cfg (rev 0)
+++ armagetronad/trunk/armagetronad/config/keys_cursor_single.cfg 2010-08-06 07:05:46 UTC (rev 9426)
@@ -0,0 +1,17 @@
+# Control over cursor keys, no second player
+KEYBOARD 276 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 275 PLAYER_BIND CYCLE_TURN_RIGHT 1
+KEYBOARD 274 PLAYER_BIND CYCLE_BRAKE 1
+KEYBOARD 266 PLAYER_BIND GLANCE_RIGHT 1
+KEYBOARD 256 PLAYER_BIND GLANCE_LEFT 1
+KEYBOARD 122 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 120 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 119 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 118 PLAYER_BIND SWITCH_VIEW 1
+KEYBOARD 115 PLAYER_BIND GLANCE_LEFT 1
+KEYBOARD 114 PLAYER_BIND CYCLE_TURN_RIGHT 1
+KEYBOARD 102 PLAYER_BIND GLANCE_RIGHT 1
+KEYBOARD 101 PLAYER_BIND CYCLE_BRAKE 1
+KEYBOARD 100 PLAYER_BIND GLANCE_BACK 1
+KEYBOARD 99 PLAYER_BIND CYCLE_TURN_RIGHT 1
+KEYBOARD 32 PLAYER_BIND CYCLE_BRAKE 1
Copied: armagetronad/trunk/armagetronad/config/keys_twohand.cfg (from rev 9425, armagetronad/branches/0.2.8/armagetronad/config/keys_twohand.cfg)
===================================================================
--- armagetronad/trunk/armagetronad/config/keys_twohand.cfg (rev 0)
+++ armagetronad/trunk/armagetronad/config/keys_twohand.cfg 2010-08-06 07:05:46 UTC (rev 9426)
@@ -0,0 +1 @@
+# two handed configuration
Copied: armagetronad/trunk/armagetronad/config/keys_wasd.cfg (from rev 9425, armagetronad/branches/0.2.8/armagetronad/config/keys_wasd.cfg)
===================================================================
--- armagetronad/trunk/armagetronad/config/keys_wasd.cfg (rev 0)
+++ armagetronad/trunk/armagetronad/config/keys_wasd.cfg 2010-08-06 07:05:46 UTC (rev 9426)
@@ -0,0 +1,26 @@
+# controls around wasd
+KEYBOARD 276 PLAYER_BIND GLANCE_LEFT 1
+KEYBOARD 275 PLAYER_BIND GLANCE_RIGHT 1
+KEYBOARD 274 PLAYER_BIND GLANCE_BACK 1
+KEYBOARD 122 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 121 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 120 PLAYER_BIND CYCLE_TURN_RIGHT 1
+KEYBOARD 119 PLAYER_BIND GLANCE_BACK 1
+KEYBOARD 118 PLAYER_BIND SWITCH_VIEW 1
+KEYBOARD 115 PLAYER_BIND CYCLE_BRAKE 1
+KEYBOARD 113 PLAYER_BIND GLANCE_LEFT 1
+KEYBOARD 101 PLAYER_BIND GLANCE_RIGHT 1
+KEYBOARD 100 PLAYER_BIND CYCLE_TURN_RIGHT 1
+KEYBOARD 99 PLAYER_BIND SWITCH_VIEW 1
+KEYBOARD 97 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 32 PLAYER_BIND CYCLE_BRAKE 1
+
+KEYBOARD 117 PLAYER_BIND GLANCE_LEFT 2
+KEYBOARD 111 PLAYER_BIND GLANCE_RIGHT 2
+KEYBOARD 109 PLAYER_BIND CYCLE_TURN_LEFT 2
+KEYBOARD 108 PLAYER_BIND CYCLE_TURN_RIGHT 2
+KEYBOARD 107 PLAYER_BIND CYCLE_BRAKE 2
+KEYBOARD 106 PLAYER_BIND CYCLE_TURN_LEFT 2
+KEYBOARD 105 PLAYER_BIND GLANCE_BACK 2
+KEYBOARD 46 PLAYER_BIND SWITCH_VIEW 2
+KEYBOARD 44 PLAYER_BIND CYCLE_TURN_RIGHT 2
Copied: armagetronad/trunk/armagetronad/config/keys_x.cfg (from rev 9425, armagetronad/branches/0.2.8/armagetronad/config/keys_x.cfg)
===================================================================
--- armagetronad/trunk/armagetronad/config/keys_x.cfg (rev 0)
+++ armagetronad/trunk/armagetronad/config/keys_x.cfg 2010-08-06 07:05:46 UTC (rev 9426)
@@ -0,0 +1,14 @@
+# old default keyboard layout
+KEYBOARD 276 PLAYER_BIND CYCLE_TURN_LEFT 2
+KEYBOARD 275 PLAYER_BIND CYCLE_TURN_RIGHT 2
+KEYBOARD 274 PLAYER_BIND SWITCH_VIEW 2
+KEYBOARD 276 PLAYER_BIND GLANCE_LEFT 1
+KEYBOARD 275 PLAYER_BIND GLANCE_RIGHT 1
+KEYBOARD 274 PLAYER_BIND GLANCE_BACK 1
+KEYBOARD 122 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 121 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 119 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 118 PLAYER_BIND CYCLE_BRAKE 1
+KEYBOARD 120 PLAYER_BIND CYCLE_TURN_RIGHT 1
+KEYBOARD 99 PLAYER_BIND SWITCH_VIEW 1
+KEYBOARD 115 PLAYER_BIND CHAT 1
Copied: armagetronad/trunk/armagetronad/config/keys_zqsd.cfg (from rev 9425, armagetronad/branches/0.2.8/armagetronad/config/keys_zqsd.cfg)
===================================================================
--- armagetronad/trunk/armagetronad/config/keys_zqsd.cfg (rev 0)
+++ armagetronad/trunk/armagetronad/config/keys_zqsd.cfg 2010-08-06 07:05:46 UTC (rev 9426)
@@ -0,0 +1,25 @@
+# controls around zqsd for french keyboards
+KEYBOARD 276 PLAYER_BIND GLANCE_LEFT 1
+KEYBOARD 275 PLAYER_BIND GLANCE_RIGHT 1
+KEYBOARD 274 PLAYER_BIND GLANCE_BACK 1
+KEYBOARD 122 PLAYER_BIND GLANCE_BACK 1
+KEYBOARD 120 PLAYER_BIND CYCLE_TURN_RIGHT 1
+KEYBOARD 119 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 118 PLAYER_BIND SWITCH_VIEW 1
+KEYBOARD 115 PLAYER_BIND CYCLE_BRAKE 1
+KEYBOARD 113 PLAYER_BIND CYCLE_TURN_LEFT 1
+KEYBOARD 101 PLAYER_BIND GLANCE_RIGHT 1
+KEYBOARD 100 PLAYER_BIND CYCLE_TURN_RIGHT 1
+KEYBOARD 99 PLAYER_BIND SWITCH_VIEW 1
+KEYBOARD 97 PLAYER_BIND GLANCE_LEFT 1
+KEYBOARD 32 PLAYER_BIND CYCLE_BRAKE 1
+
+KEYBOARD 117 PLAYER_BIND GLANCE_LEFT 2
+KEYBOARD 111 PLAYER_BIND GLANCE_RIGHT 2
+KEYBOARD 108 PLAYER_BIND CYCLE_TURN_RIGHT 2
+KEYBOARD 107 PLAYER_BIND CYCLE_BRAKE 2
+KEYBOARD 106 PLAYER_BIND CYCLE_TURN_LEFT 2
+KEYBOARD 105 PLAYER_BIND GLANCE_BACK 2
+KEYBOARD 59 PLAYER_BIND CYCLE_TURN_RIGHT 2
+KEYBOARD 58 PLAYER_BIND SWITCH_VIEW 2
+KEYBOARD 44 PLAYER_BIND CYCLE_TURN_LEFT 2
Modified: armagetronad/trunk/armagetronad/config/settings.cfg
===================================================================
--- armagetronad/trunk/armagetronad/config/settings.cfg 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/config/settings.cfg 2010-08-06 07:05:46 UTC (rev 9426)
@@ -786,7 +786,7 @@
# with the following value. For example, if your system timer is about 10% too fast, you
# can use the value 0.909 to compensate. Deviations of less than 1% are usually compensated
# by the network code. NOTE: Do not change this while the program is running, this will cause
-# huge hickups or freezes.
+# huge hiccups or freezes.
TIME_FACTOR 1.0
# deprecated settings, they'll go away unless there are protests
Modified: armagetronad/trunk/armagetronad/configure.ac
===================================================================
--- armagetronad/trunk/armagetronad/configure.ac 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/configure.ac 2010-08-06 07:05:46 UTC (rev 9426)
@@ -650,7 +650,7 @@
CPPFLAGS="$CPPFLAGS `$XML2_CONFIG --cflags`"
LIBS="`$XML2_CONFIG --libs` $LIBS"
AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the xml2 library (-lxml2).]),
-AC_MSG_ERROR([You need the library xml2 to compile Armagetron. Read the file doc/install_linux.html.])
+AC_MSG_ERROR([You need the library xml2 to compile ${progtitle}. Read the file doc/install_linux.html.])
,`$XML2_CONFIG --libs`)
AC_CHECK_FUNC(xmlParserInputBufferCreateFilenameDefault,
@@ -780,7 +780,7 @@
AC_CHECK_FUNC(SDL_Init,
AC_DEFINE(HAVE_LIBSDL,,[Define if you have the library SDL]),
-AC_MSG_ERROR([You need the library SDL to compile Armagetron. Read the file doc/install_linux.html.])
+AC_MSG_ERROR([You need the library SDL to compile ${progtitle}. Read the file doc/install_linux.html.])
,)
dnl ***************** OPTIONAL STUFF AFTER THIS POINT **********************
@@ -814,6 +814,14 @@
fi
dnl *************************************************
+dnl Winsock linking for cross-compilation. Not really supported.
+dnl *************************************************
+
+if test "`${SDL_CONFIG} --libs | grep windows`" ; then
+ AC_CHECK_LIB(wsock32, connect)
+fi
+
+dnl *************************************************
dnl GL
dnl *************************************************
@@ -823,19 +831,19 @@
AC_CHECK_LIB($SYS_GL_LIB, glVertex3f,,
AC_MSG_RESULT([OpenGL not found. Maybe it needs X11 to compile? Checking that...])
- AC_CHECK_LIB(X11,main,
+ AC_CHECK_LIB(X11,XOpenDisplay,
LIBS="-lX11 -L/usr/X11R6/lib $LIBS"
AC_DEFINE(HAVE_LIBX11, 1, [Define if you have the X11 library (-lX11).])
,
AC_MSG_WARN([
Standard X11 library needed by OpenGL not found.
]),-L/usr/X11R6/lib)
- AC_CHECK_LIB(Xext,main,-L/usr/X11R6/lib)
- AC_CHECK_LIB(Xt,main,-L/usr/X11R6/lib)
- AC_CHECK_LIB(Xi,main,-L/usr/X11R6/lib)
- AC_CHECK_LIB(Xmu,main,-L/usr/X11R6/lib)
+ AC_CHECK_LIB(Xext,XextFindDisplay,-L/usr/X11R6/lib)
+ AC_CHECK_LIB(Xt,XtFree,-L/usr/X11R6/lib)
+ AC_CHECK_LIB(Xi,XOpenDevice,-L/usr/X11R6/lib)
+ AC_CHECK_LIB(Xmu,XmuDrawLogo,-L/usr/X11R6/lib)
AC_CHECK_LIB($SYS_GL_LIB, glBegin,,AC_MSG_ERROR([
- You need Mesa or an OpenGL-System to compile Armagetron.
+ You need Mesa or an OpenGL-System to compile ${progtitle}.
Maybe your libGL needs the X libraries and your system does not
find them? Read the file doc/install_linux.html.]),-L/usr/X11R6/lib)
)
@@ -855,7 +863,7 @@
dnl AC_CHECK_LIB($SYS_GLU_LIB, gluBuild2DMipmaps,,
AC_CHECK_LIB($SYS_GLU_LIB, gluBuild3DMipmaps,,
AC_MSG_ERROR([
-You need GLU to compile Armagetron; it SHOULD have come with OpenGL.
+You need GLU to compile ${progtitle}; it SHOULD have come with OpenGL.
Read the file doc/install_linux.html.]))
dnl *************************************************
@@ -965,13 +973,13 @@
dnl Other Stuff
dnl *************************************************
-dnl AC_CHECK_LIB(g++, main,,
+dnl AC_CHECK_LIB(g++, cin,,
dnl AC_MSG_WARN([C++ standard library not found. You can ignore this warning on non-GNU-systems.]))
AC_LANG([C])
-AC_CHECK_LIB(z, main,,
-AC_MSG_ERROR([You need libz to compile Armagetron.]))
+AC_CHECK_LIB(z, gzread,,
+AC_MSG_ERROR([You need libz to compile ${progtitle}.]))
AC_MSG_CHECKING(whether libpng is installed)
if PNGLIBS=`libpng-config --libs`; then
@@ -981,11 +989,11 @@
CPPFLAGS="$CPPFLAGS `libpng-config --cflags`"
LIBS="$LIBS $PNGLIBS"
-AC_CHECK_FUNC(png_check_sig,
+AC_CHECK_FUNC(png_sig_cmp,
,
-AC_MSG_ERROR([You need libpng to compile Armagetron.]))
+AC_MSG_ERROR([You need libpng to compile ${progtitle}.]))
-AC_CHECK_LIB(jpeg, main,,
+AC_CHECK_LIB(jpeg, jpeg_read_header,,
AC_MSG_WARN([
libjpeg not found. Expect small graphical errors ( missing moviepack title screen ).]
)
@@ -993,7 +1001,7 @@
AC_CHECK_LIB(SDL_image, IMG_Load,,
dnl AC_CHECK_LIB(IMG, main,,
-AC_MSG_ERROR([You need the library SDL_image to compile Armagetron.]
+AC_MSG_ERROR([You need the library SDL_image to compile ${progtitle}.]
dnl )
))
@@ -1033,8 +1041,6 @@
-dnl Replace `main' with a function in -lpthread:
-
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(unistd.h)
Modified: armagetronad/trunk/armagetronad/language/american.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/american.txt 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/language/american.txt 2010-08-06 07:05:46 UTC (rev 9426)
@@ -2,6 +2,7 @@
encoding latin1
include english_base.txt
+first_setup_color Color:
fav_num_per_team_player_help The favorite number of players per team for this player
color_b_help Cycle and wall color, blue component.
color_g_help Cycle and wall color, green component.
@@ -17,12 +18,12 @@
colordepth_help Color depth to use (0: 16 1: desktop 2: 24)
last_colordepth_help Color depth, last successful init
zdepth_help z buffer depth to use (0: 16 1: from color depth 2: 32)
-failed_attempts_help Number of failed attemts to initialize graphics mode
+failed_attempts_help Number of failed attempts to initialize graphics mode
player_blue_help Lets you choose the blue component of your color.
player_green_help Lets you choose the green component of your color.
player_red_help Lets you choose the red component of your color.
-player_name_team_help You can set your prefered method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple color label.
-player_num_per_team_help Set your favorite number of players per team here. When you join a game and the smallest team has less players than specified here, you'll join that team. Otherwise, you will create a new team. Only the default behaviour is governed by this setting; you can switch teams later.
+player_name_team_help You can set your preferred method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple color label.
+player_num_per_team_help Set your favorite number of players per team here. When you join a game and the smallest team has less players than specified here, you'll join that team. Otherwise, you will create a new team. Only the default behavior is governed by this setting; you can switch teams later.
player_camera_initial_help Choose your favorite camera perspective here.
player_camera_fov_help Choose your favorite FOV (Field of vision).
screen_colordepth_text Color Depth:
Modified: armagetronad/trunk/armagetronad/language/british.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/british.txt 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/language/british.txt 2010-08-06 07:05:46 UTC (rev 9426)
@@ -17,11 +17,11 @@
colordepth_help colour depth to use (0: 16 1: desktop 2: 24)
last_colordepth_help colour depth, last successful init
zdepth_help z buffer depth to use (0: 16 1: from colour depth 2: 32)
-failed_attempts_help Number of failed attemts to initialise graphics mode
+failed_attempts_help Number of failed attempts to initialise graphics mode
player_blue_help Lets you choose the blue component of your colour.
player_green_help Lets you choose the green component of your colour.
player_red_help Lets you choose the red component of your colour.
-player_name_team_help You can set your prefered method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple colour label.
+player_name_team_help You can set your preferred method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple colour label.
player_num_per_team_help Set your favourite number of players per team here. When you join a game and the smallest team has less players than specified here, you'll join that team. Otherwise, you will create a new team. Only the default behaviour is governed by this setting; you can switch teams later.
player_camera_initial_help Choose your favourite camera perspective here.
player_camera_fov_help Choose your favourite FOV (Field of vision).
Modified: armagetronad/trunk/armagetronad/language/deutsch.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/deutsch.txt 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/language/deutsch.txt 2010-08-06 07:05:46 UTC (rev 9426)
@@ -1594,6 +1594,8 @@
language_menu_title Spracheinstellungen
language_menu_help w\xE4hlt die Sprache f\xFCr alle Bildschirmtexte aus
+language_firstchoice_help Dr\xFCcke Enter, Return oder Leertaste, um deutsche Bildschirmtexte auszuw\xE4hlen.
+
language_menu_item_fist Erste Sprache:
language_menu_item_first_help \g wird die meisten Textmeldungen in dieser Sprache anzeigen
Modified: armagetronad/trunk/armagetronad/language/english_base.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/english_base.txt 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/language/english_base.txt 2010-08-06 07:05:46 UTC (rev 9426)
@@ -62,7 +62,7 @@
cycle_accel_help Wall acceleration factor
cycle_accel_self_help Multiplicator to CYCLE_ACCEL for your own wall
-cycle_accel_team_help Multiplicator to CYCLE_ACCEL for your temmates' walls
+cycle_accel_team_help Multiplicator to CYCLE_ACCEL for your teammates' walls
cycle_accel_enemy_help Multiplicator to CYCLE_ACCEL for your enemies' walls
cycle_accel_rim_help Multiplicator to CYCLE_ACCEL for the rim walls
cycle_accel_slingshot_help Multiplicator to the total effect of CYCLE_ACCEL, if the cycle is between its own wall and another wall
@@ -104,7 +104,7 @@
cycle_rubber_mindistance_gap_help If > 0, CYCLE_RUBBER_MINDISTANCE effectively is never taken to be bigger than this value times the size of any detected gaps the cylce can squeeze through. For "Open" gameplay.
cycle_rubber_mindistance_gap_side_help Gap detection only sees gaps that the cycle may reach in no less than this many seconds.
cycle_rubber_mindistance_ratio_help Additional distance to CYCLE_RUBBER_MINDISTANCE for every length unit of the wall you have in front of you
-cycle_rubber_mindistance_reservoir_help Addidional distance if you have an empty rubber meter (gets faded out gradually as you use up all your rubber)
+cycle_rubber_mindistance_reservoir_help Additional distance if you have an empty rubber meter (gets faded out gradually as you use up all your rubber)
cycle_rubber_mindistance_unprepared_help Additional distance for unprepared grinds; it gets applied when the cycle's last turn was just a fraction of a second ago and faded out preparation times larger than CYCLE_RUBBER_MINDISTANCE_PREPARATION.
cycle_rubber_mindistance_preparation_help Timescale in seconds a cycle's last turn time is compared with to determine the effect of CYCLE_RUBBER_MINDISTANCE_UNPREPARED.
cycle_rubber_mindistance_legacy_help Extra factor for minimal distance to walls enforced by the rubber code, active when peers with the rip bug are connected
@@ -302,7 +302,7 @@
sp_size_factor_help Arena size modifier
# single player settings (used by dedicated server only)
-sp_ais_help nummer of AI Players in Single-Player-mode
+sp_ais_help number of AI Players in Single-Player-mode
start_new_match_help Initiates a new match
@@ -327,9 +327,9 @@
win_zone_deaths_help A value of 1 turns it into a death zone.
win_zone_randomness_help Randomness factor of the initial win zone position. 0 fixes it at the arena center, 1 spreads the zone all over it.
-game_timeout_help Base timeout for game state synchronisation; gives appoximately the maximum time between rounds.
+game_timeout_help Base timeout for game state synchronisation; gives approximately the maximum time between rounds.
last_chat_break_time_help Last round time a player in chat mode is able to pause the timer
-extra_round_time_help Lenght of an extra pause at the beginning of the round
+extra_round_time_help Length of an extra pause at the beginning of the round
player_chat_wait_max_help Maximum time in seconds to wait for a single player to stop chatting.
player_chat_wait_fraction_help Maximum fraction of time to wait for a single player to stop chatting.
player_chat_wait_single_help Set to 1 if only one player should get his chat wait time reduced at any given time.
@@ -501,7 +501,7 @@
votes_cancel_help Cancels all running polls.
max_votes_per_voter_help The maximum number of votes suggested by each voter that can be active at any given moment.
voting_start_decay_help Number of seconds after that the non-voters start to get ignored.
-voting_decay_help One non-voter is ignored everytime this many secons pass.
+voting_decay_help One non-voter is ignored everytime this many seconds pass.
voting_bias_help Add virtual voters that oppose every change.
voting_bias_kick_help Add virtual voters that oppose every kick vote.
voting_bias_suspend_help Add virtual voters that oppose every suspend vote.
@@ -543,7 +543,7 @@
#********************************************
#********************************************
-recording_debuglevel_help Level of additonal information in recording file.
+recording_debuglevel_help Level of additional information in recording file.
fast_forward_maxstep_help Maximum recording time between rendered frames in fast forward mode
fast_forward_maxstep_real_help Maximum real time between rendered frames in fast forward mode
fast_forward_maxstep_rel_help Maximum fraction of the time left until the end of FF mode between rendered frames
@@ -614,10 +614,10 @@
camera_visibility_recovery_speed_help The speed the external visibility targets recovers from wall hits
camera_visibility_wall_distance_help The distance the visibility targets keep from walls
-camera_visibility_clip_speed_help Speed with wich the visibility targets is brought into view
+camera_visibility_clip_speed_help Speed with which the visibility targets is brought into view
camera_visibility_extension_help Distance (measured in seconds, gets multiplied by speed) of the visibility targets from the watched object
camera_visibility_sideskew_help Extra forward component of the sideways visibility targets
-camera_visibility_lower_wall_help If set to 1, walls are lowerd when they block the view and the camera is not moved
+camera_visibility_lower_wall_help If set to 1, walls are lowered when they block the view and the camera is not moved
camera_visibility_lower_wall_smart_help Like CAMERA_VISIBILITY_LOWER_WALL, but special setting for the smart camera
bug_transparency_help Unsupported: make all rim walls semi-transparent by rendering them without occlusion tests
bug_transparency_demand_help Unsupported: use transparency instead of lowering walls
@@ -661,7 +661,7 @@
max_clients_same_ip_soft_help Maximum number of network clients to accept from the same IP; more logins will get kicked when the server is full
max_clients_same_ip_hard_help Maximum number of network clients to accept from the same IP; more logins will be ignored
max_players_same_ip_help maximum number of players from the same IP (note that each client can legally host up to four players)
-url_help HTTP URI assiciated with a server
+url_help HTTP URI associated with a server
# settings compatibility
@@ -836,8 +836,8 @@
last_zdepth_help z buffer depth, last successful init
use_sdl_help Use SDL to init OpenGL?
last_use_sdl_help Use SDL to init OpenGL, last successful init
-failed_attempts_help Number of failed attemts to initialise graphics mode
-software_renderer_help Is the OpenGL renderer not hadware accelerated?
+failed_attempts_help Number of failed attempts to initialise graphics mode
+software_renderer_help Is the OpenGL renderer not hardware accelerated?
#model
use_displaylists_help Use display lists for rendering the cycles?
@@ -933,7 +933,7 @@
vote_kick_reason_help Default reason given to players when they're vote-kicked.
ban_help Bans the specified player from the server (kicks him first) for a variable time in minutes.
-ban_ip_help Bans the spedified IP address from the server for a variable time.
+ban_ip_help Bans the specified IP address from the server for a variable time.
ban_list_help Prints a list of currently banned IPs.
unban_ip_help Revokes the ban of the specified IP address.
@@ -961,7 +961,7 @@
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.
fullscreen_message_help Prints a big message all over the screen, interrupting gameplay for a configurable timeout. Use with care.
-say_help Dedicated server only: let the server administator say something.
+say_help Dedicated server only: let the server administrator say something.
rename_help Renames the given player.
allow_rename_player_help Gives the given player the ability to rename.
disallow_rename_player_help Prevents the given player from renameing.
@@ -1001,6 +1001,8 @@
input_items_unbound Unbound
input_items_global Global Controls
+# used for listing key bindings
+input_or or
#********************************************
#********************************************
@@ -1016,9 +1018,11 @@
input_screenshot_text Screenshot
input_screenshot_help Makes a screenshot and saves it as screenshot_X.bmp in the var directory
+input_chat_tooltip Press \1 to chat.
input_chat_text Chat
input_chat_help Lets you talk to other players over the network.
+input_toggle_spectator_tooltip Press \1 to toggle spectator mode.
input_toggle_spectator_text Toggle Spectator
input_toggle_spectator_help Toggles spectator mode, conveniently taking you out of the game so you can take a call (of nature, possibly) and back into the game when you're done.
@@ -1029,11 +1033,12 @@
input_toggle_fullscreen_help Toggles windowed and fullscreen mode
input_toggle_mousegrab_text Toggle mousegrab
-input_toggle_mousegrab_help Frees the mouse pointer or contstrains it to the program window
+input_toggle_mousegrab_help Frees the mouse pointer or constrains it to the program window
input_reload_textures_text Reload textures
input_reload_textures_help Reloads all textures. Useful for content creators.
+input_ingame_menu_tooltip Press \1 to access the ingame menu.
input_ingame_menu_text Ingame menu
input_ingame_menu_help Triggers the ingame menu. ESC is hardcoded to this function so you don't get trapped in the game :)
@@ -1085,15 +1090,18 @@
#********************************************
#********************************************
+input_cycle_brake_tooltip Press \1 to brake (or activate other special functions).
input_cycle_brake_text Brake
input_cycle_brake_help decreases your speed in critical situations
input_cycle_brake_toggle_text Toggle Brake
input_cycle_brake_toggle_help turns your brake on and off permanently without you needing to hold down a key
+input_cycle_turn_right_tooltip Press \1 to turn right.
input_cycle_turn_right_text Turn right
input_cycle_turn_right_help Makes a 90 degrees turn to the right
+input_cycle_turn_left_tooltip Press \1 to turn left.
input_cycle_turn_left_text Turn left
input_cycle_turn_left_help Makes a 90 degrees turn to the left
@@ -1143,12 +1151,15 @@
input_zoom_in_text Zoom in
input_zoom_in_help Reduces the field of vision and reveals more details on faraway objects.
+input_glance_back_tooltip Press \1 to glance back.
input_glance_back_text Glance back
input_glance_back_help Turns the camera temporarily backwards.
+input_glance_right_tooltip Press \1 to glance right.
input_glance_right_text Glance right
input_glance_right_help Turns the camera temporarily to the right.
+input_glance_left_tooltip Press \1 to glance left.
input_glance_left_text Glance left
input_glance_left_help Turns the camera temporarily to the left.
@@ -1167,6 +1178,7 @@
input_look_left_text Look left
input_look_left_help Turns the camera to the left or moves it right if the camera direction is fixed.
+input_switch_view_tooltip Press \1 to switch camera modes.
input_switch_view_text Switch view
input_switch_view_help Switches the camera perspective. Available views: Smart external camera (default) and dumb external camera (both fixed to look at your cycle), free floating and internal camera (position fixed at your cycle ).
@@ -1238,7 +1250,7 @@
player_mainmenu_help Select player names and control methods.
system_settings_menu_text System Setup
-system_settings_menu_help Configure sound, graphics and overall appearence of \g
+system_settings_menu_help Configure sound, graphics and overall appearance of \g
main_menu_about_text About
main_menu_about_help Displays information about the version of \g, the location of its config files, sites to visit and the project admins.
@@ -1284,6 +1296,12 @@
path_info_screenshot Screenshot directories:
path_info_var Var directories:
+version_info_gl_intro \n\n0xff8888System OpenGL information:0xRESETT
+version_info_gl_vendor \n GL Vendor :
+version_info_gl_renderer \n GL Renderer :
+version_info_gl_version \n GL Version :
+
+
#********************************************
#********************************************
#
@@ -1316,10 +1334,10 @@
game_menu_finish_stop_help Abort the game after some seconds.
game_menu_finish_fast_text Fast Finish
-game_menu_finish_fast_help Let the game continue regularily until there is a winner, but in fast forward mode.
+game_menu_finish_fast_help Let the game continue regularly until there is a winner, but in fast forward mode.
game_menu_finish_normal_text Normal Finish
-game_menu_finish_normal_help Let the game continue regularily until there is a winner. Boooring.
+game_menu_finish_normal_help Let the game continue regularly until there is a winner. Boooring.
game_menu_mode_text Game Mode:
game_menu_mode_help Select the rules you want to play by:
@@ -1361,7 +1379,7 @@
game_menu_balance_ais_help Make teams equally strong by adding AIs to the weaker team?
game_menu_imb_perm_text Max. permanent imbalance:
-game_menu_imb_perm_help Maximum difference in team strengths that is tolerated permanetly; may be violated for short periods of time
+game_menu_imb_perm_help Maximum difference in team strengths that is tolerated permanently; may be violated for short periods of time
game_menu_imb_text Max. temporary imbalance:
game_menu_imb_help Maximum difference in team strengths that is tolerated
@@ -1385,28 +1403,28 @@
game_menu_wallstayup_infinite_help Walls stay up forever
game_menu_wallstayup_immediate_text immediate
-game_menu_wallstayup_immediate_help Walls disapear immediately
+game_menu_wallstayup_immediate_help Walls disappear immediately
game_menu_wallstayup_halfsecond_text 1/2s
-game_menu_wallstayup_halfsecond_help Walls dissapear after half a second
+game_menu_wallstayup_halfsecond_help Walls disappear after half a second
game_menu_wallstayup_second_text 1s
-game_menu_wallstayup_second_help Walls dissapear after one second
+game_menu_wallstayup_second_help Walls disappear after one second
game_menu_wallstayup_2second_text 2s
-game_menu_wallstayup_2second_help Walls dissapear after two seconds
+game_menu_wallstayup_2second_help Walls disappear after two seconds
game_menu_wallstayup_4second_text 4s
-game_menu_wallstayup_4second_help Walls dissapear after 4 seconds
+game_menu_wallstayup_4second_help Walls disappear after 4 seconds
game_menu_wallstayup_8second_text 8s
-game_menu_wallstayup_8second_help Walls dissapear after 8 seconds
+game_menu_wallstayup_8second_help Walls disappear after 8 seconds
game_menu_wallstayup_16second_text 16s
-game_menu_wallstayup_16second_help Walls dissapear after 16 seconds
+game_menu_wallstayup_16second_help Walls disappear after 16 seconds
game_menu_wallstayup_32second_text 32s
-game_menu_wallstayup_32second_help Walls dissapear after 32 seconds
+game_menu_wallstayup_32second_help Walls disappear after 32 seconds
game_menu_wallslength_text Wall Length:
game_menu_wallslength_help Length of the cycle walls in meters
@@ -1493,7 +1511,7 @@
network_menu_lan_text LAN Multiplayer
network_menu_lan_help Connect to a server on your local network or start a server.
-network_menu_internet_text Internet Multiplayer
+network_menu_internet_text Online Multiplayer
network_menu_internet_help Connect to an internet server or start one.
network_opts_text Network Setup
@@ -1540,7 +1558,7 @@
network_custjoin_port_help The network port the server listens on; must match the corresponding option set on the server you wish to join.
network_custjoin_name_text Server Name:
-network_custjoin_name_help The name or IP adress of the server you wish to join
+network_custjoin_name_help The name or IP address of the server you wish to join
#network host menu
network_host_text Host Network Game
@@ -1599,7 +1617,7 @@
#********************************************
misc_menu_text Misc Stuff
-misc_menu_help Diverse items that had no place elsewere, i.e. global keys.
+misc_menu_help Diverse items that had no place elsewhere, i.e. global keys.
misc_global_key_text Global Keyboard Configuration
misc_global_key_help Some keyboard settings independent of the current player.
@@ -1613,6 +1631,8 @@
misc_moviepack_text Moviepack:
misc_moviepack_help If this is enabled and the moviepack is installed, \g will display more movie-like graphics.
+misc_initial_menu_title Redo First Setup
+misc_initial_menu_help Restarts the first setup menu where you can select color and keyboard layout templates.
#*************************************
#*************************************
@@ -1628,6 +1648,8 @@
language_menu_title Language Settings
language_menu_help Choose the language used for all onscreen texts
+language_firstchoice_help Press Enter, Return or Space to select this language.
+
language_menu_item_fist First Language:
language_menu_item_first_help \g will display most text messages in this language. Use Cursor Left/Right to choose.
@@ -1779,7 +1801,7 @@
player_spectator_help In spectator mode, you do not control a cycle; you just watch the game as if you were already dead. The other players will see you on the score table and you can chat with them, but you won't be spawned at the beginng of a round.
player_name_team_text Name Team after Player:
-player_name_team_help You can set your prefered method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple colour label.
+player_name_team_help You can set your preferred method for naming your team here: On indicates you want the team to be named after its most senior player, Off means you want a simple colour label.
player_num_per_team_text Players per Team:
player_num_per_team_help Set your favourite number of players per team here. When you join a game and the smallest team has less players than specified here, you'll join that team. Otherwise, you will create a new team. Only the default behaviour is governed by this setting; you can switch teams later.
@@ -1850,7 +1872,7 @@
team_menu_help Let the players change their teams or created new teams
team_menu_player_title Choose team for \1
-team_menu_player_help Lets this player make team related decicions
+team_menu_player_help Let this player make team related decisions
team_menu_join \3join \1 (\2)
team_menu_join_help Select if you wan to join team \1 if possible otherwise you join as soon as possible.
@@ -1915,13 +1937,13 @@
sound_menu_buffer_help Selects the size of the sound buffer.
sound_menu_buffer_vsmall_text Very Small
-sound_menu_buffer_vsmall_help Latency of about 0.02s, but very high probability of artefacts.
+sound_menu_buffer_vsmall_help Latency of about 0.02s, but very high probability of artifacts.
sound_menu_buffer_small_text Small
-sound_menu_buffer_small_help Latency below 0.04s, but high probability of artefacts.
+sound_menu_buffer_small_help Latency below 0.04s, but high probability of artifacts.
sound_menu_buffer_med_text Normal
-sound_menu_buffer_med_help Latency of about 0.1s, and may still produce artefacts.
+sound_menu_buffer_med_help Latency of about 0.1s, and may still produce artifacts.
sound_menu_buffer_high_text High
sound_menu_buffer_high_help Latency of about 0.2s, probably no artifacts.
@@ -1955,7 +1977,7 @@
detail_settings_menu_help Allows you to adjust the graphical detail to your system's performance.
performance_tweaks_menu Performance Tweaks
-performance_tweaks_menu_help Settings that may improve game performace, but do not work on all systems.
+performance_tweaks_menu_help Settings that may improve game performance, but do not work on all systems.
graphics_load_defaults_text Load Defaults
graphics_load_defaults_help This will reset all this options to the ones that suit your system best. (In the opinion of this stupid program...)
@@ -1972,7 +1994,7 @@
feature_enabled_help Feature is currently activated.
#texture menuitem
-texture_menuitem_help Selects the texture mapping mode; note how it affects the menu background. The curent state is:
+texture_menuitem_help Selects the texture mapping mode; note how it affects the menu background. The current state is:
texture_off_text Off
texture_off_help No textures at all
@@ -2034,7 +2056,7 @@
screen_check_errors_help Should we listen to the warnings about non-existent video modes during initialisation? Usually, you should leave this option alone.
screen_use_sdl_text Use SDL OpenGL:
-screen_use_sdl_help Toggles use of the clean OpenGL initialisation routines; if disabled, \g will use the dirty method that was neccesary with SDL 1.0.
+screen_use_sdl_help Toggles use of the clean OpenGL initialisation routines; if disabled, \g will use the dirty method that was necessary with SDL 1.0.
screen_vsync_text VSync:
screen_vsync_help What to do with the monitor's vertical sync signal.
@@ -2091,7 +2113,7 @@
detail_floor_grid_help Only a grid of lines is drawn. This option is your choice if you use software rendering.
detail_floor_tex_text Textured Plane
-detail_floor_tex_help An infinite plane is drawn, with the texture of the grid painted on it. Recomended for all 3D-card owners. Problem: looking at the horizon, the grid will lose its sharpness too fast.
+detail_floor_tex_help An infinite plane is drawn, with the texture of the grid painted on it. Recommended for all 3D-card owners. Problem: looking at the horizon, the grid will lose its sharpness too fast.
detail_floor_2tex_text Dual Texture Plane
detail_floor_2tex_help Just as in "Textured Plane", the floor is an infinite textured plane. But here, the two groups of lines are drawn in two separate rendering steps, resulting in a much sharper image.
@@ -2155,13 +2177,13 @@
pref_showbrake_help Shows your brake depletion state in a meter in the HUD (Needs Show HUD = On to work).
pref_showspeed_text Show Speed Meter
-pref_showspeed_help Shows your speed in a metter in the HUD (Needs Show HUD = On to work).
+pref_showspeed_help Shows your speed in a meter in the HUD (Needs Show HUD = On to work).
pref_showrubber_text Show Rubber Meter
pref_showrubber_help Shows the status of your rubber in a meter in the HUD (Needs Show HUD = On to work).
misc_fps_text Show FPS:
-misc_fps_help Toggles the display of the current FPS (frames per secon) rate in the upper right corner (Needs Show HUD = On to work).
+misc_fps_help Toggles the display of the current FPS (frames per second) rate in the upper right corner (Needs Show HUD = On to work).
#tweaks menu
tweaks_displaylists_text Display Lists:
@@ -2216,7 +2238,7 @@
#********************************************
#********************************************
-timer_hickup Timer hickup of \1 seconds detected and compensated. If this happens frequently, you should check whether your system timer is operating correctly.\n
+timer_hickup Timer hiccup of \1 seconds detected and compensated. If this happens frequently, you should check whether your system timer is operating correctly.\n
#********************************************
#********************************************
@@ -2227,16 +2249,68 @@
#********************************************
welcome_message_heading Welcome to \g!
-welcome_message_intro Default Settings have been loaded according to your configuration\n\n
-welcome_message_vendor GL Vendor :
-welcome_message_renderer GL Renderer :
-welcome_message_version GL Version :
-welcome_message_finish \nHave fun!\n
-#\n\nThis Game is supported from KGN (Krawall Gaming Network, http://www.krawall.de).
+welcome_message You will now be hurled directly into a local game to get a feeling for things. It is set to a slower speed than a usual game. Your task is to make the other cycle crash into a wall. Don't panic, good luck and have fun!
+
+welcome_message_2_heading We hope you enjoyed it so far.
+welcome_message_2 You will now enter the regular main menu. You can access local games now via the "Play Game/"Local Game" menu path.\n\nBut the true action is to be found online, many industrious people have put up interesting servers with gameplay variations not available if you play solo.\nTo go online, select "Play Game"/"Multiplayer"/"Online Multiplayer".
+
#********************************************
#********************************************
#
+# Initial setup menu and first game
+#
+#********************************************
+#********************************************
+
+first_setup First Setup
+first_game_title First Game
+
+first_setup_color Colour:
+first_setup_color_help Selects the colour of your lightcylce. You'll later be able to customize it in more detail.
+first_setup_color_red 0xff0000Red0xRESETT
+first_setup_color_green 0x00ff00Green0xRESETT
+first_setup_color_blue 0x0000ffBlue0xRESETT
+first_setup_color_yellow 0xffff00Yellow0xRESETT
+first_setup_color_purple 0x7f00ffPurple0xRESETT
+first_setup_color_orange 0xff7f00Orange0xRESETT
+first_setup_color_magenta 0xff00ffMagenta0xRESETT
+first_setup_color_cyan 0x00ffffCyan0xRESETT
+first_setup_color_white 0xffffffWhite0xRESETT
+first_setup_color_dark 0x000000Dark0xRESETT
+
+first_setup_leave Leave Alone
+first_setup_leave_help Don't change this.
+
+first_setup_keys Controls:
+first_setup_keys_help Select your startup keyboard layout here. It can be customized later, individual bindings can be changed. Select with cursor left and cursor right.
+first_setup_keys_cursor Cursor Keys
+first_setup_keys_cursor_help Control your cycle with the cursor keys, bulk of keyboard used for camera control, special actions and the second player. Good for right handed people and our general recommendation.
+first_setup_keys_cursor_single Cursor Keys, Single Player
+first_setup_keys_cursor_single_help Control your cycle with the cursor keys, bulk of keyboard used for camera control and special actions. Good for right handed people when no friends are around.
+first_setup_keys_wasd WASD Keys
+first_setup_keys_wasd_help Control your cycle with the ASD keys and surroundings, Cursor keys and rest of keyboard control camera and special actions. Good for left handed people and those used to move with WASD. Bad for people with AZERTY layout.
+first_setup_keys_zqsd ZQSD Keys
+first_setup_keys_zqsd_help Control your cycle with the QSD keys and surroundings, Cursor keys and rest of keyboard control camera and special actions. Good for left handed people and those used to move with ZQSD on AZERTY keyboards.
+#first_setup_keys_both Two Handed
+#first_setup_keys_both_help Turn and look left with your left hand, turn and look right with the right hand. Good for ambidextrous people who don't want to use the mouse in any way and never play with a second player in splitscreen.
+first_setup_keys_x Traditional
+first_setup_keys_x_help The default setup of old versions of the game. X turns right, the key left to that turns left. Recommended only for veterans.
+first_setup_keys_leave Leave Alone
+
+first_setup_net Connection:
+first_setup_net_help Select the rough type of your internet connection here.
+first_setup_net_dialup Dialup
+first_setup_net_dialup_help You are connected to the internet via a traditional modem connected to a telephone line.
+first_setup_net_isdn ISDN
+first_setup_net_isdn_help You are connected to the internet via a digital ISDN line.
+first_setup_net_dsl ADSL, Cable or better
+first_setup_net_dsl_help You are connected to the internet via DSL, ADSL, Cable, T1 or other kinds of broadband.
+
+
+#********************************************
+#********************************************
+#
# Network compatibility warnings
#
#********************************************
@@ -2250,7 +2324,7 @@
#********************************************
#********************************************
#
-# leaque/highscore messages
+# league/highscore messages
#
#********************************************
#********************************************
@@ -2607,7 +2681,7 @@
network_toomanyservers \n\n\nWarning: too many servers open on this computer.\nLeaving the port range that is scanned by clients with default settings.\n\n\n
-network_browser_unidentified Reveived unidentifiable server information from \1 over socket \2.\n
+network_browser_unidentified Received unidentifiable server information from \1 over socket \2.\n
network_logout_process Logging out...\n
network_logout_done Done!\n
@@ -2630,9 +2704,9 @@
network_kill_maxidgrabber It ran out of IDs; your client was the one occupying most of them for himself. The reason for this can be a bug.
network_kill_maxiduser It ran out of IDs; your client was the one occupying most of them.
network_kill_cheater It assumed you are cheating. If that is untrue, it is a bug you should report.
-network_kill_error An error occured while processing messages from your client. This usually indicates a client or server bug.
+network_kill_error An error occurred while processing messages from your client. This usually indicates a client or server bug.
network_kill_timeout You timed out.
-network_kill_logout You logged out regularily.
+network_kill_logout You logged out regularly.
network_kill_incompatible You are running a version incompatible with the server.
network_kill_full The server is full.
network_kill_shutdown The server was shut down.
@@ -2814,7 +2888,7 @@
config_command_unknown Command \1 unknown.\n
config_command_other You probably want:\n
config_command_more There are more commands containing your search string that were left out to avoid flooding your terminal.\n
-config_file_write_error Could not write configuratrion file!\n
+config_file_write_error Could not write configuration file!\n
config_value_changed \1 changed from \2 to \3.\n
config_error_read Input error reading \1: invalid format.\n
config_message_info \1 is currently set to \2.\n
Modified: armagetronad/trunk/armagetronad/language/english_base_notranslate.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/english_base_notranslate.txt 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/language/english_base_notranslate.txt 2010-08-06 07:05:46 UTC (rev 9426)
@@ -112,37 +112,37 @@
fortress_conquest_timeout_help time without enemy contact that makes a fortress zone collapse harmlessly
# should not actually be documented, rather hidden
-bookmark_0_address_help Server adress of the 1st server bookmark
+bookmark_0_address_help Server address of the 1st server bookmark
bookmark_0_name_help Name of the 1st server bookmark
bookmark_0_port_help Server port of the 1st server bookmark
-bookmark_10_address_help Server adress of the 11th server bookmark
+bookmark_10_address_help Server address of the 11th server bookmark
bookmark_10_name_help Name of the 11th server bookmark
bookmark_10_port_help Server port of the 11th server bookmark
-bookmark_1_address_help Server adress of the 2nd server bookmark
+bookmark_1_address_help Server address of the 2nd server bookmark
bookmark_1_name_help Name of the 2nd server bookmark
bookmark_1_port_help Server port of the 2nd server bookmark
-bookmark_2_address_help Server adress of the 3rd server bookmark
+bookmark_2_address_help Server address of the 3rd server bookmark
bookmark_2_name_help Name of the 3rd server bookmark
bookmark_2_port_help Server port of the 3rd server bookmark
-bookmark_3_address_help Server adress of the 4th server bookmark
+bookmark_3_address_help Server address of the 4th server bookmark
bookmark_3_name_help Name of the 4th server bookmark
bookmark_3_port_help Server port of the 4th server bookmark
-bookmark_4_address_help Server adress of the 5th server bookmark
+bookmark_4_address_help Server address of the 5th server bookmark
bookmark_4_name_help Name of the 5th server bookmark
bookmark_4_port_help Server port of the 5th server bookmark
-bookmark_5_address_help Server adress of the 6th server bookmark
+bookmark_5_address_help Server address of the 6th server bookmark
bookmark_5_name_help Name of the 6th server bookmark
bookmark_5_port_help Server port of the 6th server bookmark
-bookmark_6_address_help Server adress of the 7th server bookmark
+bookmark_6_address_help Server address of the 7th server bookmark
bookmark_6_name_help Name of the 7th server bookmark
bookmark_6_port_help Server port of the 7th server bookmark
-bookmark_7_address_help Server adress of the 8th server bookmark
+bookmark_7_address_help Server address of the 8th server bookmark
bookmark_7_name_help Name of the 8th server bookmark
bookmark_7_port_help Server port of the 8th server bookmark
-bookmark_8_address_help Server adress of the 9th server bookmark
+bookmark_8_address_help Server address of the 9th server bookmark
bookmark_8_name_help Name of the 9th server bookmark
bookmark_8_port_help Server port of the 9th server bookmark
-bookmark_9_address_help Server adress of the 10th server bookmark
+bookmark_9_address_help Server address of the 10th server bookmark
bookmark_9_name_help Name of the 10th server bookmark
bookmark_9_port_help Server port of the 10th server bookmark
Copied: armagetronad/trunk/armagetronad/language/portugese.txt (from rev 9425, armagetronad/branches/0.2.8/armagetronad/language/portugese.txt)
===================================================================
--- armagetronad/trunk/armagetronad/language/portugese.txt (rev 0)
+++ armagetronad/trunk/armagetronad/language/portugese.txt 2010-08-06 07:05:46 UTC (rev 9426)
@@ -0,0 +1,712 @@
+# Portugese translation
+# Initially done by Sibila Madzalik de Morais <sibila@...>
+
+# Comments after this line get deleted.
+language Portugese
+
+#*****************************************
+#*****************************************
+#*****************************************
+#*****************************************
+#
+# Help texts for the various configuration
+# options that can be set via the console.
+#
+# The text item for a configuration item
+# with name NAME has the ID name_help.
+#
+#*****************************************
+#*****************************************
+#*****************************************
+#*****************************************
+
+first_use_help \xC9 a primeira vez que jogas \g?
+include_help Inclui este ficheiro
+sinclude_help Inclui o seguinte ficheiro silenciosamente, sem mensagem de erro se n\xE3o for encontrado
+rinclude_help Inclui um ficheiro que usa o sistema de origem. Use aqui para o seu proveito a s\xEDntaxe do link directo.
+new_team_allowed_help \xC9 poss\xEDvel criar uma nova equipa?
+
+#********************************************
+#********************************************
+#
+# lost settings
+#
+#********************************************
+#********************************************
+
+keyboard_help Configura\xE7\xE3o do teclado
+
+#********************************************
+#********************************************
+#
+# keyboard settings
+#
+#********************************************
+#********************************************
+
+doublebind_time_help Tempo em segundos durante o qual dois comandos diferentes do teclado n\xE3o podem realizar a mesma ac\xE7\xE3o
+
+#********************************************
+#********************************************
+#
+# Cycle physics related configuration options
+#
+#********************************************
+#********************************************
+
+cycle_speed_help Velocidade b\xE1sica da tua moto se conduzires em linha recta e n\xE3o cercares os muros.
+cycle_speed_min_help Velocidade m\xEDnima da tua moto relativamente ao CYCLE_SPEED
+cycle_speed_max_help Velocidade m\xE1xima do teu ciclo relativamente ao CYCLE_SPEED. Um valor de 0 significa nenhuma velocidade top.
+cycle_speed_decay_below_help \xCDndice da velocidade da moto aproximando-se por baixo, isto \xE9, de velocidades inferiores do valor do CYCLE_SPEED
+cycle_speed_decay_above_help \xCDndice da velocidade da moto aproximando-se por cima, isto \xE9, de velocidades superiores do valor do CYCLE_SPEED
+cycle_start_speed_help Velocidade de in\xEDcio da tua moto.
+cycle_sound_speed_help Velocidade de som.
+
+cycle_accel_help Factor de acelera\xE7\xE3o dos muros.
+cycle_accel_self_help Multiplicador do CYCLE_ACCEL do teu pr\xF3prio muro
+cycle_accel_team_help Multiplicador do CYCLE_ACCEL para os muros dos teus companheiros de equipa
+cycle_accel_enemy_help Multiplicador do CYCLE_ACCEL para os muros dos teus inimigos
+cycle_accel_rim_help Multiplicador do CYCLE_ACCEL para os muros externos da arena
+cycle_accel_slingshot_help Multiplicador de efeito total do CYCLE_ACCEL, se a moto estiver entre o seu pr\xF3prio muro e de um outro muro
+cycle_accel_tunnel_help Multiplicador de efeito total do CYCLE_ACCEL, se a moto estiver entre dois muros que n\xE3o foram criados por ela
+cycle_accel_offset_help Dist\xE2ncia m\xEDnima dos muros com acelera\xE7\xE3o tem que ser positiva
+cycle_wall_near_help Dist\xE2ncia m\xE1xima dos muros com acelera\xE7\xE3o
+
+cycle_boost_self_help Aumento de velocidade quando parte do seu pr\xF3prio muro
+cycle_boost_team_help Aumento de velocidade quando parte do muro do seu companheiro
+cycle_boost_enemy_help Aumento de velocidade quando parte do muro do inimigo
+cycle_boost_rim_help Aumento de velocidade quando parte do canto do muro
+cycle_boostfactor_self_help O factor da sua velocidade \xE9 multiplicada quando parte do seu pr\xF3prio muro
+cycle_boostfactor_team_help O factor da sua velocidade \xE9 multiplicado quando parte do muro do companheiro
+cycle_boostfactor_enemy_help O factor da sua velocidade \xE9 multiplicado quando parte do muro do inimigo
+cycle_boostfactor_rim_help O factor da sua velocidade \xE9 multiplicado quando parte do canto do muro
+
+cycle_turn_memory_help N\xFAmero de voltas pendentes que uma moto vai exactamente memorizar
+
+cycle_delay_help Tempo m\xEDnimo entre as voltas (deve ser maior que 0)
+cycle_delay_bonus_help Factor adicional de suavidade do CYCLE_DELAY aplicado s\xF3mente no servidor dedicado.
+cycle_delay_timebased_help Os atrasos de volta baseiam-se no tempo da \xFAltima volta se for 1 (default) e na dist\xE2ncia se for 0. Tamb\xE9m s\xE3o poss\xEDveis valores interm\xE9dios e fora destes limites.
+cycle_turn_speed_factor_help Factor com o qual se multiplica a velocidade de uma moto \xE0 luz quando d\xE1 a volta
+cycle_delay_doublebind_bonus_help Factor CYCLE_DELAY \xE9 multiplicado em fun\xE7\xE3o de consecutivas voltas na mesma direc\xE7\xE3o
+
+
+cycle_brake_help Intensidade do trav\xE3o
+
+cycle_width_help A extens\xE3o do objecto de colis\xE3o da moto. S\xF3 pode passar por t\xFAneis mais largos do que ela sem chocar.
+cycle_width_side_help Dist\xE2ncia m\xEDnima de uma moto de cada lado relativamente ao muro antes de chocar.
+cycle_width_rubber_min_help Se as condi\xE7\xF5es do cycle_width s\xE3o pouco infringidas, isso usar\xE1 bastante o mecanismo de seguran\xE7a. Se estiver em 1, a velocidade do uso do mecanismo de seguran\xE7a ser\xE1 o mesmo como se estivesse sentado \xE0 frente de um muro.
+cycle_width_rubber_max_help Se as condi\xE7\xF5es do cycle_width s\xE3o bastante infringidas, isso usar\xE1 bastante o mecanismo de seguran\xE7a. Se estiver em 1, a velocidade do uso do mecanismo de seguran\xE7a ser\xE1 o mesmo como se estivesse sentado \xE0 frente de um muro.
+
+#********************************************
+#********************************************
+#
+# Chatbot settings
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Score rules configuration items
+#
+#********************************************
+#********************************************
+
+# wall length modification
+
+# respawn relevant settings (no server supports respawning yet, but the client is prepared)
+
+#********************************************
+#********************************************
+#
+# Game rules configuration items
+#
+#********************************************
+#********************************************
+
+# map file
+
+# limits
+
+# single player settings (used by dedicated server only)
+
+# ladder and highscore rules
+
+#********************************************
+#********************************************
+#
+# Player Configuration items
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Convenience
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Spam protection
+#
+#********************************************
+#********************************************
+
+# spam prefix settings
+
+# spam kick messages
+
+#********************************************
+#********************************************
+#
+# Cheat protection
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Lag compensation
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Banning
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Voting settings
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Name Display
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Recording and playback
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Camera Configuration items
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Network Configuration items
+#
+#********************************************
+#********************************************
+
+
+# settings compatibility
+
+#********************************************
+#********************************************
+#
+# Graphics Configuration items
+#
+#********************************************
+#********************************************
+
+# hud
+
+#floor
+
+#moviepack settings
+
+#detail settings
+
+#screen mode
+
+#model
+
+#********************************************
+#********************************************
+#
+# Sound Configuration items
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Viewport Configuration items
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Misc. Configuration items
+#
+#********************************************
+#********************************************
+
+# program control
+
+# manning and kicking commands
+
+# communication
+
+#********************************************
+#********************************************
+#
+# Bugs
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#********************************************
+#
+# Key bindings; every input ITEM item gets two
+# strings: the short description string
+# appearing in the configuration menus
+# (named input_item_text) and the help message
+# you see below the input configuration menu
+# when you select the input item for a longer
+# time (named input_item_help).
+#
+#********************************************
+#********************************************
+#********************************************
+#********************************************
+
+#generic texts
+
+# used for listing key bindings
+
+#********************************************
+#********************************************
+#
+# Misc. Configuration items
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# console scrolling items
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# cycle control keys
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# camera control keys
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# instant chat keys
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#********************************************
+#********************************************
+#
+# Menu texts (titles, menuitems and
+# selection items) and their corresponding
+# help texts (the texts that appear when
+# you don't press up and down in the menu
+# for a while)
+#
+#********************************************
+#********************************************
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# main menu
+#
+#********************************************
+#********************************************
+
+main_menu_text \g v\1
+
+game_menu_text Jogo
+game_menu_main_help Configura\xE7\xE3o e in\xEDcio do jogo.
+
+player_mainmenu_text Configura\xE7\xE3o do jogador
+player_mainmenu_help Seleccione o nome do jogador e as op\xE7\xF5es de controlo
+
+system_settings_menu_text Configura\xE7\xE3o do sistema
+system_settings_menu_help Configura\xE7\xE3o audio, gr\xE1fica e da imagem geral de \g
+
+main_menu_about_text Sobre
+main_menu_about_help Disp\xF5e informa\xE7\xF5es sobre a vers\xE3o de \g, a localiza\xE7\xE3o dos seus ficheiros de configura\xE7\xE3o, s\xEDtios para visitar e os administradores do projecto.
+
+main_menu_exit_text Abandonar o jogo
+main_menu_exit_help Adeus!
+
+
+#ingame menu
+ingame_menu_text Menu
+
+game_menu_ingame_text Mudar o jogo
+game_menu_ingame_help Configura\xE7\xE3o do jogo
+
+ingame_menu_exit_text Voltar ao jogo
+ingame_menu_exit_help Voltar \xE0 grelha do jogo!
+
+game_menu_shutdown_text Terminar o servidor
+game_menu_shutdown_help Terminar o processo do servidor e voltar ao menu principal.
+
+game_menu_exit_text Abandonar a grelha do jogo
+game_menu_exit_help Finaliza o actual jogo e volta ao menu do jogo.
+
+game_menu_disconnect_text Desconectar
+game_menu_disconnect_help Desconectar do servidor e voltar ao menu principal.
+
+
+#********************************************
+#********************************************
+#
+# Version Info screen
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# game menu
+#
+#********************************************
+#********************************************
+
+#game settings
+
+#********************************************
+#********************************************
+#
+# network menus
+#
+#********************************************
+#********************************************
+
+#network game menu
+
+#network options
+
+#network custom join menu
+
+#network host menu
+
+#********************************************
+#********************************************
+#
+# "Misc Stuff" menu
+#
+#********************************************
+#********************************************
+
+#*************************************
+#*************************************
+#
+# language menu
+#
+#*************************************
+#*************************************
+
+#*************************************
+#*************************************
+#
+# police menu
+#
+#*************************************
+#*************************************
+
+#*************************************
+#*************************************
+#
+# vote menu
+#
+#*************************************
+#*************************************
+
+#*************************************
+#*************************************
+#
+# player menus
+#
+#*************************************
+#*************************************
+
+#player menu
+
+#player setup
+
+#camera prefs menu
+
+# team menu
+
+#********************************************
+#********************************************
+#
+# sound menu
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# graphics menus
+#
+#********************************************
+#********************************************
+
+#display menu
+
+#feature menuitem
+
+#texture menuitem
+
+#screen mode menu
+
+#detail menu
+
+#preferences menu
+
+#tweaks menu
+
+#********************************************
+#********************************************
+#
+# generic menu texts
+#
+#********************************************
+#********************************************
+
+#menu texts: generic
+
+#********************************************
+#********************************************
+#********************************************
+#********************************************
+#
+# Game messages printed on the console
+#
+#********************************************
+#********************************************
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Greeting message printed on first start
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Initial setup menu and first game
+#
+#********************************************
+#********************************************
+
+#first_setup_keys_both Two Handed
+#first_setup_keys_both_help Turn and look left with your left hand, turn and look right with the right hand. Good for ambidextrous people who don't want to use the mouse in any way and never play with a second player in splitscreen.
+
+#********************************************
+#********************************************
+#
+# Network compatibility warnings
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# league/highscore messages
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# messages describing the current gamestate
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# messages about player activity
+#
+#********************************************
+#********************************************
+
+#player_joins_team_now \1 0x7fff7fnow plays for \2.\n
+
+#camera messages
+
+#score table
+
+#********************************************
+#********************************************
+#
+# network messages
+#
+#********************************************
+#********************************************
+
+#network_kill_banned You are banned. Please stay away. The more often you retry to connect, the longer your ban stays.
+
+#*************************************
+#*************************************
+#
+# vote messages
+#
+#*************************************
+#*************************************
+
+#********************************************
+#********************************************
+#
+# the server browser menu
+# and master server messages
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Resource messages
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Directory messages
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# map messages
+#
+#********************************************
+#********************************************
+
+# printed on loading a map
+
+# title of map error message
+
+# printed when a map can't be loaded, and the user can do something about it
+
+# printed when a map can't be loaded, and the failure is the server admin's fault
+
+# worst case: default map could not load, either
+
+# resource at the wrong place
+
+#********************************************
+#********************************************
+#
+# Texture messages
+#
+#********************************************
+#********************************************
+
+# texture not found error message
+
+#********************************************
+#********************************************
+#
+# Sound messages
+#
+#********************************************
+#********************************************
+
+#********************************************
+#********************************************
+#
+# Configuration messages
+#
+#********************************************
+#********************************************
+
+#*************************************
+#*************************************
+#
+# Login messages
+#
+#*************************************
+#*************************************
+
+#login texts
+
+# access level messages
+
+# various reasons for logins to fail
+
+# items that should not be translated
+
+# Room for lost settings in translation files:
+
+# leaque/highscore messages
+#\n\nThis Game is supported from KGN (Krawall Gaming Network, http://www.krawall.de).
+# The text item for a configuration
+
Modified: armagetronad/trunk/armagetronad/src/doc/bugs.html.m4
===================================================================
--- armagetronad/trunk/armagetronad/src/doc/bugs.html.m4 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/src/doc/bugs.html.m4 2010-08-06 07:05:46 UTC (rev 9426)
@@ -100,7 +100,7 @@
enters, you got accounted one won round on your score, and the
multiplayer settings were not restored.</li>
-<li>camera hickups</li>
+<li>camera hiccups</li>
<li> ALT-Tabbing out of PROGTITLE for Windows causes BAAAD lockups.</li>
Modified: armagetronad/trunk/armagetronad/src/doc/changelog.html.m4
===================================================================
--- armagetronad/trunk/armagetronad/src/doc/changelog.html.m4 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/src/doc/changelog.html.m4 2010-08-06 07:05:46 UTC (rev 9426)
@@ -104,7 +104,7 @@
the game if not in a network game (Seven3)])
NEWSENTRY([2000/05/30],[really fixed the latest exit crash, the camera
- hickups, a score bug, (hopefully) the VooDoo problems. Added
+ hiccups, a score bug, (hopefully) the VooDoo problems. Added
<a href=index.html#cl>command line switches</a>.])
NEWSENTRY([2000/05/29],[Released version 0.1.3;
Modified: armagetronad/trunk/armagetronad/src/engine/eCamera.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/eCamera.cpp 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/src/engine/eCamera.cpp 2010-08-06 07:05:46 UTC (rev 9426)
@@ -197,7 +197,6 @@
};
-
uActionCamera eCamera::se_lookDown("BANK_DOWN",
-120,
uAction::uINPUT_ANALOG);
@@ -217,7 +216,12 @@
uActionCamera eCamera::se_switchView("SWITCH_VIEW", -160);
+uActionTooltip eCamera::se_glanceBackTooltip( eCamera::se_glance[GLANCE_FORWARD], 1 );
+uActionTooltip eCamera::se_glanceRightTooltip( eCamera::se_glance[GLANCE_RIGHT], 3 );
+uActionTooltip eCamera::se_glanceLeftTooltip( eCamera::se_glance[GLANCE_LEFT], 3 );
+uActionTooltip eCamera::se_switchViewTooltip( eCamera::se_switchView, 2 );
+
static REAL s_startFollowX = -30, s_startFollowY = -30, s_startFollowZ = 80;
static REAL s_startSmartX = 10, s_startSmartY = 30, s_startSmartZ = 2;
static REAL s_startFreeX = 10, s_startFreeY = -70, s_startFreeZ = 100;
Modified: armagetronad/trunk/armagetronad/src/engine/eCamera.h
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/eCamera.h 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/src/engine/eCamera.h 2010-08-06 07:05:46 UTC (rev 9426)
@@ -47,8 +47,8 @@
class eGrid;
class uActionCamera;
class uGlanceAction;
+class uActionTooltip;
-
//extern REAL se_cameraRise; // how far down does the current camera look?
//extern REAL se_cameraZ;
@@ -62,11 +62,12 @@
class eCamera{
protected:
- enum { se_glances = 4 };
+ enum { GLANCE_FORWARD, GLANCE_BACK, GLANCE_RIGHT, GLANCE_LEFT, se_glances = 4 };
static uActionCamera se_lookUp,se_lookDown,se_lookLeft,se_lookRight,
se_moveLeft,se_moveRight,se_moveUp,se_moveDown,se_moveForward,se_moveBack,
se_zoomIn,se_zoomOut, se_switchView;
static uGlanceAction se_glance[se_glances];
+ static uActionTooltip se_glanceLeftTooltip, se_glanceRightTooltip, se_glanceBackTooltip, se_switchViewTooltip;
int id;
// tCHECKED_PTR(eGameObject) foot;
Modified: armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp 2010-08-06 07:05:46 UTC (rev 9426)
@@ -46,8 +46,10 @@
#include <map>
uActionPlayer eGameObject::se_turnRight("CYCLE_TURN_RIGHT", -10);
+static uActionTooltip se_turnRightTooltip( eGameObject::se_turnRight, 11, &ePlayer::VetoActiveTooltip );
uActionPlayer eGameObject::se_turnLeft("CYCLE_TURN_LEFT", -10);
+static uActionTooltip se_turnLeftTooltip( eGameObject::se_turnLeft, 10, &ePlayer::VetoActiveTooltip );
// entry and deletion in the list of all gameObjects
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2010-08-06 07:05:46 UTC (rev 9426)
@@ -612,7 +612,7 @@
// menu entry since the user probably just wants to enter the password.
for(int i = 0; i < MAX_PLAYERS; ++i) {
tString const &id = se_Players[i].globalID;
- if(id.Len() <= username.Len() || id(username.Len() - 1) != '@') {
+ if(username.Len() <= 1 || id.Len() <= username.Len() || id(username.Len() - 1) != '@') {
continue;
}
bool match = true;
@@ -1125,6 +1125,8 @@
nAuthentication::SetLoginResultCallback (&ResultCallback);
#endif
+ lastTooltip_ = -100;
+
nameTeamAfterMe = false;
favoriteNumberOfPlayersPerTeam = 3;
@@ -1139,6 +1141,9 @@
if ( !getUserName )
name << "Player " << id+1;
+ // default global ID so logins are redirected to the forums
+ globalID = "@forums";
+
#ifndef DEDICATED
tString confname;
@@ -1311,6 +1316,16 @@
#ifndef DEDICATED
void ePlayer::Render(){
if (cam) cam->Render();
+
+ // present tooltip help
+ double now = tSysTimeFloat();
+ if( se_GameTime() > 1 && now-lastTooltip_ > 1 && !rConsole::CenterDisplayActive() )
+ {
+ if( uActionTooltip::Help( ID()+1 ) || uActionTooltip::Help( 0 ) || VetoActiveTooltip(ID()+1) )
+ lastTooltip_ = now;
+ else
+ lastTooltip_ = now+60;
+ }
}
#endif
@@ -2076,9 +2091,11 @@
return 0;
}
+#ifndef KRAWALL_SERVER
//The Base Remote Admin Password
static tString sg_adminPass( "NONE" );
static tConfItemLine sg_adminPassConf( "ADMIN_PASS", sg_adminPass );
+#endif
#ifdef DEDICATED
@@ -4256,6 +4273,33 @@
return PlayerViewport(p) && PlayerConfig(p);
}
+// veto function for tooltips that require a controllable game object
+bool ePlayer::VetoActiveTooltip(int player)
+{
+ // check if the player exists and controls a living object
+ if( player == 0 )
+ {
+ return true;
+ }
+ ePlayer * p = PlayerConfig(player-1);
+ if ( !p )
+ {
+ return true;
+ }
+ ePlayerNetID * pn = p->netPlayer;
+ if ( !pn )
+ {
+ return true;
+ }
+ eNetGameObject *o = pn->Object();
+ if (!o || !o->Alive())
+ {
+ return true;
+ }
+
+ return false;
+}
+
static tConfItemBase *vpbtp[MAX_VIEWPORTS];
void ePlayer::Init(){
@@ -4302,6 +4346,15 @@
uActionPlayer ePlayer::s_chat("CHAT");
+// only display chat in multiplayer games
+static bool se_ChatTooltipVeto(int)
+{
+ return sn_GetNetState() == nSTANDALONE;
+}
+
+uActionTooltip ePlayer::s_chatTooltip(ePlayer::s_chat, 1, &se_ChatTooltipVeto);
+uActionTooltip s_toggleSpectatorTooltip(se_toggleSpectator, 1, &se_ChatTooltipVeto);
+
int pingCharity = 100;
static const int maxPingCharity = 300;
@@ -7160,10 +7213,13 @@
// *******************
void ePlayerNetID::SetChatting ( ChatFlags flag, bool chatting )
{
+ /* z-man can't remember why this exception was made; probably
+ just do disable the chat indicator while you play in local menus.
if ( sn_GetNetState() == nSTANDALONE && flag == ChatFlags_Menu )
{
chatting = false;
}
+ */
if ( chatting )
{
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.h
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.h 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.h 2010-08-06 07:05:46 UTC (rev 9426)
@@ -87,11 +87,14 @@
class ePlayer: public uPlayerPrototype{
friend class eMenuItemChat;
static uActionPlayer s_chat;
+ static uActionTooltip s_chatTooltip;
tConfItemBase *configuration[PLAYER_CONFITEMS];
int CurrentConfitem;
void StoreConfitem(tConfItemBase *c);
void DeleteConfitems();
+
+ double lastTooltip_;
public:
tString name; // the player's screen name
tString globalID; // the global ID of the player in user@... form
@@ -141,6 +144,9 @@
static bool PlayerIsInGame(int p);
+ // veto function for tooltips that require a controllable game object
+ static bool VetoActiveTooltip(int player);
+
static rViewport * PlayerViewport(int p);
static void LogIn(); //!< sends authentication login messages for all local players
Modified: armagetronad/trunk/armagetronad/src/network/nNetObject.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nNetObject.cpp 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/src/network/nNetObject.cpp 2010-08-06 07:05:46 UTC (rev 9426)
@@ -1904,19 +1904,17 @@
#ifdef DEBUG
sn_BreakOnObjectID(i);
#endif
- if (no->ActionOnQuit())
+ bool destroy = no->ActionOnQuit();
+
+ // take ownership of the object in any case
+ no->createdLocally=true;
+ no->owner=::sn_myNetID;
+ sn_netObjectsOwner(i)=::sn_myNetID;
+
+ if (destroy || no->AcceptClientSync())
{
- no->createdLocally=true;
tControlledPTR< nNetObject > bounce( no ); // destroy it, if noone wants it
}
- else
- {
- no->owner=::sn_myNetID; // or make it mine.
- sn_netObjectsOwner(i)=::sn_myNetID;
- if (no->AcceptClientSync()){
- tControlledPTR< nNetObject > bounce( no ); // destroy it, if noone wants it
- }
- }
}
}
}
Modified: armagetronad/trunk/armagetronad/src/network/nNetwork.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2010-08-06 07:05:46 UTC (rev 9426)
@@ -1489,6 +1489,9 @@
static bool sn_lockOut028tTest = true;
static tSettingItem< bool > sn_lockOut028TestConf( "NETWORK_LOCK_OUT_028_TEST", sn_lockOut028tTest );
+// the network stuff planned to send:
+tHeap<planned_send> send_queue[MAXCLIENTS+2];
+
void sn_LoginHandler_intermediate( nMessage &m )
{
Network::Login login;
@@ -1681,6 +1684,10 @@
reset_last_acks(MAXCLIENTS+1);
sn_Connections[MAXCLIENTS+1].acks_.clear();
+ // clear message queue
+ while (send_queue[new_id].Len())
+ delete (send_queue[new_id](0));
+
// send login accept message with high priority
Network::LoginAccepted & accepted = sn_loginAcceptedDescriptor.Send( new_id );
accepted.set_net_id( new_id );
@@ -2973,13 +2980,6 @@
static tConfItemFunc CenterMessage_c("CENTER_MESSAGE",&CeterMessage_conf);
static tAccessLevelSetter sn_CenterConfLevel( CenterMessage_c, tAccessLevel_Moderator );
-// ****************************************************************
-// Send Queue
-// ****************************************************************
-
-// the network stuff planned to send:
-tHeap<planned_send> send_queue[MAXCLIENTS+2];
-
planned_send::planned_send(REAL priority,int Peer){
peer=Peer;
@@ -3040,11 +3040,11 @@
if (time<lastTime-.01 || time>lastTime+1000)
#ifdef DEBUG
{
- tERR_ERROR("Timer hickup!");
+ tERR_ERROR("Timer hiccup!");
}
#else
{
- tERR_WARN("Timer hickup!");
+ tERR_WARN("Timer hiccup!");
lastTime=time;
}
#endif
Modified: armagetronad/trunk/armagetronad/src/render/rConsole.h
===================================================================
--- armagetronad/trunk/armagetronad/src/render/rConsole.h 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/src/render/rConsole.h 2010-08-06 07:05:46 UTC (rev 9426)
@@ -82,6 +82,9 @@
virtual void DoCenterDisplay(const tString &s,REAL timeout=2,REAL r=1,REAL g=1,REAL b=1);
virtual tString ColorString(REAL r, REAL g, REAL b) const;
+
+ //! returns whether a center display is currently in progress
+ static bool CenterDisplayActive();
};
Modified: armagetronad/trunk/armagetronad/src/render/rConsoleGraph.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/render/rConsoleGraph.cpp 2010-08-05 22:38:50 UTC (rev 9425)
+++ armagetronad/trunk/armagetronad/src/render/rConsoleGraph.cpp 2010-08-06 07:05:46 UTC (rev 9426)
@@ -30,6 +30,7 @@
#ifndef DEDICATED
#include "rFont.h"
+#include "rRender.h"
#include "tSysTime.h"
#include "rConsole.h"
#include "rSysdep.h"
@@ -45,9 +46,15 @@
static rDisplayListAlphaSensitive sr_consoleDisplayList;
+// flag memorizing whether the console already has been rendered this frame
+static bool sr_alreadyDisplayed = false;
+
static void sr_ConsolePerFrame(){
if (sr_con.autoDisplayAtSwap)
+ {
sr_con.Render();
+ }
+ sr_alreadyDisplayed = false;
}
static rPerFrameTask console_pf(&sr_ConsolePerFrame);
@@ -74,9 +81,18 @@
static tConfItem<int> sr_indentConf("CONSOLE_INDENT",sr_indent);
void rConsole::Render(){
+ if( sr_alreadyDisplayed )
+ {
+ return;
+ }
+
+ sr_alreadyDisplayed = true;
+
if (!sr_glOut)
return;
+ static REAL lastBottom = -1.0;
+
sr_ResetRenderState(true);
REAL W=sr_screenWidth;
@@ -128,6 +144,8 @@
DisplayText(0,centerMessageY,height,sr_centerString,sr_fontCenterMessage);
//std::cerr << "DisplayText(0," << centerMessageY << "," << (rCWIDTH_CON*4*fak) << "," << (rCHEIGHT_CON*4*fak) << "," <<sr_centerString << ");\n";
+ RenderEnd();
+ sr_ResetRenderState(true);
}
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|