← Back to branch summary

~armagetronad-dev/armagetronad/trunk-armagetronad-breakpad

~armagetronad-dev/armagetronad/trunk-armagetronad-breakpad

Viewing all changes in revision 1047.

Committer: Daniel Lee Harple
Date: 2011-09-11 00:01:45 UTC
mfrom: (1021.1.74)
Revision ID: leeharple@gmail.com-20110911000145-8etxt0xuqn3txy9h

Merge with trunk.

files added:
sound/cyclrun.wav

win32/fromunix.sh

files removed:
win32/code_blocks/ZThread.cbp

files modified:
MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

Makefile.am

Makefile.manual

NEWS

batch/armabuild/resource.py

batch/checkbugle.py

batch/ladder.py

batch/make/copyresources.py

batch/make/sortresources.py

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

configure.ac

language/deutsch.txt

language/english_base.txt

language/french.txt

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

src/engine/eGrid.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eSound.cpp

src/engine/eSound.h

src/engine/eSoundMixer.cpp

src/engine/eTeam.cpp

src/engine/eTimer.cpp

src/engine/eTimer.h

src/network/nNetwork.cpp

src/network/nProtoBuf.cpp

src/network/nServerInfo.cpp

src/network/nSpamProtection.cpp

src/protobuf/Makefile.am

src/render/rConsole.h

src/render/rConsoleCout.cpp

src/render/rScreen.cpp

src/render/rScreen.h

src/render/rSysdep.cpp

src/tools/tConfiguration.cpp

src/tools/tConfiguration.h

src/tools/tDecorator.cpp

src/tools/tDirectories.cpp

src/tools/tSafePTR.h

src/tools/tStatEntry.h

src/tools/tStatFile.h

src/tools/tString.cpp

src/tools/tSysTime.cpp

src/tron/cockpit/cCamview.cpp

src/tron/gAIBase.cpp

src/tron/gArmagetron.cpp

src/tron/gCamera.cpp

src/tron/gCycle.cpp

src/tron/gCycle.h

src/tron/gCycleMovement.cpp

src/tron/gGame.cpp

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gServerFavorites.cpp

src/tron/gServerFavorites.h

src/tron/gStatList.h

src/tron/gStatistics.h

src/tron/gWall.cpp

src/tron/gWall.h

src/ui/uInputQueue.cpp

src/win32/config_common.h

src/win32_ded/aa_config.h

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

Makefile.manual

batch/armabuild/resource.py

batch/checkbugle.py

batch/ladder.py

batch/make/copyresources.py

batch/make/sortresources.py

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

language/deutsch.txt

language/english_base.txt

language/french.txt

language/polish.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/eGameObject.h

src/engine/eGrid.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eSound.cpp

src/engine/eSound.h

src/engine/eSoundMixer.cpp

src/engine/eTeam.cpp

src/engine/eTimer.cpp

src/engine/eTimer.h

src/network/nNetwork.cpp

src/network/nProtoBuf.cpp

src/network/nServerInfo.cpp

src/network/nSpamProtection.cpp

src/protobuf/Makefile.am

src/render/rConsole.h

src/render/rConsoleCout.cpp

src/render/rScreen.cpp

src/render/rScreen.h

src/render/rSysdep.cpp

src/tools/tConfiguration.cpp

src/tools/tConfiguration.h

src/tools/tDecorator.cpp

src/tools/tDirectories.cpp

src/tools/tSafePTR.h

src/tools/tStatEntry.h

src/tools/tStatFile.h

src/tools/tString.cpp

src/tools/tSysTime.cpp

src/tron/cockpit/cCamview.cpp

src/tron/gAIBase.cpp

src/tron/gArmagetron.cpp

src/tron/gCamera.cpp

src/tron/gCycle.cpp

src/tron/gCycle.h

src/tron/gCycleMovement.cpp

src/tron/gGame.cpp

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gServerFavorites.cpp

src/tron/gServerFavorites.h

src/tron/gStatList.h

src/tron/gStatistics.h

src/tron/gWall.cpp

src/tron/gWall.h

src/ui/uInputQueue.cpp

src/win32/config_common.h

src/win32_ded/aa_config.h

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

Older »