← Back to branch summary

~armagetronad-ct/armagetronad/armagetronad-ct

~armagetronad-ct/armagetronad/armagetronad-ct

Viewing all changes in revision 979.

Committer: Voodoo
Date: 2011-11-11 21:37:46 UTC
Revision ID: voodoo-20111111213746-t6h39itidgb5tchu

merge -r 1104..1185 lp:armagetronad

files added:
config/serverconfigcache.cfg

src/doc/html.mac.m4

src/tools/tBackgroundProcess.h

files renamed:
src/tron/gSpawn.cpp => src/engine/eSpawn.cpp

src/tron/gSpawn.h => src/engine/eSpawn.h

files modified:
AUTHORS

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

Makefile.manual

NEWS

config/Makefile.am

config/master.srv

config/settings.cfg

config/settings_dedicated.cfg

configure.ac

language/english_base.txt

language/english_base_notranslate.txt

major_version

src/Makefile.am

src/doc/HtmlMakefile

src/doc/Makefile.am

src/doc/compile.html.m4

src/doc/config.html.m4

src/doc/faq.html.m4

src/doc/index.html.m4

src/doc/install_linux.html.m4

src/doc/install_result.html.m4

src/doc/install_windows.html.m4

src/doc/net/Makefile.am

src/doc/network.html.m4

src/doc/versions.html.m4

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eSoundMixer.cpp

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eTimer.cpp

src/macosx/SDLMain.mm

src/macosx/client/aa_config.h

src/network/nAuthentication.cpp

src/network/nAuthentication.h

src/network/nConfig.cpp

src/network/nNetObject.cpp

src/network/nNetObject.h

src/network/nNetwork.cpp

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSocket.cpp

src/network/nSocket.h

src/protobuf/ePlayer.proto

src/protobuf/gGame.proto

src/protobuf/nServerInfo.proto

src/tools/tCommandLine.cpp

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tException.cpp

src/tools/tException.h

src/tools/tRecorder.cpp

src/tools/tRecorder.h

src/tools/tToDo.cpp

src/tron/gArena.cpp

src/tron/gArena.h

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gCycle.h

src/tron/gCycleMovement.cpp

src/tron/gExplosion.cpp

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gServerBrowser.cpp

src/tron/gStuff.cpp

src/tron/gStuff.h

src/tron/zone/zFortress.cpp

src/win32/config_common.h

win32/armagetronad.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

win32/fromunix.sh

win32/makedist.bat

Show diffs side-by-side

added added

removed removed

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

Makefile.manual

config/Makefile.am

config/master.srv

config/serverconfigcache.cfg

config/settings.cfg

config/settings_dedicated.cfg

language/english_base.txt

language/english_base_notranslate.txt

src/Makefile.am

src/doc/HtmlMakefile

src/doc/Makefile.am

src/doc/compile.html.m4

src/doc/config.html.m4

src/doc/faq.html.m4

src/doc/html.mac.m4

src/doc/index.html.m4

src/doc/install_linux.html.m4

src/doc/install_result.html.m4

src/doc/install_windows.html.m4

src/doc/net/Makefile.am

src/doc/network.html.m4

src/doc/versions.html.m4

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eSoundMixer.cpp

src/engine/eSpawn.cpp

src/engine/eSpawn.h

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eTimer.cpp

src/macosx/SDLMain.mm

src/macosx/client/aa_config.h

src/network/nAuthentication.cpp

src/network/nAuthentication.h

src/network/nConfig.cpp

src/network/nNetObject.cpp

src/network/nNetObject.h

src/network/nNetwork.cpp

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSocket.cpp

src/network/nSocket.h

src/protobuf/ePlayer.proto

src/protobuf/gGame.proto

src/protobuf/nServerInfo.proto

src/tools/tBackgroundProcess.h

src/tools/tCommandLine.cpp

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tException.cpp

src/tools/tException.h

src/tools/tRecorder.cpp

src/tools/tRecorder.h

src/tools/tToDo.cpp

src/tron/gArena.cpp

src/tron/gArena.h

src/tron/gArmagetron.cpp

src/tron/gCycle.cpp

src/tron/gCycle.h

src/tron/gCycleMovement.cpp

src/tron/gExplosion.cpp

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gServerBrowser.cpp

src/tron/gStuff.cpp

src/tron/gStuff.h

src/tron/zone/zFortress.cpp

src/win32/config_common.h

win32/armagetronad.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

win32/fromunix.sh

win32/makedist.bat

Older »