← Back to branch summary

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

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

Viewing all changes in revision 944.

Committer: Manuel Moos
Date: 2011-09-26 20:46:21 UTC
mfrom: (890.1.218)
Revision ID: z-man@users.sf.net-20110926204621-ewgcv0ai58k36hkf

Merging from mainline.

files added:
language/russian.txt

sound/cyclrun.wav

src/tools/tLockedQueue.h

src/tools/tMutex.cpp

src/tools/tMutex.h

src/tools/tThread.h

win32/fromunix.sh

files removed:
src/tools/pthread-binding.h

win32/code_blocks/ZThread.cbp

files modified:
.bzrignore

AUTHORS

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

MacOS/rakefile.rb

MacOS/rakelib/config.rb

MacOS/shared.xcconfig

Makefile.am

Makefile.manual

NEWS

acinclude.m4

batch/Makefile.am

batch/armabuild/resource.py

batch/checkbugle.py

batch/ladder.py

batch/make/copyresources.py

batch/make/sortresources.py

batch/make/uninstall

batch/make/version

batch/rcd_master.in

batch/rcd_server.in

batch/rcd_startstop.in

batch/serverstarter.in

batch/win32/makedist.py

config/aiplayers.cfg.in

config/examples/breakfast_in_hell.cfg

config/examples/cvs_test/fortress_politics.cfg

config/settings.cfg

config/settings_authentication.cfg

config/settings_dedicated.cfg

config/settings_visual.cfg

config/subcultures.srv

configure.ac

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/french.txt

language/languages.txt.in

language/polish.txt

language/spanish.txt

language/update.py

resource/Makefile.am

src/Makefile.am

src/engine/eCamera.cpp

src/engine/eCamera.h

src/engine/eChat.cpp

src/engine/eChat.h

src/engine/eGameObject.cpp

src/engine/eGameObject.h

src/engine/eGrid.cpp

src/engine/eNetGameObject.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eSensor.h

src/engine/eSound.cpp

src/engine/eSound.h

src/engine/eSoundMixer.cpp

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eTimer.cpp

src/engine/eTimer.h

src/engine/eVoter.cpp

src/macosx/SDLMain.mm

src/macosx/config_common.h

src/macosx/dedicated/aa_config.h

src/network/nAuthentication.cpp

src/network/nAuthentication.h

src/network/nConfig.cpp

src/network/nKrawallPrivate.cpp

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nPriorizing.cpp

src/network/nPriorizing.h

src/network/nProtoBuf.cpp

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSpamProtection.cpp

src/protobuf/Makefile.am

src/protobuf/eTimer.proto

src/render/rConsole.h

src/render/rConsoleCout.cpp

src/render/rConsoleGraph.cpp

src/render/rFont.cpp

src/render/rModel.h

src/render/rScreen.cpp

src/render/rScreen.h

src/render/rSysdep.cpp

src/render/rSysdep.h

src/render/rTexture.cpp

src/tools/tArray.h

src/tools/tColor.cpp

src/tools/tColor.h

src/tools/tCommandLine.cpp

src/tools/tConfiguration.cpp

src/tools/tConfiguration.h

src/tools/tConsole.cpp

src/tools/tConsole.h

src/tools/tCoord.h

src/tools/tDecorator.cpp

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tError.cpp

src/tools/tError.h

src/tools/tException.cpp

src/tools/tException.h

src/tools/tHeap.h

src/tools/tLinkedList.h

src/tools/tList.h

src/tools/tLocale.h

src/tools/tMemManager.cpp

src/tools/tRecorder.cpp

src/tools/tRecorder.h

src/tools/tRecorderInternal.cpp

src/tools/tRecorderInternal.h

src/tools/tSafePTR.h

src/tools/tStatEntry.h

src/tools/tStatFile.cpp

src/tools/tStatFile.h

src/tools/tString.cpp

src/tools/tSysTime.cpp

src/tools/tToDo.cpp

src/tools/tToDo.h

src/tron/cockpit/cCamview.cpp

src/tron/gAINavigator.cpp

src/tron/gArmagetron.cpp

src/tron/gCamera.cpp

src/tron/gCycle.cpp

src/tron/gCycle.h

src/tron/gCycleMovement.cpp

src/tron/gCycleMovement.h

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gRotation.cpp

src/tron/gServerBrowser.cpp

src/tron/gServerFavorites.cpp

src/tron/gServerFavorites.h

src/tron/gSpawn.h

src/tron/gStatList.h

src/tron/gStatistics.h

src/tron/gWall.cpp

src/tron/gWall.h

src/tron/gWinZone.cpp

src/tron/zone/zEffector.cpp

src/tron/zone/zFortress.cpp

src/ui/uInput.cpp

src/ui/uInputQueue.cpp

src/ui/uMenu.cpp

src/ui/uMenu.h

src/win32/config_common.h

src/win32_ded/aa_config.h

textures/Armagetronad.ttf

textures/armagetronad.sfd

win32/armagetronad.nsi

win32/armagetronad_dedicated.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/ArmagetronAd.workspace

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

win32/protobuf.bat

win32/update_version.bat

Show diffs side-by-side

added added

removed removed

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

MacOS/rakefile.rb

MacOS/rakelib/config.rb

MacOS/shared.xcconfig

Makefile.manual

batch/Makefile.am

batch/armabuild/resource.py

batch/checkbugle.py

batch/ladder.py

batch/make/copyresources.py

batch/make/sortresources.py

batch/make/uninstall

batch/make/version

batch/rcd_master.in

batch/rcd_server.in

batch/rcd_startstop.in

batch/serverstarter.in

batch/win32/makedist.py

config/aiplayers.cfg.in

config/examples/breakfast_in_hell.cfg

config/examples/cvs_test/fortress_politics.cfg

config/settings.cfg

config/settings_authentication.cfg

config/settings_dedicated.cfg

config/settings_visual.cfg

config/subcultures.srv

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/french.txt

language/languages.txt.in

language/polish.txt

language/russian.txt

language/spanish.txt

language/update.py

resource/Makefile.am

sound/cyclrun.wav

src/Makefile.am

src/engine/eCamera.cpp

src/engine/eCamera.h

src/engine/eChat.cpp

src/engine/eChat.h

src/engine/eGameObject.cpp

src/engine/eGameObject.h

src/engine/eGrid.cpp

src/engine/eNetGameObject.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eSensor.h

src/engine/eSound.cpp

src/engine/eSound.h

src/engine/eSoundMixer.cpp

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eTimer.cpp

src/engine/eTimer.h

src/engine/eVoter.cpp

src/macosx/SDLMain.mm

src/macosx/config_common.h

src/macosx/dedicated/aa_config.h

src/network/nAuthentication.cpp

src/network/nAuthentication.h

src/network/nConfig.cpp

src/network/nKrawallPrivate.cpp

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nPriorizing.cpp

src/network/nPriorizing.h

src/network/nProtoBuf.cpp

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSpamProtection.cpp

src/protobuf/Makefile.am

src/protobuf/eTimer.proto

src/render/rConsole.h

src/render/rConsoleCout.cpp

src/render/rConsoleGraph.cpp

src/render/rFont.cpp

src/render/rModel.h

src/render/rScreen.cpp

src/render/rScreen.h

src/render/rSysdep.cpp

src/render/rSysdep.h

src/render/rTexture.cpp

src/tools/pthread-binding.h

src/tools/tArray.h

src/tools/tColor.cpp

src/tools/tColor.h

src/tools/tCommandLine.cpp

src/tools/tConfiguration.cpp

src/tools/tConfiguration.h

src/tools/tConsole.cpp

src/tools/tConsole.h

src/tools/tCoord.h

src/tools/tDecorator.cpp

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tError.cpp

src/tools/tError.h

src/tools/tException.cpp

src/tools/tException.h

src/tools/tHeap.h

src/tools/tLinkedList.h

src/tools/tList.h

src/tools/tLocale.h

src/tools/tLockedQueue.h

src/tools/tMemManager.cpp

src/tools/tMutex.cpp

src/tools/tMutex.h

src/tools/tRecorder.cpp

src/tools/tRecorder.h

src/tools/tRecorderInternal.cpp

src/tools/tRecorderInternal.h

src/tools/tSafePTR.h

src/tools/tStatEntry.h

src/tools/tStatFile.cpp

src/tools/tStatFile.h

src/tools/tString.cpp

src/tools/tSysTime.cpp

src/tools/tThread.h

src/tools/tToDo.cpp

src/tools/tToDo.h

src/tron/cockpit/cCamview.cpp

src/tron/gAINavigator.cpp

src/tron/gArmagetron.cpp

src/tron/gCamera.cpp

src/tron/gCycle.cpp

src/tron/gCycle.h

src/tron/gCycleMovement.cpp

src/tron/gCycleMovement.h

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gRotation.cpp

src/tron/gServerBrowser.cpp

src/tron/gServerFavorites.cpp

src/tron/gServerFavorites.h

src/tron/gSpawn.h

src/tron/gStatList.h

src/tron/gStatistics.h

src/tron/gWall.cpp

src/tron/gWall.h

src/tron/gWinZone.cpp

src/tron/zone/zEffector.cpp

src/tron/zone/zFortress.cpp

src/ui/uInput.cpp

src/ui/uInputQueue.cpp

src/ui/uMenu.cpp

src/win32/config_common.h

src/win32_ded/aa_config.h

textures/Armagetronad.ttf

textures/armagetronad.sfd

win32/armagetronad.nsi

win32/armagetronad_dedicated.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/ArmagetronAd.workspace

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

win32/code_blocks/ZThread.cbp

win32/fromunix.sh

win32/protobuf.bat

win32/update_version.bat

Older »