~swag/armagetronad/0.2.9-sty+ct+ap-fork

Committer: bazaarmagetron
Date: 2009-09-10 22:23:35 UTC
mto: (563.27.1 armagetronad)
mto: This revision was merged to the branch mainline in revision 688.
Revision ID: svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Fbranches%2F0.2.8%2Farmagetronad:9256

Automatic merging of commits that would change history order:
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.

files added:
src/thirdparty/shttpd

tron.ico

files removed:
.gitignore

NEWS-BRANCH

NEWS-TODO

config/examples/crazy

config/examples/crazy/soccer.cfg

config/examples/scripts

config/examples/scripts/flexban.cfg

config/examples/settings_pig_sty_ball.cfg

config/examples/settings_pig_sty_ctf.cfg

config/examples/settings_pig_sty_ctf_1flag.cfg

config/examples/settings_pig_sty_htf.cfg

config/examples/settings_pig_sty_shooting.cfg

config/flexban_cfg.sh

config/flexban_hotspotshield_cfg.sh

config/keys_cursor.cfg

config/keys_cursor_single.cfg

config/keys_twohand.cfg

config/keys_wasd.cfg

config/keys_x.cfg

config/keys_zqsd.cfg

config/settings_client.cfg

doc/net

language/.gitignore

language/portugese.txt

language/reset_que

resource/proto/AATeam/map-0.2.8.0_pig2.dtd

resource/proto/AATeam/map-0.2.8.0_sty+ct.dtd

resource/proto/AATeam/map-0.2.8.0_sty+ct2.dtd

resource/proto/Lover-Boy

resource/proto/Lover-Boy/example-1.0.0.aamap.xml

resource/proto/Lover-Boy/map-0.2.8.3.1_sty+ct+ap.dtd

resource/proto/Lover-Boy/map-0.2.8.3.1_sty+ct+ap_v1.1.dtd

resource/proto/Lover-Boy/map-0.2.8.3.1_sty+ct+ap_v1.2.dtd

resource/proto/Lover-Boy/map-0.2.9_styctap_v1.0.dtd

resource/proto/Lover-Boy/map-0.2.9_styctap_v1.1.dtd

resource/proto/Lover-Boy/map-0.2.9_styctap_v1.2.dtd

resource/proto/Lover-Boy/map-0.2.9_styctap_v1.3.dtd

resource/proto/Lover-Boy/map-0.2.9_styctap_v1.4.dtd

resource/proto/Lover-Boy/map-0.2.9_styctap_v1.5.dtd

resource/proto/Lover-Boy/soccer-1.0.0.aamap.xml

resource/proto/Your_mom/clever

resource/proto/Your_mom/clever/ctfsty-0.0.2.aamap.xml

resource/proto/Your_mom/clever/soccersty-0.2.0.aamap.xml

resource/proto/ct

resource/proto/ct/map-0.2.8.3.1_sty+ct-r1.dtd

scripts

scripts/examples

scripts/examples/flexban.sh

src/engine/eBannedWords.cpp

src/engine/eBannedWords.h

src/tron/gRace.cpp

src/tron/gRace.h

src/tron/gRotation.cpp

src/tron/gRotation.h

src/tron/gSvgOutput.cpp

src/tron/gSvgOutput.h

textures/message_background.png

win32

win32/README.txt

win32/Windows Development - Armagetron.url

win32/code_blocks

win32/code_blocks/Armagetron-ClientOnly.workspace

win32/code_blocks/Armagetron.cbp

win32/code_blocks/Armagetron.layout

win32/code_blocks/Armagetron.workspace

win32/code_blocks/Dedicated.cbp

win32/code_blocks/Dedicated.layout

win32/code_blocks/Dedicated_Visual2003.cbp

win32/code_blocks/Master.cbp

win32/code_blocks/Master.layout

win32/code_blocks/SDL.cbp

win32/code_blocks/SDL.layout

win32/code_blocks/SDL_image.cbp

win32/code_blocks/SDL_image.layout

win32/code_blocks/SDL_mixer.cbp

win32/code_blocks/SDL_mixer.layout

win32/code_blocks/ZThread.cbp

win32/code_blocks/ZThread.layout

win32/code_blocks/mikmod.cbp

win32/code_blocks/mikmod.layout

win32/directx

win32/directx/include

win32/directx/include/ddraw.h

win32/directx/include/dinput.h

win32/directx/include/dsound.h

win32/icons

win32/icons/mainicon.ico

win32/icons/tron.ico

win32/makedist.bat

win32/renamelibSDL.bat

win32/renamelibSDL_mixerANDimage.bat

win32/required

win32/required/Armagetron Forums.url

win32/required/armagetron.rc

win32/required/armagetron.res

win32/required/armagetronad.nsi

win32/required/armagetronad_dedicated.nsi

win32/required/banner.bmp

win32/required/banner.svg

win32/required/gcc.armagetronad.nsi

win32/required/gcc.armagetronad_dedicated.nsi

win32/required/resource.h

win32/required/vc6.armagetronad.nsi

win32/required/vc6.armagetronad_dedicated.nsi

win32/required/vc8.armagetronad.nsi

win32/required/vc8.armagetronad_dedicated.nsi

win32/required/windows_libraries.txt

files renamed:
src/tron/gZone.cpp => src/tron/gWinZone.cpp *

src/tron/gZone.h => src/tron/gWinZone.h *

files modified:
.bzrignore *

.cdtproject *

.project *

AUTHORS *

COPYING.txt *

MacOS/Armagetron Advanced.icns *

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj *

MacOS/Armagetron.pbproj/project.pbxproj *

MacOS/build_tools/process_files.rb *

Makefile.am *

Makefile.manual *

Makefile.paths *

NEWS *

README *

README-DEVELOPER *

README-SDL *

README-Subversion *

accustomdir.m4 *

acinclude.m4 *

armagetron.kdevelop *

armagetron.kdevelop.pcs *

armagetron.kdevses *

batch/Makefile.am *

batch/install.in *

batch/make/beautify *

batch/make/fingerprint *

batch/make/regenerate_fingerprint *

batch/make/releasetag *

batch/make/sortresources *

batch/make/sortresources.py *

batch/make/uninstall *

batch/make/version

batch/masterstarter.in *

batch/pushscores.in *

batch/rcd_config.in *

batch/rcd_master.in *

batch/rcd_server.in *

batch/rcd_startstop.in *

batch/serverstarter.in *

batch/starter.in *

batch/stat.in *

batch/sysinstall.in *

bootstrap.sh

config/Makefile.am *

config/aiplayers.cfg.in *

config/astylerc *

config/default.cfg *

config/examples/breakfast_in_hell.cfg *

config/examples/cvs_test/fortress_complete.cfg *

config/examples/cvs_test/fortress_physics.cfg *

config/examples/cvs_test/fortress_politics.cfg *

config/examples/cvs_test/fortress_scoring.cfg *

config/examples/cvs_test/sumo_complete.cfg *

config/examples/death_zone.cfg *

config/examples/fortress_soccer.cfg *

config/examples/health_is_wall_length.cfg *

config/examples/single_use_turbo.cfg *

config/examples/teamsumo.cfg *

config/master.srv *

config/rc.config.in *

config/settings.cfg *

config/settings_authentication.cfg *

config/settings_dedicated.cfg *

config/settings_visual.cfg *

config/subcultures.srv *

config_debug *

configure.ac *

desktop/Makefile.am *

desktop/armagetronad.desktop.in *

desktop/icons/large/armagetronad.png *

desktop/icons/medium/armagetronad.png *

desktop/icons/small/armagetronad.png *

html.m4.in *

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 *

major_version *

minor_version *

resource/Makefile.am *

resource/proto/AATeam/map-0.2.8.0.dtd *

resource/proto/AATeam/map-0.2.8.0_rc4.dtd *

resource/proto/Anonymous/README *

resource/proto/Anonymous/original/original.map.xml *

resource/proto/Anonymous/polygon/README *

resource/proto/Anonymous/polygon/regular/README *

resource/proto/Anonymous/shapes/diamond.aamap.xml *

resource/proto/Luke-Jr/n-gon/40-gon.map.xml *

resource/proto/Your_mom/inaktek/inaktek.map.xml *

resource/proto/Your_mom/repeat/repeat.map.xml *

resource/proto/Z-Man/fortress_for_old_clients.aamap.xml *

resource/proto/Z-Man/fourfold_fortress_for_old_clients.aamap.xml *

resource/proto/Z-Man/sumo_4x4.aamap.xml *

resource/proto/Z-Man/sumo_8x2.aamap.xml *

resource/proto/Z-Man/zonetest.aamap.xml *

resource/proto/map-0.1-exp.dtd *

resource/proto/map-0.1.dtd *

resource/proto/map-0.2.8_beta3.dtd *

resource/proto/map.dtd *

src/Makefile.am *

src/config_ide.h *

src/defs.h *

src/doc/Content_Creation/Howto-Maps.txt *

src/doc/Doxyfile.in *

src/doc/HtmlMakefile *

src/doc/Makefile.am *

src/doc/artr.cfg *

src/doc/bugs.html.m4 *

src/doc/changelog.html.m4 *

src/doc/commands.html.m4 *

src/doc/compile.html.m4 *

src/doc/config.html.m4 *

src/doc/faq.html.m4 *

src/doc/head.html.m4 *

src/doc/html.m4.in *

src/doc/index.html.m4 *

src/doc/install_linux.html.m4 *

src/doc/install_macosx.html.m4 *

src/doc/install_result.html.m4 *

src/doc/install_windows.html.m4 *

src/doc/navbar.html.m4 *

src/doc/net/Makefile.am *

src/doc/net/head.html.m4 *

src/doc/net/index.html.m4 *

src/doc/net/lower.html.m4 *

src/doc/net/middle.html.m4 *

src/doc/net/navbar.html.m4 *

src/doc/net/sig.m4 *

src/doc/net/upper.html.m4 *

src/doc/network.html.m4 *

src/doc/readme_macosx.html.m4 *

src/doc/sig.m4 *

src/doc/todo.html.m4 *

src/doc/versions.html.m4 *

src/engine/eAdvWall.cpp *

src/engine/eAdvWall.h *

src/engine/eAuthentication.cpp *

src/engine/eAuthentication.h *

src/engine/eAxis.cpp *

src/engine/eAxis.h *

src/engine/eCamera.cpp *

src/engine/eCamera.h *

src/engine/eChat.cpp *

src/engine/eChat.h *

src/engine/eCoord.h *

src/engine/eDebugLine.cpp *

src/engine/eDebugLine.h *

src/engine/eDisplay.cpp *

src/engine/eFloor.cpp *

src/engine/eFloor.h *

src/engine/eGameObject.cpp *

src/engine/eGameObject.h *

src/engine/eGrid.cpp *

src/engine/eGrid.h *

src/engine/eKrawall.cpp *

src/engine/eKrawall.h *

src/engine/eLagCompensation.cpp *

src/engine/eLagCompensation.h *

src/engine/eNetGameObject.cpp *

src/engine/eNetGameObject.h *

src/engine/ePath.cpp *

src/engine/ePath.h *

src/engine/ePlayer.cpp *

src/engine/ePlayer.h *

src/engine/eRectangle.cpp *

src/engine/eRectangle.h *

src/engine/eSensor.cpp *

src/engine/eSensor.h *

src/engine/eSound.cpp *

src/engine/eSound.h *

src/engine/eTeam.cpp *

src/engine/eTeam.h *

src/engine/eTess2.h *

src/engine/eTimer.cpp *

src/engine/eTimer.h *

src/engine/eVoter.cpp *

src/engine/eVoter.h *

src/engine/eWall.cpp *

src/engine/eWall.h *

src/engine/test.cpp *

src/first/Makefile.am *

src/macosx/Armagetron Advanced_Prefix.pch *

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

src/macosx/Info.plist *

src/macosx/SDLMain.h *

src/macosx/SDLMain.mm *

src/macosx/client/config.h *

src/macosx/config_common.h.in *

src/macosx/dedicated/config.h *

src/network/astat.cpp *

src/network/l2_demo.cpp *

src/network/l3_demo.cpp *

src/network/master.cpp *

src/network/md5.cpp *

src/network/md5.h *

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/nObserver.cpp *

src/network/nObserver.h *

src/network/nPriorizing.cpp *

src/network/nPriorizing.h *

src/network/nServerInfo.cpp *

src/network/nServerInfo.h *

src/network/nSimulatePing.h *

src/network/nSocket.cpp *

src/network/nSocket.h *

src/network/nSpamProtection.cpp *

src/network/nSpamProtection.h *

src/network/nettest.cpp *

src/network/nettest_main.cpp *

src/prototype.cpp *

src/prototype.h *

src/render/rConsole.cpp *

src/render/rConsole.h *

src/render/rConsoleCout.cpp *

src/render/rConsoleGraph.cpp *

src/render/rDisplayList.cpp *

src/render/rDisplayList.h *

src/render/rFont.cpp *

src/render/rFont.h *

src/render/rGL.cpp *

src/render/rGL.h *

src/render/rGLRender.cpp *

src/render/rModel.cpp *

src/render/rModel.h *

src/render/rRender.cpp *

src/render/rRender.h *

src/render/rScreen.cpp *

src/render/rScreen.h *

src/render/rSysdep.cpp *

src/render/rSysdep.h *

src/render/rTexture.cpp *

src/render/rTexture.h *

src/render/rViewport.cpp *

src/render/rViewport.h *

src/render/testgl.cpp *

src/test/Makefile.am *

src/test/chat_prefix_test.cpp *

src/thirdparty/Makefile.am *

src/thirdparty/binreloc/prefix.c *

src/thirdparty/binreloc/prefix.h *

src/thirdparty/particles/LICENSE *

src/thirdparty/particles/Makefile.am *

src/thirdparty/particles/Readme.txt *

src/thirdparty/particles/action_api.cpp *

src/thirdparty/particles/actions.cpp *

src/thirdparty/particles/general.h *

src/thirdparty/particles/opengl.cpp *

src/thirdparty/particles/p_vector.h *

src/thirdparty/particles/papi.h *

src/thirdparty/particles/system.cpp *

src/tools/memtest.cpp *

src/tools/pthread-binding.h *

src/tools/tArray.cpp *

src/tools/tArray.h *

src/tools/tCallback.cpp *

src/tools/tCallback.h *

src/tools/tCallbackString.h *

src/tools/tColor.cpp *

src/tools/tColor.h *

src/tools/tCommandLine.cpp *

src/tools/tCommandLine.h *

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/tDirectories.cpp *

src/tools/tDirectories.h *

src/tools/tError.cpp *

src/tools/tError.h *

src/tools/tEventQueue.cpp *

src/tools/tEventQueue.h *

src/tools/tException.cpp *

src/tools/tException.h *

src/tools/tHeap.cpp *

src/tools/tHeap.h *

src/tools/tInitExit.h *

src/tools/tLinkedList.cpp *

src/tools/tLinkedList.h *

src/tools/tList.h *

src/tools/tLocale.cpp *

src/tools/tLocale.h *

src/tools/tMath.h *

src/tools/tMemManager.cpp *

src/tools/tMemManager.h *

src/tools/tMemStack.cpp *

src/tools/tMemStack.h *

src/tools/tRandom.cpp *

src/tools/tRandom.h *

src/tools/tRecorder.cpp *

src/tools/tRecorder.h *

src/tools/tRecorderInternal.cpp *

src/tools/tRecorderInternal.h *

src/tools/tReferenceHolder.h *

src/tools/tResourceManager.cpp *

src/tools/tResourceManager.h *

src/tools/tRing.cpp *

src/tools/tRing.h *

src/tools/tSafePTR.cpp *

src/tools/tSafePTR.h *

src/tools/tSafePTRBase.cpp *

src/tools/tString.cpp *

src/tools/tString.h *

src/tools/tSysTime.cpp *

src/tools/tSysTime.h *

src/tools/tToDo.cpp *

src/tools/tToDo.h *

src/tools/transfab.cpp *

src/tron/gAIBase.cpp *

src/tron/gAIBase.h *

src/tron/gAICharacter.cpp *

src/tron/gAICharacter.h *

src/tron/gArena.cpp *

src/tron/gArena.h *

src/tron/gArmagetron.cpp *

src/tron/gCamera.cpp *

src/tron/gCamera.h *

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/gFloor.cpp *

src/tron/gFriends.cpp *

src/tron/gFriends.h *

src/tron/gGame.cpp *

src/tron/gGame.h *

src/tron/gHud.cpp *

src/tron/gHud.h *

src/tron/gLanguageMenu.cpp *

src/tron/gLanguageMenu.h *

src/tron/gLogo.cpp *

src/tron/gLogo.h *

src/tron/gMenus.cpp *

src/tron/gMenus.h *

src/tron/gParser.cpp *

src/tron/gParser.h *

src/tron/gParticles.cpp *

src/tron/gParticles.h *

src/tron/gSensor.cpp *

src/tron/gSensor.h *

src/tron/gServerBrowser.cpp *

src/tron/gServerBrowser.h *

src/tron/gServerFavorites.cpp *

src/tron/gServerFavorites.h *

src/tron/gSparks.cpp *

src/tron/gSparks.h *

src/tron/gSpawn.cpp *

src/tron/gSpawn.h *

src/tron/gStuff.cpp *

src/tron/gStuff.h *

src/tron/gTeam.cpp *

src/tron/gTeam.h *

src/tron/gWall.cpp *

src/tron/gWall.h *

src/ui/uInput.cpp *

src/ui/uInput.h *

src/ui/uInputQueue.cpp *

src/ui/uInputQueue.h *

src/ui/uMenu.cpp *

src/ui/uMenu.h *

src/win32/config.h *

src/win32/config_common.h *

src/win32/dirent.c *

src/win32/dirent.h *

src/win32/strstream.h *

src/win32_ded/config.h *

src/win32_ded/dirent.c *

src/win32_ded/dirent.h *

src/win32_ded/strstream.h *

tagsvn *

tank_todo-halffinnished.txt *

textures/KGN_logo.png *

textures/cycle_body.png *

textures/cycle_wheel.png *

textures/dir_wall.png *

textures/floor.png *

textures/floor_a.png *

textures/floor_b.png *

textures/font.png *

textures/font.xcf *

textures/font_extra.png *

textures/font_extra.xcf *

textures/font_s.png *

textures/font_s.xcf *

textures/rim_wall.png *

textures/sky.png *

textures/title.jpg *

todo-philippe.txt *

Show diffs side-by-side

added added

removed removed

Makefile.manual

103

installcheck_douninstall.inst:

104

DESTDIR=`pwd`/._inst $(MAKE) uninstall

105

106

installcheck_douninstall.inst2:

107

./._inst2/$(bindir)/${uninstaller}

108

find ._inst2 -mindepth 1 -type d -name ${progname} -exec echo leftover directory \{\} >> .leftover.inst2 \;

109

110

installcheck_douninstall.inst3:

111

./._inst3/$(bindir)/${uninstaller}

112

find ._inst3 -mindepth 1 -type d -name ${progname} -exec echo leftover directory \{\} >> .leftover.inst3 \;

113

106

114

installcheck_uninstall.inst: installcheck_test.inst

107

108

115

installcheck_uninstall.%: installcheck_install.%

109

116

rm -rf ._$*/${localstatedir} ._$*/.doc ._$*/.help ._$*/leak.log ._$*/memprofile*.txt ._$*/gmon.out ._$*/@logdir@

110

117

$(MAKE) installcheck_douninstall.$*

113

120

if test -s .leftover.$*; then cat .leftover.$*; false; else true; fi

114

121

rm -f .leftover.$*

115

122

116

if USE_UNINSTALL

117

installcheck_douninstall.inst2:

118

./._inst2/$(bindir)/${uninstaller}

119

find ._inst2 -mindepth 1 -type d -name ${progname} -exec echo leftover directory \{\} >> .leftover.inst2 \;

120

121

installcheck_douninstall.inst3:

122

./._inst3/$(bindir)/${uninstaller}

123

find ._inst3 -mindepth 1 -type d -name ${progname} -exec echo leftover directory \{\} >> .leftover.inst3 \;

124

125

myinstallcheck: installcheck_uninstall.inst installcheck_uninstall.inst2

126

else

127

myinstallcheck: installcheck_uninstall.inst

128

endif

123

installcheck: installcheck_uninstall.inst installcheck_uninstall.inst2

129

124

$(predistcheckclean)

130

125

@echo -e "\n---------------------------------------\nInstallation and uninstallation worked!\n---------------------------------------\n"

131

126

132

installcheck: myinstallcheck

133

devcheck: beautify myinstallcheck

127

devcheck: beautify installcheck

134

128

fullcheck: beautify devcheck distcheck

135

129

136

130

# run all that don't require a full rebuild

142

136

143

137

# initial rule for source change tag (make it really old)

144

138

.changetag:

145

touch -t 9001010101 $@

139

touch -t 7001010101 $@

146

140

147

141

# make snapshot of SVN state, tracking relevant changes in .changetag

148

142

fingerprint: .changetag

162

156

# Keep the changelog up to date as well (triggered by make dist only)

163

157

$(srcdir)/ChangeLog: .changetag

164

158

touch $@

159

rm -f $@

165

160

@echo -e "\nGenerating ChangeLog from SVN/BZR, please be patient...\n"

166

cd ${srcdir}; svn log 2>&1 > ChangeLog || bzr log --gnu-changelog 2>&1 > ChangeLog || echo "No official releasse: no changelog" > ChangeLog

161

cd ${srcdir}; svn log 2>&1 > ChangeLog || bzr log 2>&1 > ChangeLog || echo "No official releasse: no changelog" > ChangeLog

167

162

test -r $@ || touch $@

168

163

169

164

# extra target to make before a real distribution is built

Older »