← Back to branch summary

~armagetronad-dev/armagetronad/trunk-armagetronad-eevent

~armagetronad-dev/armagetronad/trunk-armagetronad-eevent

Viewing all changes in revision 708.

Committer: epsy
Date: 2009-02-19 01:37:34 UTC
mfrom: (698.1.146 armagetronad)
Revision ID: epsy46@free.fr-20090219013734-0l5hr0nh7gg8o0jj

Merging from mainline.

files added:
MacOS/rakelib/aabeta.rake

MacOS/rakelib/config.rb

MacOS/rakelib/release.rake

batch/armabuild

batch/armabuild/__init__.py

batch/armabuild/resource.py

batch/checkbugle.py

batch/make/copyresources.py

batch/win32

batch/win32/makedist.py

language/polish.txt

language/polish_transliterated.txt

resource/binary

resource/binary/wrtlprnft

resource/binary/wrtlprnft/benboisclock-1.aatex.png

resource/binary/wrtlprnft/floor-1.aatex.png

resource/binary/wrtlprnft/gauge_horizontal-1.aatex.png

resource/binary/wrtlprnft/gauge_horizontal_filled-1.aatex.png

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/resource

src/resource/tResourceType.cpp

src/resource/tResourceType.h

src/thirdparty/utf8

src/thirdparty/utf8/utf8.h

src/tools/pthread-binding.h

src/tools/tCoord.cpp

src/tools/tDict.h

src/tools/tPolynomial.cpp

src/tools/tPolynomialMarshaler.cpp

src/tools/tPolynomialWithBase.cpp

src/tools/tRectangle.cpp

src/tools/tRectangle.h

src/tools/tVersion.cpp

src/tools/tVersion.h

src/tron/cockpit/cCamview.cpp

src/tron/cockpit/cCamview.h

src/tron/gWinZone.cpp

src/tron/gWinZone.h

textures/Armagetronad.ttf

textures/armagetronad.sfd

todo-luke-jr.txt

win32/code_blocks/ZThread.cbp

win32/protobuf.bat

files removed:
.cvsignore

batch/.cvsignore

config/.cvsignore

desktop/.cvsignore

language/.cvsignore

resource/.cvsignore

src/.cvsignore

src/doc/.cvsignore

src/doc/net/.cvsignore

src/engine/.cvsignore

src/engine/eRectangle.cpp

src/first/.cvsignore

src/network/.cvsignore

src/render/.cvsignore

src/thirdparty/.cvsignore

src/thirdparty/particles/.cvsignore

src/tools/.cvsignore

src/tron/.cvsignore

src/tron/gWinZone.cpp

src/tron/gWinZone.h

src/ui/.cvsignore

textures/Armagetronad.ttf

textures/armagetronad.sfd

textures/font.ttf

todo-luke-jr.txt

www-root/.cvsignore

files renamed:
src/tools/tResource.cpp => src/resource/tResource.cpp

src/tools/tResource.h => src/resource/tResource.h

src/tools/tResourceManager.cpp => src/resource/tResourceManager.cpp

src/tools/tResourceManager.h => src/resource/tResourceManager.h

files modified:
.bzrignore

AUTHORS

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

MacOS/rakefile.rb

MacOS/rakelib/xcode.rake

MacOS/shared.xcconfig

Makefile.am

Makefile.manual

NEWS

README-Subversion

acinclude.m4

batch/Makefile.am

batch/make/sortresources

batch/make/sortresources.py

batch/make/uninstall

batch/make/version

batch/serverstarter.in

batch/sysinstall.in

bootstrap.sh

config/default.cfg

config/examples/cvs_test/sumo_complete.cfg

config/settings.cfg

config/settings_dedicated.cfg

configure.ac

doc/installation.txt

language/american.txt

language/british.txt

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/french.txt

language/languages.txt.in

language/new.txt

language/spanish.txt

language/update.py

music/default.m3u

resource/Makefile.am

resource/proto/AATeam/lucifer-0.0.1.aacockpit.xml

resource/proto/Anonymous/original/original.cockpit.xml

resource/proto/cockpit-0.3.0.dtd

resource/proto/cockpit.dtd

resource/proto/map.dtd

src/Makefile.am

src/defs.h

src/engine/eAdvWall.h

src/engine/eCamera.cpp

src/engine/eCamera.h

src/engine/eDisplay.cpp

src/engine/eEventNotification.cpp

src/engine/eEventNotification.h

src/engine/eGrid.cpp

src/engine/eGrid.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/eRectangle.h

src/engine/eSensor.cpp

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eTimer.cpp

src/engine/eTimer.h

src/engine/eVoter.cpp

src/macosx/client/aa_config.h

src/macosx/version.h.in

src/network/astat.cpp

src/network/master.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/nKrawallPrivate.cpp

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/rColor.h

src/render/rConsoleCout.cpp

src/render/rDisplayList.cpp

src/render/rDisplayList.h

src/render/rFont.cpp

src/render/rFont.h

src/render/rGL.cpp

src/render/rModel.cpp

src/render/rRender.cpp

src/render/rScreen.cpp

src/render/rScreen.h

src/render/rSysdep.cpp

src/render/rViewport.h

src/swig/Makefile.am

src/thirdparty/mathexpr/mathexpr.cpp

src/tools/tArray.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/tCoord.h

src/tools/tFunction.cpp

src/tools/tFunction.h

src/tools/tHeap.cpp

src/tools/tList.h

src/tools/tLocale.cpp

src/tools/tLocale.h

src/tools/tMemManager.cpp

src/tools/tMemManager.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/tools/tToDo.cpp

src/tools/tXmlParser.cpp

src/tools/tXmlParser.h

src/tron/cockpit/cCockpit.cpp

src/tron/cockpit/cCockpit.h

src/tron/cockpit/cMap.cpp

src/tron/cockpit/cWidgetBase.h

src/tron/gAIBase.cpp

src/tron/gAIBase.h

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gCycle.h

src/tron/gCycleMovement.cpp

src/tron/gCycleMovement.h

src/tron/gExplosion.cpp

src/tron/gExplosion.h

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gParser.h

src/tron/gServerFavorites.cpp

src/tron/gTeam.cpp

src/tron/gWall.cpp

src/tron/gWall.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

src/ui/uMenu.cpp

src/ui/uMenu.h

src/win32/armagetron.rc

win32/README.txt

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/ArmagetronAd.workspace

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

win32/makedist.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/aabeta.rake

MacOS/rakelib/config.rb

MacOS/rakelib/release.rake

MacOS/rakelib/xcode.rake

MacOS/shared.xcconfig

Makefile.manual

README-Subversion

batch/.cvsignore

batch/Makefile.am

batch/armabuild/

batch/armabuild/__init__.py

batch/armabuild/resource.py

batch/checkbugle.py

batch/make/copyresources.py

batch/make/sortresources

batch/make/sortresources.py

batch/make/uninstall

batch/make/version

batch/serverstarter.in

batch/sysinstall.in

batch/win32/makedist.py

config/.cvsignore

config/default.cfg

config/examples/cvs_test/sumo_complete.cfg

config/settings.cfg

config/settings_dedicated.cfg

desktop/.cvsignore

doc/installation.txt

language/.cvsignore

language/american.txt

language/british.txt

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/french.txt

language/languages.txt.in

language/new.txt

language/polish.txt

language/polish_transliterated.txt

language/spanish.txt

language/update.py

music/default.m3u

resource/.cvsignore

resource/Makefile.am

resource/binary/

resource/binary/wrtlprnft/

resource/binary/wrtlprnft/benboisclock-1.aatex.png

resource/binary/wrtlprnft/floor-1.aatex.png

resource/binary/wrtlprnft/gauge_horizontal-1.aatex.png

resource/binary/wrtlprnft/gauge_horizontal_filled-1.aatex.png

resource/proto/AATeam/lucifer-0.0.1.aacockpit.xml

resource/proto/Anonymous/original/original.cockpit.xml

resource/proto/cockpit-0.3.0.dtd

resource/proto/cockpit.dtd

resource/proto/map.dtd

src/Makefile.am

src/doc/.cvsignore

src/doc/net/.cvsignore

src/engine/.cvsignore

src/engine/eAdvWall.h

src/engine/eCamera.cpp

src/engine/eCamera.h

src/engine/eDisplay.cpp

src/engine/eEventNotification.cpp

src/engine/eEventNotification.h

src/engine/eGrid.cpp

src/engine/eGrid.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/eRectangle.cpp

src/engine/eRectangle.h

src/engine/eSensor.cpp

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eTimer.cpp

src/engine/eTimer.h

src/engine/eVoter.cpp

src/first/.cvsignore

src/macosx/client/aa_config.h

src/macosx/version.h.in

src/network/.cvsignore

src/network/astat.cpp

src/network/master.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/nKrawallPrivate.cpp

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/.cvsignore

src/render/rColor.h

src/render/rConsoleCout.cpp

src/render/rDisplayList.cpp

src/render/rDisplayList.h

src/render/rFont.cpp

src/render/rFont.h

src/render/rGL.cpp

src/render/rModel.cpp

src/render/rRender.cpp

src/render/rScreen.cpp

src/render/rScreen.h

src/render/rSysdep.cpp

src/render/rViewport.h

src/resource/tResource.cpp

src/resource/tResource.h

src/resource/tResourceManager.cpp

src/resource/tResourceManager.h

src/resource/tResourceType.cpp

src/resource/tResourceType.h

src/swig/Makefile.am

src/thirdparty/.cvsignore

src/thirdparty/mathexpr/mathexpr.cpp

src/thirdparty/particles/.cvsignore

src/thirdparty/utf8/

src/thirdparty/utf8/utf8.h

src/tools/.cvsignore

src/tools/pthread-binding.h

src/tools/tArray.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/tCoord.cpp

src/tools/tCoord.h

src/tools/tDict.h

src/tools/tFunction.cpp

src/tools/tFunction.h

src/tools/tHeap.cpp

src/tools/tList.h

src/tools/tLocale.cpp

src/tools/tLocale.h

src/tools/tMemManager.cpp

src/tools/tMemManager.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/tRectangle.cpp

src/tools/tRectangle.h

src/tools/tString.cpp

src/tools/tString.h

src/tools/tSysTime.cpp

src/tools/tToDo.cpp

src/tools/tVersion.cpp

src/tools/tVersion.h

src/tools/tXmlParser.cpp

src/tools/tXmlParser.h

src/tron/.cvsignore

src/tron/cockpit/cCamview.cpp

src/tron/cockpit/cCamview.h

src/tron/cockpit/cCockpit.cpp

src/tron/cockpit/cCockpit.h

src/tron/cockpit/cMap.cpp

src/tron/cockpit/cWidgetBase.h

src/tron/gAIBase.cpp

src/tron/gAIBase.h

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gCycle.h

src/tron/gCycleMovement.cpp

src/tron/gCycleMovement.h

src/tron/gExplosion.cpp

src/tron/gExplosion.h

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gParser.h

src/tron/gServerFavorites.cpp

src/tron/gTeam.cpp

src/tron/gWall.cpp

src/tron/gWall.h

src/tron/gWinZone.cpp

src/tron/gWinZone.cpp

src/tron/gWinZone.h

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

src/ui/.cvsignore

src/ui/uMenu.cpp

src/win32/armagetron.rc

textures/Armagetronad.ttf

textures/Armagetronad.ttf

textures/armagetronad.sfd

textures/armagetronad.sfd

textures/font.ttf

todo-luke-jr.txt

todo-luke-jr.txt

win32/README.txt

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/makedist.bat

win32/protobuf.bat

win32/update_version.bat

www-root/.cvsignore

Older »