← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to config/settings.cfg

Committer: kyle
Date: 2011-07-20 17:52:45 UTC
mfrom: (563.20.34 0.2.8-armagetronad-sty)
Revision ID: racingmasterweb@gmail.com-20110720175245-8coqtsgb86qbfjwv

merge with mainline

files modified:
NEWS

batch/make/uninstall

config/settings.cfg

configure.ac

language/english_base.txt

src/engine/eCoord.h

src/engine/eGameObject.h

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.cpp

src/engine/eVoter.cpp

src/network/nKrawallPrivate.cpp

src/network/nNetObject.h

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nPriorizing.cpp

src/network/nPriorizing.h

src/network/nServerInfo.h

src/render/rModel.h

src/tools/tArray.h

src/tools/tConfiguration.h

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tHeap.h

src/tools/tLinkedList.h

src/tools/tList.h

src/tools/tLocale.h

src/tools/tMemManager.cpp

src/tools/tResourceManager.cpp

src/tools/tSafePTR.h

src/tools/tToDo.cpp

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gGame.cpp

src/tron/gMenus.cpp

src/tron/gServerBrowser.cpp

src/tron/gServerFavorites.cpp

src/tron/gSpawn.h

src/tron/gWall.cpp

src/ui/uInput.cpp

src/ui/uMenu.h

Show diffs side-by-side

added added

removed removed

config/settings.cfg

77

77

ALLOW_ENEMIES_SAME_IP 0 # if set to 1, this allows two players that apparently come from the same machine to fight for points with each other

78

78

ALLOW_ENEMIES_SAME_CLIENT 0 # if set to 1, this allows two players that play on the same client to fight for points with each other

79

79

80

# If ALLOW_ENEMIES_SAME_IP is set to 0, you can allow players from the same IP to be enemies by whitelisting their authenticated names or IP:

81

# WHITELIST_ENEMIES_USERNAME player1@ player2@

82

# WHITELIST_ENEMIES_IP 127.0.0.1

83

80

84

ALLOW_CONTROL_DURING_CHAT 0 # if set to 1, this allows a player to issue cycle and camera control commands during chat (losing the chatbot and the yellow chat pyramid). This feature was buggy and has been disabled for 0.2.8.0.

81

85

82

86

ALLOW_IMPOSTERS 0 # allow two players to have the same name

Older »