← Back to branch summary

~z-man/armagetronad/armagetronad-zones-v1v2

~z-man/armagetronad/armagetronad-zones-v1v2

Viewing all changes in revision 882.

Committer: Manuel Moos
Date: 2009-02-17 09:33:16 UTC
mfrom: (833.1.8 armagetronad)
Revision ID: z-man@users.sf.net-20090217093316-d978fvxdnqtad5ra

Merge from trunk, including protobuf.

files added:
src/network/nBinary.cpp

src/network/nBinary.h

src/network/nProtoBuf.cpp

src/network/nProtoBuf.h

src/network/nProtoBufForward.h

src/network/nStreamMessage.cpp

src/network/nStreamMessage.h

src/protobuf

src/protobuf/eEventNotification.proto

src/protobuf/eLagCompensation.proto

src/protobuf/eNetGameObject.proto

src/protobuf/ePlayer.proto

src/protobuf/eTeam.proto

src/protobuf/eTimer.proto

src/protobuf/eVoter.proto

src/protobuf/gAIBase.proto

src/protobuf/gCycle.proto

src/protobuf/gGame.proto

src/protobuf/gWall.proto

src/protobuf/gZone.proto

src/protobuf/nAuthentication.proto

src/protobuf/nConfig.proto

src/protobuf/nNetObject.proto

src/protobuf/nNetObjectPrivate.proto

src/protobuf/nNetwork.proto

src/protobuf/nServerInfo.proto

src/protobuf/prototype.proto

src/protobuf/tColor.proto

src/protobuf/tCoord.proto

src/protobuf/tFunction.proto

src/protobuf/tPolynomial.proto

src/protobuf/zShape.proto

src/protobuf/zZone.proto

src/tools/tCoord.cpp

src/tools/tPolynomial.cpp

src/tools/tPolynomialMarshaler.cpp

src/tools/tPolynomialWithBase.cpp

win32/protobuf.bat

files modified:
.bzrignore

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

MacOS/shared.xcconfig

NEWS

acinclude.m4

config/settings.cfg

config/settings_dedicated.cfg

configure.ac

doc/installation.txt

language/english_base.txt

minor_version

src/Makefile.am

src/engine/eEventNotification.cpp

src/engine/eEventNotification.h

src/engine/eLagCompensation.cpp

src/engine/eLagCompensation.h

src/engine/eNetGameObject.cpp

src/engine/eNetGameObject.h

src/engine/ePath.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eTimer.cpp

src/engine/eTimer.h

src/engine/eVoter.cpp

src/network/nAuthentication.cpp

src/network/nAuthentication.h

src/network/nConfig.cpp

src/network/nConfig.h

src/network/nKrawall.cpp

src/network/nKrawall.h

src/network/nNetObject.cpp

src/network/nNetObject.h

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nPriorizing.cpp

src/network/nPriorizing.h

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSocket.cpp

src/render/rSysdep.cpp

src/tools/tColor.cpp

src/tools/tColor.h

src/tools/tConfiguration.cpp

src/tools/tConsole.cpp

src/tools/tCoord.h

src/tools/tFunction.cpp

src/tools/tFunction.h

src/tools/tPolynomial.h

src/tools/tPolynomialMarshaler.h

src/tools/tPolynomialWithBase.h

src/tools/tRecorder.cpp

src/tools/tString.cpp

src/tools/tString.h

src/tools/tSysTime.cpp

src/tron/gAIBase.cpp

src/tron/gAIBase.h

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/gParser.cpp

src/tron/gParser.h

src/tron/gServerFavorites.cpp

src/tron/gWall.cpp

src/tron/gWall.h

src/tron/gWinZone.cpp

src/tron/gWinZone.h

src/tron/zone/zEffectGroup.cpp

src/tron/zone/zEffectGroup.h

src/tron/zone/zMonitor.cpp

src/tron/zone/zMonitor.h

src/tron/zone/zShape.cpp

src/tron/zone/zShape.hpp

src/tron/zone/zValidator.cpp

src/tron/zone/zValidator.h

src/tron/zone/zZone.cpp

src/tron/zone/zZone.h

src/tron/zone/zZoneInfluence.cpp

src/tron/zone/zZoneInfluence.h

win32/README.txt

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/ArmagetronAd.workspace

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

Show diffs side-by-side

added added

removed removed

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

MacOS/shared.xcconfig

config/settings.cfg

config/settings_dedicated.cfg

doc/installation.txt

language/english_base.txt

src/Makefile.am

src/engine/eEventNotification.cpp

src/engine/eEventNotification.h

src/engine/eLagCompensation.cpp

src/engine/eLagCompensation.h

src/engine/eNetGameObject.cpp

src/engine/eNetGameObject.h

src/engine/ePath.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eTimer.cpp

src/engine/eTimer.h

src/engine/eVoter.cpp

src/network/nAuthentication.cpp

src/network/nAuthentication.h

src/network/nBinary.cpp

src/network/nBinary.h

src/network/nConfig.cpp

src/network/nConfig.h

src/network/nKrawall.cpp

src/network/nKrawall.h

src/network/nNetObject.cpp

src/network/nNetObject.h

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nPriorizing.cpp

src/network/nPriorizing.h

src/network/nProtoBuf.cpp

src/network/nProtoBuf.h

src/network/nProtoBufForward.h

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSocket.cpp

src/network/nStreamMessage.cpp

src/network/nStreamMessage.h

src/protobuf/eEventNotification.proto

src/protobuf/eLagCompensation.proto

src/protobuf/eNetGameObject.proto

src/protobuf/ePlayer.proto

src/protobuf/eTeam.proto

src/protobuf/eTimer.proto

src/protobuf/eVoter.proto

src/protobuf/gAIBase.proto

src/protobuf/gCycle.proto

src/protobuf/gGame.proto

src/protobuf/gWall.proto

src/protobuf/gZone.proto

src/protobuf/nAuthentication.proto

src/protobuf/nConfig.proto

src/protobuf/nNetObject.proto

src/protobuf/nNetObjectPrivate.proto

src/protobuf/nNetwork.proto

src/protobuf/nServerInfo.proto

src/protobuf/prototype.proto

src/protobuf/tColor.proto

src/protobuf/tCoord.proto

src/protobuf/tFunction.proto

src/protobuf/tPolynomial.proto

src/protobuf/zShape.proto

src/protobuf/zZone.proto

src/render/rSysdep.cpp

src/tools/tColor.cpp

src/tools/tColor.h

src/tools/tConfiguration.cpp

src/tools/tConsole.cpp

src/tools/tCoord.cpp

src/tools/tCoord.h

src/tools/tFunction.cpp

src/tools/tFunction.h

src/tools/tPolynomial.cpp

src/tools/tPolynomial.h

src/tools/tPolynomialMarshaler.cpp

src/tools/tPolynomialMarshaler.h

src/tools/tPolynomialWithBase.cpp

src/tools/tPolynomialWithBase.h

src/tools/tRecorder.cpp

src/tools/tString.cpp

src/tools/tString.h

src/tools/tSysTime.cpp

src/tron/gAIBase.cpp

src/tron/gAIBase.h

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/gParser.cpp

src/tron/gParser.h

src/tron/gServerFavorites.cpp

src/tron/gWall.cpp

src/tron/gWall.h

src/tron/gWinZone.cpp

src/tron/gWinZone.h

src/tron/zone/zEffectGroup.cpp

src/tron/zone/zEffectGroup.h

src/tron/zone/zMonitor.cpp

src/tron/zone/zMonitor.h

src/tron/zone/zShape.cpp

src/tron/zone/zShape.hpp

src/tron/zone/zValidator.cpp

src/tron/zone/zValidator.h

src/tron/zone/zZone.cpp

src/tron/zone/zZone.h

src/tron/zone/zZoneInfluence.cpp

src/tron/zone/zZoneInfluence.h

win32/README.txt

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/ArmagetronAd.workspace

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

win32/protobuf.bat

Older »