← Back to branch summary

~mike-catanzaro/armagetronad/armagetronad

~mike-catanzaro/armagetronad/armagetronad

Viewing all changes in revision 1386.

Committer: Dave Fancella
Date: 2015-01-02 07:38:54 UTC
mfrom: (1385.1.158 0.4)
Revision ID: davefancella@gmail.com-20150102073854-g74a5hsyru012n5g

Merge from 0.4

files added:
batch/make/os-x-minimum-system-version

batch/make/symlink-relative

config/uphillbothways.cfg

config/zonestyle_combined.cfg

config/zonestyle_flat.cfg

config/zonestyle_vertical.cfg

desktop/armagetronad-armagetronad-handler.desktop.in

desktop/armagetronad-link.xml.in

desktop/os-x

resource/binary/Lucifer

resource/binary/Lucifer/sick

resource/binary/Lucifer/sick/floor-1.aatex.png

scripts/examples/echo.sh

src/engine/eLadderLog.cpp

src/engine/eLadderLog.h

src/engine/eWarmup.cpp

src/engine/eWarmup.h

src/tools/tCrypto.cpp

src/tools/tCrypto.h

files removed:
MacOS

MacOS/Armagetron Advanced.xcodeproj

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj

MacOS/rakefile.rb

MacOS/rakelib

MacOS/rakelib/aabeta.rake

MacOS/rakelib/config.rb

MacOS/rakelib/release.rake

MacOS/rakelib/xcode.rake

MacOS/shared.xcconfig

src/macosx

src/macosx/AAGrowlBridge.h

src/macosx/AAGrowlBridge.mm

src/macosx/AAGrowlPlugin.h

src/macosx/AAGrowlPlugin.mm

src/macosx/AARuby.h

src/macosx/AARuby.mm

src/macosx/Armagetron Advanced_Prefix.pch

src/macosx/English.lproj

src/macosx/English.lproj/InfoPlist.strings.in

src/macosx/SDLMain.nib

src/macosx/SDLMain.nib/classes.nib

src/macosx/SDLMain.nib/info.nib

src/macosx/SDLMain.nib/objects.nib

src/macosx/client

src/macosx/client/aa_config.h

src/macosx/config_common.h

src/macosx/dedicated

src/macosx/dedicated/aa_config.h

src/macosx/version.h.in

src/tools/tCrypt.cpp

src/tools/tCrypt.h

files renamed:
desktop/armagetronad.desktop.in => desktop/armagetronad-armagetronad.desktop.in

src/macosx/Info.plist => desktop/os-x/Info.plist.in

MacOS/Armagetron Advanced.icns => desktop/os-x/armagetronad.icns

doc/ => documentation/

src/network/md5.cpp => src/tools/md5.cpp

src/network/md5.h => src/tools/md5.h

src/macosx/SDLMain.h => src/tron/gOSXSDLMain.h

src/macosx/SDLMain.mm => src/tron/gOSXSDLMain.mm

src/macosx/AAURLHandler.h => src/tron/gOSXURLHandler.h

src/macosx/AAURLHandler.mm => src/tron/gOSXURLHandler.mm

src/macosx/AAPaste.cpp => src/ui/uOSXPaste.cpp

src/macosx/AAPaste.h => src/ui/uOSXPaste.h

files modified:
.bzrignore

AUTHORS

Makefile.am

NEWS

README-Subversion

batch/Makefile.am

batch/make/version

batch/sysinstall.in

config/Makefile.am

config/default.cfg

config/examples/teamsumo.cfg

config/master.srv

config/settings_authentication.cfg

config/settings_dedicated.cfg

configure.ac

desktop/Makefile.am

desktop/armagetronad.protocol.in

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/french.txt

language/polish.txt

language/russian.txt

language/spanish.txt

language/update.py *

resource/Makefile.am

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

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

resource/proto/cockpit.dtd

src/Makefile.am

src/doc/faq.html.m4

src/engine/eCamera.cpp

src/engine/eChat.cpp

src/engine/eChat.h

src/engine/eEventNotification.cpp

src/engine/eGameObject.cpp

src/engine/eGrid.cpp

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eSound.cpp

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eTimer.cpp

src/engine/eVoter.cpp

src/engine/eVoter.h

src/network/nAuthentication.cpp

src/network/nConfig.cpp

src/network/nConfig.h

src/network/nKrawall.cpp

src/network/nKrawall.h

src/network/nNetObject.cpp

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nProtoBuf.h

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSocket.cpp

src/network/nSpamProtection.cpp

src/network/nSpamProtection.h

src/network/nStreamMessage.cpp

src/network/nStreamMessage.h

src/protobuf/ePlayer.proto

src/protobuf/zShape.proto

src/render/rConsole.cpp

src/render/rConsole.h

src/render/rConsoleCout.cpp

src/render/rFont.cpp

src/render/rFont.h

src/render/rGL.cpp

src/render/rScreen.cpp

src/render/rSysdep.cpp

src/render/rSysdep.h

src/render/rTexture.cpp

src/render/rTexture.h

src/resource/tResourceManager.cpp

src/thirdparty/Makefile.am

src/thirdparty/mathexpr/mathexpr.cpp

src/thirdparty/utf8/utf8.h

src/tools/tBackgroundProcess.h

src/tools/tCommandLine.cpp

src/tools/tConfiguration.cpp

src/tools/tConfiguration.h

src/tools/tConsole.cpp

src/tools/tConsole.h

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tLocale.cpp

src/tools/tLocale.h

src/tools/tMath.h

src/tools/tMemManager.cpp

src/tools/tMemManager.h

src/tools/tString.cpp

src/tools/tThread.h

src/tools/tVersion.cpp

src/tools/tVersion.h

src/tools/values/veMath.cpp

src/tools/values/veMath.h

src/tron/cockpit/cCockpit.cpp

src/tron/cockpit/cCockpit.h

src/tron/cockpit/cWidgetBase.cpp

src/tron/gArena.cpp

src/tron/gArmagetron.cpp

src/tron/gCamera.cpp

src/tron/gCamera.h

src/tron/gCommandLineJumpStart.cpp

src/tron/gCycle.cpp

src/tron/gCycleMovement.cpp

src/tron/gExplosion.cpp

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gMenus.cpp

src/tron/gParser.cpp

src/tron/gParser.h

src/tron/gServerBrowser.cpp

src/tron/gServerFavorites.cpp

src/tron/gStuff.cpp

src/tron/gTutorial.cpp

src/tron/gWall.cpp

src/tron/gWall.h

src/tron/gWinZone.cpp

src/tron/zone/zEffector.cpp

src/tron/zone/zFortress.cpp

src/tron/zone/zShape.cpp

src/tron/zone/zShape.h

src/ui/uInput.cpp

src/ui/uInput.h

src/ui/uMenu.cpp

src/ui/uMenu.h

win32/armagetronad.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

Show diffs side-by-side

added added

removed removed

MacOS/Armagetron Advanced.xcodeproj/

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

README-Subversion

batch/Makefile.am

batch/make/os-x-minimum-system-version

batch/make/symlink-relative

batch/make/version

batch/sysinstall.in

config/Makefile.am

config/default.cfg

config/examples/teamsumo.cfg

config/master.srv

config/settings_authentication.cfg

config/settings_dedicated.cfg

config/uphillbothways.cfg

config/zonestyle_combined.cfg

config/zonestyle_flat.cfg

config/zonestyle_vertical.cfg

desktop/Makefile.am

desktop/armagetronad-armagetronad-handler.desktop.in

desktop/armagetronad-armagetronad.desktop.in

desktop/armagetronad-link.xml.in

desktop/armagetronad.protocol.in

desktop/os-x/Info.plist.in

language/deutsch.txt

language/english_base.txt

language/english_base_notranslate.txt

language/french.txt

language/polish.txt

language/russian.txt

language/spanish.txt

language/update.py

resource/Makefile.am

resource/binary/Lucifer/

resource/binary/Lucifer/sick/

resource/binary/Lucifer/sick/floor-1.aatex.png

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

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

resource/proto/cockpit.dtd

scripts/examples/echo.sh

src/Makefile.am

src/doc/faq.html.m4

src/engine/eCamera.cpp

src/engine/eChat.cpp

src/engine/eChat.h

src/engine/eEventNotification.cpp

src/engine/eGameObject.cpp

src/engine/eGrid.cpp

src/engine/eLadderLog.cpp

src/engine/eLadderLog.h

src/engine/ePlayer.cpp

src/engine/ePlayer.h

src/engine/eSound.cpp

src/engine/eTeam.cpp

src/engine/eTeam.h

src/engine/eTimer.cpp

src/engine/eVoter.cpp

src/engine/eVoter.h

src/engine/eWarmup.cpp

src/engine/eWarmup.h

src/macosx/AAGrowlBridge.h

src/macosx/AAGrowlBridge.mm

src/macosx/AAGrowlPlugin.h

src/macosx/AAGrowlPlugin.mm

src/macosx/AARuby.h

src/macosx/AARuby.mm

src/macosx/Armagetron Advanced_Prefix.pch

src/macosx/English.lproj/

src/macosx/English.lproj/InfoPlist.strings.in

src/macosx/SDLMain.nib/

src/macosx/SDLMain.nib/classes.nib

src/macosx/SDLMain.nib/info.nib

src/macosx/SDLMain.nib/objects.nib

src/macosx/client/

src/macosx/client/aa_config.h

src/macosx/config_common.h

src/macosx/dedicated/

src/macosx/dedicated/aa_config.h

src/macosx/version.h.in

src/network/nAuthentication.cpp

src/network/nConfig.cpp

src/network/nConfig.h

src/network/nKrawall.cpp

src/network/nKrawall.h

src/network/nNetObject.cpp

src/network/nNetwork.cpp

src/network/nNetwork.h

src/network/nProtoBuf.h

src/network/nServerInfo.cpp

src/network/nServerInfo.h

src/network/nSocket.cpp

src/network/nSpamProtection.cpp

src/network/nSpamProtection.h

src/network/nStreamMessage.cpp

src/network/nStreamMessage.h

src/protobuf/ePlayer.proto

src/protobuf/zShape.proto

src/render/rConsole.cpp

src/render/rConsole.h

src/render/rConsoleCout.cpp

src/render/rFont.cpp

src/render/rFont.h

src/render/rGL.cpp

src/render/rScreen.cpp

src/render/rSysdep.cpp

src/render/rSysdep.h

src/render/rTexture.cpp

src/render/rTexture.h

src/resource/tResourceManager.cpp

src/thirdparty/Makefile.am

src/thirdparty/mathexpr/mathexpr.cpp

src/thirdparty/utf8/utf8.h

src/tools/tBackgroundProcess.h

src/tools/tCommandLine.cpp

src/tools/tConfiguration.cpp

src/tools/tConfiguration.h

src/tools/tConsole.cpp

src/tools/tConsole.h

src/tools/tCrypt.cpp

src/tools/tCrypt.h

src/tools/tCrypto.cpp

src/tools/tCrypto.h

src/tools/tDirectories.cpp

src/tools/tDirectories.h

src/tools/tLocale.cpp

src/tools/tLocale.h

src/tools/tMath.h

src/tools/tMemManager.cpp

src/tools/tMemManager.h

src/tools/tString.cpp

src/tools/tThread.h

src/tools/tVersion.cpp

src/tools/tVersion.h

src/tools/values/veMath.cpp

src/tools/values/veMath.h

src/tron/cockpit/cCockpit.cpp

src/tron/cockpit/cCockpit.h

src/tron/cockpit/cWidgetBase.cpp

src/tron/gArena.cpp

src/tron/gArmagetron.cpp

src/tron/gCamera.cpp

src/tron/gCamera.h

src/tron/gCommandLineJumpStart.cpp

src/tron/gCycle.cpp

src/tron/gCycleMovement.cpp

src/tron/gExplosion.cpp

src/tron/gGame.cpp

src/tron/gGame.h

src/tron/gMenus.cpp

src/tron/gOSXSDLMain.mm

src/tron/gOSXURLHandler.h

src/tron/gOSXURLHandler.mm

src/tron/gParser.cpp

src/tron/gParser.h

src/tron/gServerBrowser.cpp

src/tron/gServerFavorites.cpp

src/tron/gStuff.cpp

src/tron/gTutorial.cpp

src/tron/gWall.cpp

src/tron/gWall.h

src/tron/gWinZone.cpp

src/tron/zone/zEffector.cpp

src/tron/zone/zFortress.cpp

src/tron/zone/zShape.cpp

src/tron/zone/zShape.h

src/ui/uInput.cpp

src/ui/uInput.h

src/ui/uMenu.cpp

src/ui/uOSXPaste.cpp

src/ui/uOSXPaste.h

win32/armagetronad.nsi

win32/code_blocks/ArmagetronAd.cbp

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Master.cbp

Older »