← Back to branch summary

~z-man/armagetronad/0.4-armagetronad-fortress_ai-unified

~z-man/armagetronad/0.4-armagetronad-fortress_ai-unified

Viewing all changes in revision 2396.

Committer: Manuel Moos
Date: 2011-11-04 11:34:32 UTC
mfrom: (2341.1.338 trunk)
Revision ID: z-man@users.sf.net-20111104113432-iahws0pd7qnpww4m

Merging from 0.4.

files added:
config/serverconfigcache.cfg

resource/proto/AATeam/tutorials

resource/proto/AATeam/tutorials/empty.aacockpit.xml

resource/proto/AATeam/tutorials/grind.aamap.xml

resource/proto/AATeam/tutorials/navigation.aamap.xml

resource/proto/AATeam/tutorials/spartanic.aacockpit.xml

src/doc/html.mac.m4

src/tools/tBackgroundProcess.h

src/tron/gTutorial.cpp

src/tron/gTutorial.h

textures/tutorials

textures/tutorials/clipart

textures/tutorials/clipart/check.png

textures/tutorials/clipart/check.xcf

textures/tutorials/clipart/circle.png

textures/tutorials/clipart/fail.png

textures/tutorials/grinding

textures/tutorials/grinding/1_1.png

textures/tutorials/grinding/1_2.png

textures/tutorials/grinding/1_3.png

textures/tutorials/grinding/2_1.png

textures/tutorials/grinding/2_2.png

textures/tutorials/grinding/2_3.png

textures/tutorials/grinding/3_2.png

textures/tutorials/grinding/3_3.png

textures/tutorials/grinding/3_4.png

textures/tutorials/grinding/grinding.txt

textures/tutorials/grinding/grinding.xcf

textures/tutorials/grinding/start.png

textures/tutorials/navigation

textures/tutorials/navigation/1_1.png

textures/tutorials/navigation/1_2.png

textures/tutorials/navigation/2_1.png

textures/tutorials/navigation/2_2.png

textures/tutorials/navigation/3_1.png

textures/tutorials/navigation/3_2.png

textures/tutorials/navigation/3_3.png

textures/tutorials/navigation/3_4.png

textures/tutorials/navigation/4_1.png

textures/tutorials/navigation/4_2.png

textures/tutorials/navigation/4_3.png

textures/tutorials/navigation/navigation.txt

textures/tutorials/navigation/navigation.xcf

textures/tutorials/navigation/start.png

textures/tutorials/survival

textures/tutorials/survival/1_1.png

textures/tutorials/survival/1_2.png

textures/tutorials/survival/1_3.png

textures/tutorials/survival/1_4.png

textures/tutorials/survival/1_5.png

textures/tutorials/survival/2_1.png

textures/tutorials/survival/2_2.png

textures/tutorials/survival/2_3.png

textures/tutorials/survival/2_4.png

textures/tutorials/survival/2_5.png

textures/tutorials/survival/3_1.png

textures/tutorials/survival/3_2.png

textures/tutorials/survival/3_3.png

textures/tutorials/survival/3_4.png

textures/tutorials/survival/3_5.png

textures/tutorials/survival/3_6.png

textures/tutorials/survival/start.png

textures/tutorials/survival/survival.txt

textures/tutorials/survival/survival.xcf

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.am

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

src/engine/eCamera.h

src/engine/eGameObject.cpp

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/render/rConsole.h

src/render/rConsoleGraph.cpp

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tLocale.cpp

src/tools/tRecorder.cpp

src/tools/tRecorder.h

src/tools/tToDo.cpp

src/tron/cockpit/cCamview.cpp

src/tron/cockpit/cCockpit.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/ui/uInput.cpp

src/ui/uInput.h

src/ui/uMenu.cpp

src/ui/uMenu.h

src/win32/config_common.h

win32/armagetronad.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

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

resource/proto/AATeam/tutorials/

resource/proto/AATeam/tutorials/empty.aacockpit.xml

resource/proto/AATeam/tutorials/grind.aamap.xml

resource/proto/AATeam/tutorials/spartanic.aacockpit.xml

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

src/engine/eCamera.h

src/engine/eGameObject.cpp

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/render/rConsole.h

src/render/rConsoleGraph.cpp

src/tools/tBackgroundProcess.h

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tLocale.cpp

src/tools/tRecorder.cpp

src/tools/tRecorder.h

src/tools/tToDo.cpp

src/tron/cockpit/cCamview.cpp

src/tron/cockpit/cCockpit.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/gTutorial.cpp

src/tron/gTutorial.h

src/tron/zone/zFortress.cpp

src/ui/uInput.cpp

src/ui/uInput.h

src/ui/uMenu.cpp

src/win32/config_common.h

textures/tutorials/

textures/tutorials/clipart/

textures/tutorials/clipart/check.png

textures/tutorials/clipart/check.xcf

textures/tutorials/clipart/circle.png

textures/tutorials/clipart/fail.png

textures/tutorials/grinding/

textures/tutorials/grinding/1_1.png

textures/tutorials/grinding/1_2.png

textures/tutorials/grinding/1_3.png

textures/tutorials/grinding/2_1.png

textures/tutorials/grinding/2_2.png

textures/tutorials/grinding/2_3.png

textures/tutorials/grinding/3_2.png

textures/tutorials/grinding/3_3.png

textures/tutorials/grinding/3_4.png

textures/tutorials/grinding/grinding.txt

textures/tutorials/grinding/grinding.xcf

textures/tutorials/grinding/start.png

textures/tutorials/survival/

textures/tutorials/survival/1_1.png

textures/tutorials/survival/1_2.png

textures/tutorials/survival/1_3.png

textures/tutorials/survival/1_4.png

textures/tutorials/survival/1_5.png

textures/tutorials/survival/2_1.png

textures/tutorials/survival/2_2.png

textures/tutorials/survival/2_3.png

textures/tutorials/survival/2_4.png

textures/tutorials/survival/2_5.png

textures/tutorials/survival/3_1.png

textures/tutorials/survival/3_2.png

textures/tutorials/survival/3_3.png

textures/tutorials/survival/3_4.png

textures/tutorials/survival/3_5.png

textures/tutorials/survival/3_6.png

textures/tutorials/survival/start.png

textures/tutorials/survival/survival.txt

textures/tutorials/survival/survival.xcf

win32/armagetronad.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

win32/makedist.bat

Older »