← Back to branch summary

~armagetronad-dev/armagetronad/trunk-armagetronad-fortress_ai

~armagetronad-dev/armagetronad/trunk-armagetronad-fortress_ai

Viewing all changes in revision 938.

Committer: Manuel Moos
Date: 2010-02-07 15:24:44 UTC
mfrom: (890.1.70 armagetronad)
Revision ID: z-man@users.sf.net-20100207152444-87np1ihlek9yegte

Merging from mainline.

files added:
language/polish.txt

resource/proto/AATeam/map-0.2.8.0.dtd

resource/proto/spinning_square.aamap.xml

src/engine/eChat.cpp

src/engine/eChat.h

src/test

src/test/Makefile.am

src/test/chat_prefix_test.cpp

files removed:
language/polish.txt

language/polish_transliterated.txt

files modified:
.bzrignore

AUTHORS

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

Makefile.am

Makefile.manual

NEWS

acinclude.m4

batch/make/uninstall

batch/sysinstall.in

bootstrap.sh

config/Makefile.am

config/examples/cvs_test/fortress_scoring.cfg

config/examples/cvs_test/sumo_complete.cfg

config/examples/teamsumo.cfg

config/settings.cfg

config/settings_authentication.cfg

config/settings_dedicated.cfg

configure.ac

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/french.txt

language/languages.txt.in

language/update.py

resource/proto/Anonymous/original/original.map.xml

resource/proto/Anonymous/shapes/diamond.aamap.xml

resource/proto/Luke-Jr/n-gon/40-gon.map.xml

resource/proto/Your_mom/inaktek/inaktek.map.xml

resource/proto/Your_mom/repeat/repeat.map.xml

resource/proto/Z-Man/fortress_for_old_clients.aamap.xml

resource/proto/Z-Man/fourfold_fortress_for_old_clients.aamap.xml

resource/proto/Z-Man/sumo_4x4.aamap.xml

resource/proto/Z-Man/sumo_8x2.aamap.xml

resource/proto/Z-Man/zonetest.aamap.xml

src/Makefile.am

src/engine/eCamera.cpp

src/engine/eDisplay.cpp

src/engine/eGameObject.cpp

src/engine/eGrid.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eVoter.cpp

src/macosx/AAPaste.cpp

src/macosx/AAURLHandler.h

src/macosx/AAURLHandler.mm

src/network/nAuthentication.cpp

src/network/nConfig.cpp

src/network/nKrawall.cpp

src/network/nNetObject.cpp

src/network/nNetwork.cpp

src/network/nProtoBuf.cpp

src/network/nProtoBuf.h

src/network/nServerInfo.cpp

src/network/nSocket.cpp

src/network/nStreamMessage.cpp

src/network/nStreamMessage.h

src/render/rConsole.cpp

src/render/rConsole.h

src/render/rModel.cpp

src/render/rModel.h

src/render/rScreen.cpp

src/render/rSysdep.cpp

src/render/rSysdep.h

src/resource/tResourceManager.cpp

src/resource/tResourceManager.h

src/tools/tConfiguration.cpp

src/tools/tConfiguration.h

src/tools/tDirectories.cpp

src/tools/tString.cpp

src/tools/tString.h

src/tools/tXmlParser.cpp

src/tools/values/vParser.ypp

src/tron/gAIBase.cpp

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gGame.cpp

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gServerBrowser.cpp

src/tron/gTeam.cpp

src/tron/zone/zEffector.cpp

src/tron/zone/zShape.cpp

src/tron/zone/zZone.cpp

src/tron/zone/zZone.h

src/ui/uInput.cpp

src/ui/uMenu.cpp

win32/armagetronad.nsi

win32/armagetronad_dedicated.nsi

Show diffs side-by-side

added added

removed removed

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

Makefile.manual

batch/make/uninstall

batch/sysinstall.in

config/Makefile.am

config/examples/cvs_test/fortress_scoring.cfg

config/examples/cvs_test/sumo_complete.cfg

config/examples/teamsumo.cfg

config/settings.cfg

config/settings_authentication.cfg

config/settings_dedicated.cfg

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/french.txt

language/languages.txt.in

language/polish.txt

language/polish.txt

language/polish_transliterated.txt

language/update.py

resource/proto/AATeam/map-0.2.8.0.dtd

resource/proto/Anonymous/original/original.map.xml

resource/proto/Anonymous/shapes/diamond.aamap.xml

resource/proto/Luke-Jr/n-gon/40-gon.map.xml

resource/proto/Your_mom/inaktek/inaktek.map.xml

resource/proto/Your_mom/repeat/repeat.map.xml

resource/proto/Z-Man/fortress_for_old_clients.aamap.xml

resource/proto/Z-Man/fourfold_fortress_for_old_clients.aamap.xml

resource/proto/Z-Man/sumo_4x4.aamap.xml

resource/proto/Z-Man/sumo_8x2.aamap.xml

resource/proto/Z-Man/zonetest.aamap.xml

resource/proto/spinning_square.aamap.xml

src/Makefile.am

src/engine/eCamera.cpp

src/engine/eChat.cpp

src/engine/eChat.h

src/engine/eDisplay.cpp

src/engine/eGameObject.cpp

src/engine/eGrid.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eVoter.cpp

src/macosx/AAPaste.cpp

src/macosx/AAURLHandler.h

src/macosx/AAURLHandler.mm

src/network/nAuthentication.cpp

src/network/nConfig.cpp

src/network/nKrawall.cpp

src/network/nNetObject.cpp

src/network/nNetwork.cpp

src/network/nProtoBuf.cpp

src/network/nProtoBuf.h

src/network/nServerInfo.cpp

src/network/nSocket.cpp

src/network/nStreamMessage.cpp

src/network/nStreamMessage.h

src/render/rConsole.cpp

src/render/rConsole.h

src/render/rModel.cpp

src/render/rModel.h

src/render/rScreen.cpp

src/render/rSysdep.cpp

src/render/rSysdep.h

src/resource/tResourceManager.cpp

src/resource/tResourceManager.h

src/test/Makefile.am

src/test/chat_prefix_test.cpp

src/tools/tConfiguration.cpp

src/tools/tConfiguration.h

src/tools/tDirectories.cpp

src/tools/tString.cpp

src/tools/tString.h

src/tools/tXmlParser.cpp

src/tools/values/vParser.ypp

src/tron/gAIBase.cpp

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gGame.cpp

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gServerBrowser.cpp

src/tron/gTeam.cpp

src/tron/zone/zEffector.cpp

src/tron/zone/zShape.cpp

src/tron/zone/zZone.cpp

src/tron/zone/zZone.h

src/ui/uInput.cpp

src/ui/uMenu.cpp

win32/armagetronad.nsi

win32/armagetronad_dedicated.nsi

Older »