~swag/armagetronad/0.2.9-sty+ct+ap-fork

Viewing changes to language/english_base.txt

Committer: Bazaarmagetron
Date: 2011-07-19 09:54:42 UTC
mfrom: (563.43.2 0.2.8-armagetronad-work)
mto: (563.48.4 armagetronad)
mto: This revision was merged to the branch mainline in revision 731.
Revision ID: z-man@users.sf.net-20110719095442-2p5cjigatoxfe8kq

Automatic merging of commits that would change history order:
   ------------------------------------------------------------
   revno: 1282.1.2
   committer: Daniel Lee Harple <leeharple@gmail.com>
   branch nick: 0.2.8-armagetronad-work
   timestamp: Mon 2011-07-18 21:46:08 -0400
   message:
     Added ENCODING ladderlog event.
   ------------------------------------------------------------
   revno: 1282.1.1
   committer: Daniel Lee Harple <leeharple@gmail.com>
   branch nick: 0.2.8-armagetronad-work
   timestamp: Wed 2011-07-13 00:49:08 -0400
   message:
     WHITELIST_ENEMIES_USERNAME requires authentication support to be enabled

files modified:
NEWS

language/english_base.txt

src/engine/ePlayer.cpp

src/tron/gArmagetron.cpp

Show diffs side-by-side

added added

removed removed

language/english_base.txt

787

ladderlog_write_death_frag_help Write to ladderlog: DEATH_FRAG <prey> <predator>

788

ladderlog_write_death_suicide_help Write to ladderlog: DEATH_SUICIDE <player>

789

ladderlog_write_death_teamkill_help Write to ladderlog: DEATH_TEAMKILL <prey> <predator>

790

ladderlog_write_encoding_help Write to ladderlog: ENCODING <charset>. Specifies the encoding for data in ladderlog.txt.

790

791

ladderlog_write_game_end_help Write to ladderlog: GAME_END <date and time>

791

792

ladderlog_write_game_time_help Write to ladderlog: GAME_TIME <time> (see also: GAME_TIME_INTERVAL)

792

793

ladderlog_write_match_winner_help Write to ladderlog: MATCH_WINNER <team> <players>

Older »