← Back to branch summary

~armagetronad-ct/armagetronad/armagetronad-ct

~armagetronad-ct/armagetronad/armagetronad-ct

Viewing all changes in revision 981.

Committer: Voodoo
Date: 2011-12-22 16:07:45 UTC
Revision ID: erollet@yahoo.fr-20111222160745-3e14kf47cc1y2ibt

merge -r 1186..1363 lp:armagetronad

files added:
config/examples/scripts

config/examples/scripts/flexban.cfg

resource/proto/AATeam/tutorials

resource/proto/AATeam/tutorials/ai_challenge.aamap.xml

resource/proto/AATeam/tutorials/bullies.aamap.xml

resource/proto/AATeam/tutorials/empty.aacockpit.xml

resource/proto/AATeam/tutorials/grind.aamap.xml

resource/proto/AATeam/tutorials/map.aamap.xml

resource/proto/AATeam/tutorials/navigation.aamap.xml

resource/proto/AATeam/tutorials/spartanic.aacockpit.xml

resource/proto/AATeam/tutorials/speedkill.aamap.xml

resource/proto/AATeam/tutorials/survival.aamap.xml

scripts

scripts/examples

scripts/examples/flexban.sh

src/serverquery

src/serverquery/json

src/serverquery/json/json-forwards.h

src/serverquery/json/json.h

src/serverquery/jsoncpp.cpp

src/serverquery/serverquery.cpp

src/tron/gTutorial.cpp

src/tron/gTutorial.h

textures/message_background.png

textures/settings_textures.cfg

textures/tutorials

textures/tutorials/clipart

textures/tutorials/clipart/background.png

textures/tutorials/clipart/check.png

textures/tutorials/clipart/check.xcf

textures/tutorials/clipart/circle.png

textures/tutorials/clipart/fail.png

textures/tutorials/conquest

textures/tutorials/conquest/conquest.txt

textures/tutorials/conquest/conquest.xcf

textures/tutorials/conquest/start.png

textures/tutorials/conquest/success.png

textures/tutorials/doublegrind

textures/tutorials/doublegrind/background.png

textures/tutorials/doublegrind/doublegrind.txt

textures/tutorials/doublegrind/doublegrind.xcf

textures/tutorials/doublegrind/success.png

textures/tutorials/doublegrind/toohard1.png

textures/tutorials/doublegrind/toohard2.png

textures/tutorials/doublegrind/toohard3.png

textures/tutorials/grinding

textures/tutorials/grinding/fail1.png

textures/tutorials/grinding/fail2.png

textures/tutorials/grinding/fail3.png

textures/tutorials/grinding/grind.png

textures/tutorials/grinding/grinding.txt

textures/tutorials/grinding/grinding.xcf

textures/tutorials/grinding/nogrind.png

textures/tutorials/navigation

textures/tutorials/navigation/direct.png

textures/tutorials/navigation/fail1.png

textures/tutorials/navigation/fail2.png

textures/tutorials/navigation/fail3.png

textures/tutorials/navigation/fancy.png

textures/tutorials/navigation/indirect.png

textures/tutorials/navigation/navigation.txt

textures/tutorials/navigation/navigation.xcf

textures/tutorials/navigation/start.png

textures/tutorials/navigation/zone.png

textures/tutorials/speedkill

textures/tutorials/speedkill/adjust1.png

textures/tutorials/speedkill/adjust2.png

textures/tutorials/speedkill/adjust3.png

textures/tutorials/speedkill/fail_donothing.png

textures/tutorials/speedkill/speedkill.txt

textures/tutorials/speedkill/speedkill.xcf

textures/tutorials/speedkill/success1.png

textures/tutorials/speedkill/success2.png

textures/tutorials/speedkill/success3.png

textures/tutorials/speedkilldefense

textures/tutorials/speedkilldefense/fail1.png

textures/tutorials/speedkilldefense/fail2.png

textures/tutorials/speedkilldefense/fail3.png

textures/tutorials/speedkilldefense/speedkilldefense.txt

textures/tutorials/speedkilldefense/speedkilldefense.xcf

textures/tutorials/speedkilldefense/start.png

textures/tutorials/speedkilldefense/trap1.png

textures/tutorials/speedkilldefense/trap2.png

textures/tutorials/speedkilldefense/trap3.png

textures/tutorials/survival

textures/tutorials/survival/fail1.png

textures/tutorials/survival/fail2.png

textures/tutorials/survival/fail3.png

textures/tutorials/survival/spiral.png

textures/tutorials/survival/survival.txt

textures/tutorials/survival/survival.xcf

textures/tutorials/survival/wiggle.png

textures/tutorials/teamstart

textures/tutorials/teamstart/background.png

textures/tutorials/teamstart/straight.png

textures/tutorials/teamstart/success.png

textures/tutorials/teamstart/teamstart.txt

textures/tutorials/teamstart/teamstart.xcf

files removed:
textures/KGN_logo.png

files renamed:
scripts/ => rubyscripts/

files modified:
.bzrignore

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

Makefile.am

Makefile.manual

NEWS

batch/armabuild/resource.py

batch/make/uninstall

config/default.cfg

config/examples/cvs_test/fortress_physics.cfg

config/examples/teamsumo.cfg

config/settings.cfg

config/settings_dedicated.cfg

config/settings_visual.cfg

configure.ac

desktop/armagetronad.desktop.in

language/english_base.txt

language/english_base_notranslate.txt

src/Makefile.am

src/doc/install_linux.html.m4

src/doc/versions.html.m4

src/engine/eCamera.cpp

src/engine/eCamera.h

src/engine/eDisplay.cpp

src/engine/eGameObject.cpp

src/engine/ePath.cpp

src/engine/ePath.h

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eSoundMixer.cpp

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eVoter.cpp

src/engine/sound/sdl_mixer/eChannelSDLMixer.cpp

src/engine/sound/sdl_mixer/eMusicTrackSDLMixer.cpp

src/network/astat.cpp

src/network/master.cpp

src/network/nAuthentication.cpp

src/network/nConfig.cpp

src/network/nNetwork.cpp

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSocket.cpp

src/render/rConsole.h

src/render/rConsoleCout.cpp

src/render/rConsoleGraph.cpp

src/render/rScreen.cpp

src/render/rTexture.cpp

src/render/rTexture.h

src/resource/tResourceManager.cpp

src/resource/tResourceManager.h

src/swig/Makefile.am

src/thirdparty/mathexpr/Makefile.am

src/tools/tBackgroundProcess.h

src/tools/tCallback.cpp

src/tools/tCallback.h

src/tools/tColor.cpp

src/tools/tCommandLine.cpp

src/tools/tCommandLine.h

src/tools/tConfiguration.cpp

src/tools/tConsole.h

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tLocale.cpp

src/tools/tMemManager.cpp

src/tools/tPlayList.cpp

src/tools/tRecorder.cpp

src/tools/tScripting.cpp

src/tools/tScripting.h

src/tools/tToDo.cpp

src/tools/tXmlParser.cpp

src/tron/cockpit/cCamview.cpp

src/tron/cockpit/cCockpit.cpp

src/tron/gAIBase.cpp

src/tron/gAIBase.h

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gRotation.h

src/tron/gServerFavorites.cpp

src/tron/gTeam.cpp

src/tron/gTeam.h

src/tron/gWall.cpp

src/ui/uInput.cpp

src/ui/uInput.h

src/ui/uMenu.cpp

src/ui/uMenu.h

src/win32/aa_config.h

src/win32/config_common.h

src/win32_ded/aa_config.h

textures/title.jpg

win32/armagetronad.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/Dedicated.cbp

Show diffs side-by-side

added added

removed removed

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

Makefile.manual

batch/armabuild/resource.py

batch/make/uninstall

config/default.cfg

config/examples/cvs_test/fortress_physics.cfg

config/examples/scripts/

config/examples/scripts/flexban.cfg

config/examples/teamsumo.cfg

config/settings.cfg

config/settings_dedicated.cfg

config/settings_visual.cfg

desktop/armagetronad.desktop.in

language/english_base.txt

language/english_base_notranslate.txt

resource/proto/AATeam/tutorials/

resource/proto/AATeam/tutorials/ai_challenge.aamap.xml

resource/proto/AATeam/tutorials/bullies.aamap.xml

resource/proto/AATeam/tutorials/empty.aacockpit.xml

resource/proto/AATeam/tutorials/grind.aamap.xml

resource/proto/AATeam/tutorials/map.aamap.xml

resource/proto/AATeam/tutorials/spartanic.aacockpit.xml

resource/proto/AATeam/tutorials/speedkill.aamap.xml

resource/proto/AATeam/tutorials/survival.aamap.xml

scripts/examples/

scripts/examples/flexban.sh

src/Makefile.am

src/doc/install_linux.html.m4

src/doc/versions.html.m4

src/engine/eCamera.cpp

src/engine/eCamera.h

src/engine/eDisplay.cpp

src/engine/eGameObject.cpp

src/engine/ePath.cpp

src/engine/ePath.h

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eSoundMixer.cpp

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eVoter.cpp

src/engine/sound/sdl_mixer/eChannelSDLMixer.cpp

src/engine/sound/sdl_mixer/eMusicTrackSDLMixer.cpp

src/network/astat.cpp

src/network/master.cpp

src/network/nAuthentication.cpp

src/network/nConfig.cpp

src/network/nNetwork.cpp

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSocket.cpp

src/render/rConsole.h

src/render/rConsoleCout.cpp

src/render/rConsoleGraph.cpp

src/render/rScreen.cpp

src/render/rTexture.cpp

src/render/rTexture.h

src/resource/tResourceManager.cpp

src/resource/tResourceManager.h

src/serverquery/

src/serverquery/json/

src/serverquery/json/json-forwards.h

src/serverquery/json/json.h

src/serverquery/jsoncpp.cpp

src/serverquery/serverquery.cpp

src/swig/Makefile.am

src/thirdparty/mathexpr/Makefile.am

src/tools/tBackgroundProcess.h

src/tools/tCallback.cpp

src/tools/tCallback.h

src/tools/tColor.cpp

src/tools/tCommandLine.cpp

src/tools/tCommandLine.h

src/tools/tConfiguration.cpp

src/tools/tConsole.h

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tLocale.cpp

src/tools/tMemManager.cpp

src/tools/tPlayList.cpp

src/tools/tRecorder.cpp

src/tools/tScripting.cpp

src/tools/tScripting.h

src/tools/tToDo.cpp

src/tools/tXmlParser.cpp

src/tron/cockpit/cCamview.cpp

src/tron/cockpit/cCockpit.cpp

src/tron/gAIBase.cpp

src/tron/gAIBase.h

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gRotation.h

src/tron/gServerFavorites.cpp

src/tron/gTeam.cpp

src/tron/gTeam.h

src/tron/gTutorial.cpp

src/tron/gTutorial.h

src/tron/gWall.cpp

src/ui/uInput.cpp

src/ui/uInput.h

src/ui/uMenu.cpp

src/win32/aa_config.h

src/win32/config_common.h

src/win32_ded/aa_config.h

textures/KGN_logo.png

textures/message_background.png

textures/settings_textures.cfg

textures/title.jpg

textures/tutorials/

textures/tutorials/clipart/

textures/tutorials/clipart/background.png

textures/tutorials/clipart/check.png

textures/tutorials/clipart/check.xcf

textures/tutorials/clipart/circle.png

textures/tutorials/clipart/fail.png

textures/tutorials/conquest/

textures/tutorials/conquest/conquest.txt

textures/tutorials/conquest/conquest.xcf

textures/tutorials/conquest/start.png

textures/tutorials/conquest/success.png

textures/tutorials/doublegrind/

textures/tutorials/doublegrind/background.png

textures/tutorials/doublegrind/doublegrind.txt

textures/tutorials/doublegrind/doublegrind.xcf

textures/tutorials/doublegrind/success.png

textures/tutorials/doublegrind/toohard1.png

textures/tutorials/doublegrind/toohard2.png

textures/tutorials/doublegrind/toohard3.png

textures/tutorials/grinding/

textures/tutorials/grinding/fail1.png

textures/tutorials/grinding/fail2.png

textures/tutorials/grinding/fail3.png

textures/tutorials/grinding/grind.png

textures/tutorials/grinding/grinding.txt

textures/tutorials/grinding/grinding.xcf

textures/tutorials/grinding/nogrind.png

textures/tutorials/speedkill/

textures/tutorials/speedkill/adjust1.png

textures/tutorials/speedkill/adjust2.png

textures/tutorials/speedkill/adjust3.png

textures/tutorials/speedkill/fail_donothing.png

textures/tutorials/speedkill/speedkill.txt

textures/tutorials/speedkill/speedkill.xcf

textures/tutorials/speedkill/success1.png

textures/tutorials/speedkill/success2.png

textures/tutorials/speedkill/success3.png

textures/tutorials/speedkilldefense/

textures/tutorials/speedkilldefense/fail1.png

textures/tutorials/speedkilldefense/fail2.png

textures/tutorials/speedkilldefense/fail3.png

textures/tutorials/speedkilldefense/speedkilldefense.txt

textures/tutorials/speedkilldefense/speedkilldefense.xcf

textures/tutorials/speedkilldefense/start.png

textures/tutorials/speedkilldefense/trap1.png

textures/tutorials/speedkilldefense/trap2.png

textures/tutorials/speedkilldefense/trap3.png

textures/tutorials/survival/

textures/tutorials/survival/fail1.png

textures/tutorials/survival/fail2.png

textures/tutorials/survival/fail3.png

textures/tutorials/survival/spiral.png

textures/tutorials/survival/survival.txt

textures/tutorials/survival/survival.xcf

textures/tutorials/survival/wiggle.png

textures/tutorials/teamstart/

textures/tutorials/teamstart/background.png

textures/tutorials/teamstart/straight.png

textures/tutorials/teamstart/success.png

textures/tutorials/teamstart/teamstart.txt

textures/tutorials/teamstart/teamstart.xcf

win32/armagetronad.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/Dedicated.cbp

Older »