From: <baz...@us...> - 2009-01-07 12:10:03
|
Revision: 8760 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8760&view=rev Author: bazaarmagetron Date: 2009-01-07 12:09:58 +0000 (Wed, 07 Jan 2009) Log Message: ----------- da...@da...: Hopefully fixed line endings in this file too Modified Paths: -------------- armagetronad/trunk/armagetronad/win32/makedist.bat Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-05 05:57:51.542000055 -0600 committer: da...@da... properties: branch-nick: armagetronad + timestamp: 2009-01-05 07:12:44.875000000 -0600 committer: da...@da... properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 Modified: armagetronad/trunk/armagetronad/win32/makedist.bat =================================================================== --- armagetronad/trunk/armagetronad/win32/makedist.bat 2009-01-07 12:09:14 UTC (rev 8759) +++ armagetronad/trunk/armagetronad/win32/makedist.bat 2009-01-07 12:09:58 UTC (rev 8760) @@ -1,105 +1,105 @@ -@echo off -SETLOCAL -REM This batch file can be used to build the target directories "dist" and "debug" one layer -REM up from here where the release and debug binaries will be compiled to. - -SET AA_DIR=.. -SET AA_BUILD_DIR=%AA_DIR%\build -SET LIBS_DIR=..\..\winlibs -SET LIBS_BUILD_DIR=%LIBS_DIR%\build -SET INSTALLER_DIR=. - -SET DIST_DIR_BASE=dist -SET DEBUG_DIR_BASE=debug -SET PROFILE_DIR_BASE=profile -SET DIST_DIR=%AA_BUILD_DIR%\%DIST_DIR_BASE% -SET DEBUG_DIR=%AA_BUILD_DIR%\%DEBUG_DIR_BASE% -SET PROFILE_DIR=%AA_BUILD_DIR%\%PROFILE_DIR_BASE% - -echo *** checking python -call python.bat -C 1>nul -SET HAVE_PYTHON=%ERRORLEVEL% - -IF EXIST %DIST_DIR% ( - call :copy_files %DIST_DIR% %DIST_DIR_BASE% -) - -IF EXIST %DEBUG_DIR% ( - mkdir %DEBUG_DIR%\var - echo Your personal configuration will be stored here. > %DEBUG_DIR%\var\README.txt - echo Updates will never touch this directory. >> %DEBUG_DIR%\var\README.txt - call :copy_files %DEBUG_DIR% %DEBUG_DIR_BASE% -) - -IF EXIST %PROFILE_DIR% ( - call :copy_files %PROFILE_DIR% %PROFILE_DIR_BASE% -) - -echo. -echo. -echo === Armagetron Advanced === -echo. - -IF EXIST %DIST_DIR% call status.bat %DIST_DIR% -IF EXIST %DEBUG_DIR% call status.bat %DEBUG_DIR% -IF EXIST %PROFILE_DIR% call status.bat %PROFILE_DIR% - -goto :exit - -:copy_files - echo +------------------------------------------------------- - echo ^| updating %2 - echo +------------------------------------------------------- - echo *** copying files... - xcopy %AA_DIR%\arenas %1\arenas /I /E /Y /C - xcopy %AA_DIR%\config %1\config /I /E /Y /C - xcopy %AA_DIR%\language %1\language /I /E /Y /C - xcopy %AA_DIR%\models %1\models /I /E /Y /C - xcopy %AA_DIR%\music %1\music /I /E /Y /C - xcopy %AA_DIR%\sound %1\sound /I /E /Y /C - if exist %1\resource del /S /Q %1\resource - mkdir %1\resource - xcopy %AA_DIR%\resource\proto %1\resource\included /I /E /Y /C - xcopy %AA_DIR%\resource\included %1\resource\included /I /E /Y /C - xcopy %AA_DIR%\textures %1\textures /I /E /Y /C - xcopy %AA_DIR%\*.txt %1 /I /Y /C - copy %AA_DIR%\README %1\README.txt /Y - copy %AA_DIR%\README-SDL %1\README-SDL.txt /Y - move /Y %1\config\aiplayers.cfg.in %1\config\aiplayers.cfg - move /Y %1\language\languages.txt.in %1\language\languages.txt - - echo *** copying binary only dlls ( WATCH FOR ERRORS! )... - xcopy %LIBS_DIR%\SDL_image\VisualC\graphics\lib\*.dll %1 /C /Y /I - xcopy %LIBS_DIR%\SDL_mixer\VisualC\smpeg\lib\*.dll %1 /C /Y /I - xcopy %LIBS_DIR%\libxml2\lib\*.dll %1 /C /Y /I - xcopy %LIBS_DIR%\iconv\lib\*.dll %1 /C /Y /I - xcopy %LIBS_DIR%\FTGL\win32\freetype\lib\*.dll %1 /C /Y /I - xcopy %LIBS_BUILD_DIR%\%2\*.dll %1 /C /Y /I - - echo *** copying installation files... - xcopy %INSTALLER_DIR%\*.nsi %1 /Y - xcopy %INSTALLER_DIR%\*.bmp %1 /Y - xcopy %INSTALLER_DIR%\*.url %1 /Y - - IF "%HAVE_PYTHON%"=="0" ( - echo *** sort resources - call python.bat "%AA_DIR%/batch/make/sortresources.py" %~1/resource/included - ) - goto :return - -:exit - IF NOT "%HAVE_PYTHON%"=="0" ( - echo ************************************************************************ - echo *** WARNING: python was not found - echo ************************************************************************ - echo *** Please check your python configuration. You can set the path for - echo *** python in "build_codeblocks\python.bat" - echo ************************************************************************ - echo *** Without python the XML resources can't be sorted. This will lead - echo *** to errors due to wrong filenames or wrong filepaths. - echo ************************************************************************ - ) - - echo done! - pause -:return +@echo off +SETLOCAL +REM This batch file can be used to build the target directories "dist" and "debug" one layer +REM up from here where the release and debug binaries will be compiled to. + +SET AA_DIR=.. +SET AA_BUILD_DIR=%AA_DIR%\build +SET LIBS_DIR=..\..\winlibs +SET LIBS_BUILD_DIR=%LIBS_DIR%\build +SET INSTALLER_DIR=. + +SET DIST_DIR_BASE=dist +SET DEBUG_DIR_BASE=debug +SET PROFILE_DIR_BASE=profile +SET DIST_DIR=%AA_BUILD_DIR%\%DIST_DIR_BASE% +SET DEBUG_DIR=%AA_BUILD_DIR%\%DEBUG_DIR_BASE% +SET PROFILE_DIR=%AA_BUILD_DIR%\%PROFILE_DIR_BASE% + +echo *** checking python +call python.bat -C 1>nul +SET HAVE_PYTHON=%ERRORLEVEL% + +IF EXIST %DIST_DIR% ( + call :copy_files %DIST_DIR% %DIST_DIR_BASE% +) + +IF EXIST %DEBUG_DIR% ( + mkdir %DEBUG_DIR%\var + echo Your personal configuration will be stored here. > %DEBUG_DIR%\var\README.txt + echo Updates will never touch this directory. >> %DEBUG_DIR%\var\README.txt + call :copy_files %DEBUG_DIR% %DEBUG_DIR_BASE% +) + +IF EXIST %PROFILE_DIR% ( + call :copy_files %PROFILE_DIR% %PROFILE_DIR_BASE% +) + +echo. +echo. +echo === Armagetron Advanced === +echo. + +IF EXIST %DIST_DIR% call status.bat %DIST_DIR% +IF EXIST %DEBUG_DIR% call status.bat %DEBUG_DIR% +IF EXIST %PROFILE_DIR% call status.bat %PROFILE_DIR% + +goto :exit + +:copy_files + echo +------------------------------------------------------- + echo ^| updating %2 + echo +------------------------------------------------------- + echo *** copying files... + xcopy %AA_DIR%\arenas %1\arenas /I /E /Y /C + xcopy %AA_DIR%\config %1\config /I /E /Y /C + xcopy %AA_DIR%\language %1\language /I /E /Y /C + xcopy %AA_DIR%\models %1\models /I /E /Y /C + xcopy %AA_DIR%\music %1\music /I /E /Y /C + xcopy %AA_DIR%\sound %1\sound /I /E /Y /C + if exist %1\resource del /S /Q %1\resource + mkdir %1\resource + xcopy %AA_DIR%\resource\proto %1\resource\included /I /E /Y /C + xcopy %AA_DIR%\resource\included %1\resource\included /I /E /Y /C + xcopy %AA_DIR%\textures %1\textures /I /E /Y /C + xcopy %AA_DIR%\*.txt %1 /I /Y /C + copy %AA_DIR%\README %1\README.txt /Y + copy %AA_DIR%\README-SDL %1\README-SDL.txt /Y + move /Y %1\config\aiplayers.cfg.in %1\config\aiplayers.cfg + move /Y %1\language\languages.txt.in %1\language\languages.txt + + echo *** copying binary only dlls ( WATCH FOR ERRORS! )... + xcopy %LIBS_DIR%\SDL_image\VisualC\graphics\lib\*.dll %1 /C /Y /I + xcopy %LIBS_DIR%\SDL_mixer\VisualC\smpeg\lib\*.dll %1 /C /Y /I + xcopy %LIBS_DIR%\libxml2\lib\*.dll %1 /C /Y /I + xcopy %LIBS_DIR%\iconv\lib\*.dll %1 /C /Y /I + xcopy %LIBS_DIR%\FTGL\win32\freetype\lib\*.dll %1 /C /Y /I + xcopy %LIBS_BUILD_DIR%\%2\*.dll %1 /C /Y /I + + echo *** copying installation files... + xcopy %INSTALLER_DIR%\*.nsi %1 /Y + xcopy %INSTALLER_DIR%\*.bmp %1 /Y + xcopy %INSTALLER_DIR%\*.url %1 /Y + + IF "%HAVE_PYTHON%"=="0" ( + echo *** sort resources + call python.bat "%AA_DIR%/batch/make/sortresources.py" %~1/resource/included + ) + goto :return + +:exit + IF NOT "%HAVE_PYTHON%"=="0" ( + echo ************************************************************************ + echo *** WARNING: python was not found + echo ************************************************************************ + echo *** Please check your python configuration. You can set the path for + echo *** python in "build_codeblocks\python.bat" + echo ************************************************************************ + echo *** Without python the XML resources can't be sorted. This will lead + echo *** to errors due to wrong filenames or wrong filepaths. + echo ************************************************************************ + ) + + echo done! + pause +:return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:12:55
|
Revision: 8761 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8761&view=rev Author: bazaarmagetron Date: 2009-01-07 12:12:48 +0000 (Wed, 07 Jan 2009) Log Message: ----------- da...@da...: Added camview, from voodoo Modified Paths: -------------- armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml armagetronad/trunk/armagetronad/resource/proto/cockpit.dtd armagetronad/trunk/armagetronad/src/Makefile.am armagetronad/trunk/armagetronad/src/engine/eCamera.cpp armagetronad/trunk/armagetronad/src/engine/eCamera.h armagetronad/trunk/armagetronad/src/engine/eDisplay.cpp armagetronad/trunk/armagetronad/src/engine/eGrid.cpp armagetronad/trunk/armagetronad/src/engine/eGrid.h armagetronad/trunk/armagetronad/src/render/rViewport.h armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.cpp armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.h armagetronad/trunk/armagetronad/src/tron/cockpit/cMap.cpp armagetronad/trunk/armagetronad/src/tron/cockpit/cWidgetBase.h armagetronad/trunk/armagetronad/src/tron/gGame.cpp Added Paths: ----------- armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.h Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-05 07:12:44.875000000 -0600 committer: da...@da... properties: branch-nick: armagetronad + timestamp: 2009-01-05 13:26:48.996000051 -0600 committer: da...@da... properties: branch-nick: 0.3.1_test Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b Modified: bzr:file-ids - + src/tron/cockpit/cCamview.h ccamview.h-20080418145407-zn5xad2y1yz79x4e-2 src/tron/cockpit/cCamview.cpp ccamview.cpp-20080418145407-zn5xad2y1yz79x4e-1 Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 Modified: armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml =================================================================== --- armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml 2009-01-07 12:12:48 UTC (rev 8761) @@ -548,5 +548,22 @@ </Solid> </Background> </Map> + + <Camview camera="in" view="in"> + <Position x="-0.95" y="-0.95" /> + <Size height="0.15" width="0.3" /> + <Translation x="0.5" y="0" z="0" /> + <Rotation value="150" /> + <Mirror value="true" /> + </Camview> + + <Camview camera="in" view="in"> + <Position x="0.35" y="-0.95" /> + <Size height="0.15" width="0.3" /> + <Translation x="-0.5" y="0" z="0" /> + <Rotation value="210" /> + <Mirror value="true" /> + </Camview> + </Cockpit> </Resource> Modified: armagetronad/trunk/armagetronad/resource/proto/cockpit.dtd =================================================================== --- armagetronad/trunk/armagetronad/resource/proto/cockpit.dtd 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/resource/proto/cockpit.dtd 2009-01-07 12:12:48 UTC (rev 8761) @@ -18,7 +18,7 @@ usetemplate CDATA '' "> -<!ELEMENT Cockpit ((BarGauge | NeedleGauge | Map | Label | VerticalBarGauge | Rectangle | WidgetTemplate)+)> +<!ELEMENT Cockpit ((BarGauge | NeedleGauge | Map | Label | VerticalBarGauge | Rectangle | WidgetTemplate | Camview )+)> <!ATTLIST Cockpit version CDATA #REQUIRED> <!ELEMENT WidgetTemplate ((DataSet | @@ -103,6 +103,39 @@ )*)> <!ATTLIST Map %CommonWidgetAttributes;> +<!ELEMENT Camview (( Position | + Size | + Background | + Translation | + Rotation | + FOV | + Mirror | + Rise | + MainCameraDir + )*)> +<!ATTLIST Camview %CommonWidgetAttributes;> +<!ATTLIST Camview view CDATA #REQUIRED> + +<!ELEMENT Translation EMPTY> +<!ATTLIST Translation x CDATA "0"> +<!ATTLIST Translation y CDATA "0"> +<!ATTLIST Translation z CDATA "0"> + +<!ELEMENT Rotation EMPTY> +<!ATTLIST Rotation value CDATA "0"> + +<!ELEMENT FOV EMPTY> +<!ATTLIST FOV value CDATA "0"> + +<!ELEMENT Mirror EMPTY> +<!ATTLIST Mirror value (true | false) "false"> + +<!ELEMENT Rise EMPTY> +<!ATTLIST Rise value CDATA "0"> + +<!ELEMENT MainCameraDir EMPTY> +<!ATTLIST MainCameraDir value (true | false) "false"> + <!ELEMENT DataSet ((AtomicData | Conditional | Math | Value)+)> <!ATTLIST DataSet id CDATA ""> Modified: armagetronad/trunk/armagetronad/src/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-07 12:12:48 UTC (rev 8761) @@ -146,6 +146,7 @@ tron/cockpit/cCockpit.h \ tron/cockpit/cWidgetBase.h tron/cockpit/cWidgetBase.cpp \ tron/cockpit/cMap.h tron/cockpit/cMap.cpp \ + tron/cockpit/cCamview.h tron/cockpit/cCamview.cpp \ tron/cockpit/cLabel.h tron/cockpit/cLabel.cpp \ tron/cockpit/cGauges.h tron/cockpit/cGauges.cpp \ tron/cockpit/cRectangle.h tron/cockpit/cRectangle.cpp\ @@ -234,7 +235,7 @@ extralibs= thirdparty/particles/libparticles.a thirdparty/scrap/libscrap.a endif -armagetronad_main_SOURCES = tron/gFloor.cpp tron/cockpit/cCockpit.cpp tron/cockpit/cMap.cpp +armagetronad_main_SOURCES = tron/gFloor.cpp tron/cockpit/cCockpit.cpp tron/cockpit/cMap.cpp tron/cockpit/cCamview.cpp armagetronad_main_CXXFLAGS =$(libtron_a_CXXFLAGS) armagetronad_main_LDADD= libtron.a libenginecore.a libengine.a libnetwork.a libui.a librender.a libtools.a thirdparty/mathexpr/libmathexpr.a ${extralibs} # librubywrap.a Modified: armagetronad/trunk/armagetronad/src/engine/eCamera.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eCamera.cpp 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/engine/eCamera.cpp 2009-01-07 12:12:48 UTC (rev 8761) @@ -386,7 +386,7 @@ void eCamera::MyInit(){ if (localPlayer){ - mode=localPlayer->startCamera; //PENDING: + if (cameraMain_) mode=localPlayer->startCamera; //PENDING: fov=localPlayer->startFOV; } @@ -422,7 +422,8 @@ // foot=tNEW(eGameObject)(pos,dir,0); distance=0; lastrendertime=se_GameTime(); - grid->cameras.Add(this,id); + if (CameraMain()) grid->cameras.Add(this,id); + else grid->subcameras.Add(this,id); // se_ResetVisibles(id); smoothTurning=turning=0; centerPosLast=centerposLast=CenterPos(); @@ -481,11 +482,12 @@ const ePlayer* eCamera::LocalPlayer() const { return localPlayer; } eCamera::eCamera(eGrid *g, rViewport *view,ePlayerNetID *p, - ePlayer *lp,eCamMode m) + ePlayer *lp,eCamMode m, bool rMain) :id(-1),grid(g),netPlayer(p),localPlayer(lp), // centerID(0), mode(m),pos(0,0),dir(1,0),top(0,0), -vp(view){ + mirrorView_(false), cameraMain_(rMain), renderInCockpit_(false), + vp(view){ /* if (p->pID>=0) localPlayer=playerConfig[p->pID]; @@ -503,8 +505,11 @@ // se_ResetVisibles(se_cameras.Len()); // if (ID!=se_cameras.Len()) se_ResetVisibles(ID); - grid->cameras.Remove(this, id); - + if (cameraMain_) + grid->cameras.Remove(this, id); + else + grid->subcameras.Remove(this, id); + tCHECK_DEST; } @@ -515,6 +520,43 @@ return center; } +void eCamera::SetCenter(eGameObject * c) { + center = c; +} + +bool eCamera::SetCamMode(eCamMode m){ + + if ((localPlayer && localPlayer->allowCam[m] && (!forbid_camera[m])) && m != CAMERA_COUNT) { + mode = m; + switch(mode){ + case CAMERA_IN: + rise=0; + break; + case CAMERA_SMART_IN: + break; + case CAMERA_CUSTOM: + rise=0; + break; + case CAMERA_SERVER_CUSTOM: + rise=0; + break; + case CAMERA_FREE: + break; + case CAMERA_FOLLOW: + break; + case CAMERA_SMART: + smartcamIncamSmooth=1; + z=z+1; + pos=pos+dir.Turn(-1,.1); + break; + case CAMERA_MER: + break; + } + return true; + } + return false; +} + void eCamera::SwitchView(){ zNear = 0.01f; @@ -1444,6 +1486,8 @@ glLoadIdentity(); if(CenterCockpitFixedBefore()){ + glMatrixMode(GL_PROJECTION); + if (mirrorView_) glScalef(-1,1,1); vp->Perspective(fov,zNear,1E+20,se_cameraEyeDistance/2.); gluLookAt(0, @@ -1490,6 +1534,8 @@ glMatrixMode(GL_MODELVIEW); glLoadIdentity(); + glMatrixMode(GL_PROJECTION); + if (mirrorView_) glScalef(-1,1,1); vp->Perspective(fov,zNear,1E+20,-se_cameraEyeDistance/2.); float offset = 0; @@ -1498,7 +1544,7 @@ test.detect(se_cameraInMaxFocusDistance*Center()->Speed()); offset = test.hit; } - + gluLookAt(0, 0, 0, @@ -2191,6 +2237,11 @@ c->Timestep(time-lastTime); su_FetchAndStoreSDLInput(); } + for(int i=grid->subcameras.Len()-1;i>=0;i--){ + //con << time-lastTime<< '\n'; + eCamera *c = grid->subcameras(i); + c->Timestep(time-lastTime); + } lastTime=time; } } Modified: armagetronad/trunk/armagetronad/src/engine/eCamera.h =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eCamera.h 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/engine/eCamera.h 2009-01-07 12:12:48 UTC (rev 8761) @@ -93,7 +93,6 @@ REAL turning; // number of turns in the last seconds REAL smoothTurning; //that value smoothed - REAL distance; // distance travelled so far REAL lastrendertime; // the time this was last rendered @@ -114,6 +113,10 @@ bool renderingMain_; // flag indicating whether the current rendering process is the main process or just a mirror effect + bool cameraMain_; // flag indicating whether the camera is a main camera or a widget view + bool renderInCockpit_; // flag indicating whether the camera is rendered in the cockpit (to disable main rendering) + bool mirrorView_; // flag indicating whether the rendering should be done as in a mirror + static bool InterestingToWatch(eGameObject const * g); //! returns the next view direction if a glance towards targetDir is requested @@ -128,6 +131,7 @@ void MyInit(); public: + bool CenterIncamOnTurn(); bool WhobbleIncam(); bool AutoSwitchIncam(); @@ -135,13 +139,26 @@ bool RenderingMain() const { return renderingMain_; } void SetRenderingMain( bool f ){ renderingMain_ = f; } + bool CameraMain() const { return cameraMain_; } + void SetCameraMain( bool f ){ cameraMain_ = f; } + + bool RenderInCockpit() const { return renderInCockpit_; } + void SetRenderInCockpit( bool f ){ renderInCockpit_ = f; } + + bool MirrorView() const { return mirrorView_; } + void SetMirrorView( bool f ){ mirrorView_ = f; } + + REAL CameraFOV () const {return fov;} + void SetCameraFOV (REAL fovNew) {fov=fovNew;} + const ePlayerNetID* Player() const; const ePlayer* LocalPlayer() const; - eCamera(eGrid *grid, rViewport *vp,ePlayerNetID *owner,ePlayer *lp,eCamMode m=CAMERA_IN); + eCamera(eGrid *grid, rViewport *vp,ePlayerNetID *owner,ePlayer *lp,eCamMode m=CAMERA_IN, bool rMain=true); virtual ~eCamera(); eGameObject * Center() const; + void SetCenter(eGameObject * c); eCoord CenterPos() const; eCoord CenterDir() const; @@ -161,7 +178,13 @@ const eCoord& CameraPos() const {return pos;} eCoord CameraGlancePos() const {return pos;} //! CHECK: this method is redundant with CameraPos(). I leave removing it to you since it is called externally. REAL CameraZ () const {return z;} + REAL CameraRise () const {return rise;} + void SetCameraDir(eCoord &pDir) {dir = pDir;} + void SetCameraPos(eCoord &pPos) {pos = pPos;} + void SetCameraZ (REAL pZ) {z = pZ;} + void SetCameraRise (REAL pRise) {rise = pRise;} + bool CenterAlive() const; bool CenterCockpitFixedBefore() const; @@ -172,6 +195,7 @@ bool Act(uActionCamera *act,REAL x); eCamMode GetCamMode() {return mode;} + bool SetCamMode(eCamMode m); //! Set camera mode, return true if change is allowed and complete, otherwise false #ifndef DEDICATED void Render(); Modified: armagetronad/trunk/armagetronad/src/engine/eDisplay.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eDisplay.cpp 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/engine/eDisplay.cpp 2009-01-07 12:12:48 UTC (rev 8761) @@ -177,6 +177,7 @@ glTexCoord4f(-1,0.1,zero*h,zero); glVertex4f (-1,0.1,zero*h,zero); + glTexCoord4f(0.1,-1.1,zero*h,zero); glVertex4f (0.1,-1.1,zero*h,zero); @@ -189,16 +190,16 @@ static REAL z=0; - +/* Try to get ride of these functions as it seems useless to use them instead of the cam parameter itself int eGrid::NumberOfCameras(){return cameras.Len();} const eCoord& eGrid::CameraPos(int i){return cameras(i)->CameraPos();} eCoord eGrid::CameraGlancePos(int i){return cameras(i)->CameraGlancePos();} const eCoord& eGrid::CameraDir(int i){return cameras(i)->CameraDir();} REAL eGrid::CameraHeight(int i){return cameras(i)->CameraZ();} +*/ - eWall *displayed_eWall=0; void draw_eWall(eGrid* grid, int v,int i, REAL& zNear, eCamera const * cam) @@ -217,8 +218,8 @@ REAL zDist = z - displayed_eWall->Height(); if ( zDist < zNear ) { - const eCoord& camPos = grid->CameraPos( v ); - const eCoord& camDir = grid->CameraDir( v ); + const eCoord& camPos = cam->CameraPos(); + const eCoord& camDir = cam->CameraDir(); eCoord base = displayed_eWall->EndPoint(0); eCoord end = displayed_eWall->EndPoint(1); @@ -262,7 +263,7 @@ } -void paint_sr_lowerSky(eGrid *grid, int viewer,bool sr_upperSky, eCoord const & camPos){ +void paint_sr_lowerSky(eGrid *grid, int viewer,bool sr_upperSky, eCamera* cam ){ TexMatrix(); glLoadIdentity(); glScalef(.005,.005,.005); @@ -285,13 +286,13 @@ } if (sa>0){ glColor4f(1,1,1,sa); - infinity_xy_plane(camPos,grid->CameraDir(viewer),lower_height); + infinity_xy_plane(cam->CameraPos(),cam->CameraDir(),lower_height); } if (!sr_upperSky && sr_alphaBlend) glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); } -void eGrid::display_simple( int viewer,bool floor, +void eGrid::display_simple( eCamera* cam, int viewer,bool floor, bool sr_upperSky,bool sr_lowerSky, REAL flooralpha, bool eWalls,bool gameObjects, @@ -328,7 +329,7 @@ glDisable(GL_CULL_FACE); - eCoord camPos = CameraGlancePos( viewer ); + eCoord camPos = cam->CameraGlancePos(); // eWallRim::Bound( camPos, 10 ); if (sr_upperSky || se_BlackSky()){ @@ -339,7 +340,7 @@ glColor3f(0,0,0); if ( z < lower_height ) - infinity_xy_plane(camPos, this->CameraDir(viewer),lower_height); + infinity_xy_plane(cam->CameraPos(), cam->CameraDir(), lower_height); glEnable(GL_TEXTURE_2D); } @@ -353,12 +354,12 @@ glColor3f(.5,.5,1); if ( z < upper_height ) - infinity_xy_plane(camPos, this->CameraDir(viewer),upper_height); + infinity_xy_plane(cam->CameraPos(), cam->CameraDir(), upper_height); } } if (sr_lowerSky && !sr_highRim){ - paint_sr_lowerSky(this, viewer,sr_upperSky, camPos); + paint_sr_lowerSky(this, viewer,sr_upperSky, cam); } if (floor){ @@ -379,7 +380,7 @@ #define SIDELEN (se_GridSize()) #define EXTENSION 10 - eCoord center = CameraPos(viewer) + CameraDir(viewer) * (SIDELEN * EXTENSION * .8); + eCoord center = cam->CameraPos() + cam->CameraDir() * (SIDELEN * EXTENSION * .8); REAL x=center.x; REAL y=center.y; @@ -420,7 +421,7 @@ se_glFloorTexture(); se_glFloorColor(flooralpha); - infinity_xy_plane( camPos, CameraDir(viewer) ); + infinity_xy_plane( cam->CameraPos(), cam->CameraDir()); /* old way: draw every triangle for(int i=eFace::faces.Len()-1;i>=0;i--){ @@ -447,7 +448,7 @@ glScalef(0.01*gs,gs,1.); se_glFloorTexture_a(); - infinity_xy_plane( camPos, CameraDir(viewer) ); + infinity_xy_plane( cam->CameraPos(), cam->CameraDir()); se_glFloorColor(flooralpha); @@ -459,7 +460,7 @@ glDepthFunc(GL_LEQUAL); glBlendFunc(GL_SRC_ALPHA,GL_ONE); - infinity_xy_plane( camPos, CameraDir(viewer) ); + infinity_xy_plane( cam->CameraPos(), cam->CameraDir() ); glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); break; @@ -468,7 +469,7 @@ glEnable(GL_DEPTH_TEST); glDepthMask(GL_TRUE); - + TexMatrix(); glLoadIdentity(); ModelMatrix(); @@ -482,7 +483,7 @@ { su_FetchAndStoreSDLInput(); - eWallRim::RenderAll( cameras(viewer) ); + eWallRim::RenderAll( cam ); } if (sr_lowerSky && sr_highRim){ @@ -491,7 +492,7 @@ // glEnable(GL_TEXTURE_GEN_Q); // glEnable(GL_TEXTURE_GEN_R); - paint_sr_lowerSky(this, viewer,sr_upperSky, camPos); + paint_sr_lowerSky(this, viewer,sr_upperSky, cam); // glDisable(GL_TEXTURE_GEN_S); // glDisable(GL_TEXTURE_GEN_T); @@ -508,7 +509,7 @@ if (eWalls){ // glDisable(GL_CULL_FACE); - // draw_eWall(this,viewer,0,zNear,cameras(viewer)); + // draw_eWall(this,viewer,0,zNear,cam); /* #ifdef DEBUG @@ -540,7 +541,7 @@ sr_CheckGLError(); if (gameObjects) - eGameObject::RenderAll(this, cameras(viewer)); + eGameObject::RenderAll(this, cam); eDebugLine::Render(); #ifdef DEBUG @@ -602,63 +603,63 @@ #ifndef DEDICATED ProjMatrix(); - z=CameraHeight(viewer); + z=cam->CameraZ(); if ( zNear > z ) { zNear = z; } - if (sr_floorMirror){ - ModelMatrix(); - glScalef(1,1,-1); + if (sr_floorMirror){ + ModelMatrix(); + glScalef(1,1,-1); - if (z>10) z=10; - glFrontFace(GL_CW); + if (z>10) z=10; + glFrontFace((cam->MirrorView())?GL_CCW:GL_CW); - bool us=false; - bool ls=false; + bool us=false; + bool ls=false; - if (sr_floorMirror>=rMIRROR_ALL){ - us=sr_upperSky; - ls=sr_lowerSky; - } - else if (sr_floorMirror>=rMIRROR_WALLS){ - if (sr_lowerSky) - ls=true; - else if (sr_upperSky) - us=true; - } + if (sr_floorMirror>=rMIRROR_ALL){ + us=sr_upperSky; + ls=sr_lowerSky; + } + else if (sr_floorMirror>=rMIRROR_WALLS){ + if (sr_lowerSky) + ls=true; + else if (sr_upperSky) + us=true; + } - cam->SetRenderingMain(false); - display_simple(viewer,false, - us,ls, - 0, - sr_floorMirror>=rMIRROR_WALLS, - sr_floorMirror>=rMIRROR_OBJECTS, - zNear); - z=CameraHeight(viewer); - glFrontFace(GL_CCW); - ModelMatrix(); - glScalef(1,1,-1); + cam->SetRenderingMain(false && cam->CameraMain()); + display_simple(cam, viewer,false, + us,ls, + 0, + sr_floorMirror>=rMIRROR_WALLS, + sr_floorMirror>=rMIRROR_OBJECTS, + zNear); + z=cam->CameraZ(); + glFrontFace((cam->MirrorView())?GL_CW:GL_CCW); + ModelMatrix(); + glScalef(1,1,-1); - cam->SetRenderingMain(true); - display_simple(viewer,true, - sr_upperSky,sr_lowerSky, - 1-sr_floorMirror_strength, - true,true,zNear); + cam->SetRenderingMain(true && cam->CameraMain()); + display_simple(cam, viewer,true, + sr_upperSky,sr_lowerSky, + 1-sr_floorMirror_strength, + true,true,zNear); - } - else - { - cam->SetRenderingMain(true); - display_simple(viewer,true, - sr_upperSky,sr_lowerSky, - 1, - true,true,zNear); - } - - + } + else + { + glFrontFace((cam->MirrorView())?GL_CW:GL_CCW); + cam->SetRenderingMain(true && cam->CameraMain()); + display_simple(cam, viewer,true, + sr_upperSky,sr_lowerSky, + 1, + true,true,zNear); + } + #ifdef EVENT_DEB // for(int i=eEdge_crossing.Len()-1;i>=0;i--){ // eEdge_crossing(i)->Render(); Modified: armagetronad/trunk/armagetronad/src/engine/eGrid.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eGrid.cpp 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/engine/eGrid.cpp 2009-01-07 12:12:48 UTC (rev 8761) @@ -2636,7 +2636,6 @@ /* - void eEdge::calc_Len() const{ REAL len2=(*p[0] - *p[1]).NormSquared(); *reinterpret_cast<REAL *>(reinterpret_cast<void *>(&len))=sqrt(len2); Modified: armagetronad/trunk/armagetronad/src/engine/eGrid.h =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eGrid.h 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/engine/eGrid.h 2009-01-07 12:12:48 UTC (rev 8761) @@ -152,14 +152,14 @@ const tList<eGameObject>& GameObjectsInteresting() const{return gameObjectsInteresting;} const tList<eGameObject>& GameObjectsInactive() const{return gameObjectsInactive;} - +/* Try to get ride of these functions as it seems useless to use them instead of the cam parameter itself int NumberOfCameras(); const eCoord& CameraPos(int i); eCoord CameraGlancePos(int i); const eCoord& CameraDir(int i); REAL CameraHeight(int i); +*/ - // int NumberOfCameras(){return eCamera::Number();} // const eCoord& CameraPos(int i){return eCamera::PosNum(i);} // const eCoord& CameraDir(int i){return eCamera::DirNum(i);} @@ -179,7 +179,7 @@ protected: // render helper - void display_simple( int viewer,bool floor, + void display_simple( eCamera* cam, int viewer,bool floor, bool sr_upperSky,bool sr_lowerSky, REAL flooralpha, bool eWalls,bool gameObjects, @@ -225,6 +225,7 @@ // cameras tList<eCamera> cameras; + tList<eCamera> subcameras; // walls // tHeap<eWallView> wallsVisible[MAX_VIEWERS]; Modified: armagetronad/trunk/armagetronad/src/render/rViewport.h =================================================================== --- armagetronad/trunk/armagetronad/src/render/rViewport.h 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/render/rViewport.h 2009-01-07 12:12:48 UTC (rev 8761) @@ -37,14 +37,18 @@ class rViewport{ REAL left,bottom,width,height; + rViewport *rootViewport; public: - rViewport(REAL l,REAL b,REAL w,REAL h):left(l),bottom(b),width(w),height(h){} + void SetRootViewport(rViewport *root) {rootViewport=root;} + rViewport *GetRootViewport() {return rootViewport;} + rViewport(REAL l,REAL b,REAL w,REAL h):left(l),bottom(b),width(w),height(h),rootViewport(0){} // create a subviewport of top rViewport(rViewport &top,rViewport &sub) :left (top.left+top.width*sub.left), bottom(top.bottom+top.height*sub.bottom), width(top.width*sub.width), - height(top.height*sub.height){} + height(top.height*sub.height), + rootViewport(0){} ~rViewport(){tCHECK_DEST;} @@ -64,6 +68,7 @@ //! returns the height and width of the viewport tCoord GetDimensions() const {return tCoord(width, height);} + tCoord GetPosition() const {return tCoord(left, bottom);} static rViewport s_viewportFullscreen, s_viewportLeft,s_viewportRight, @@ -78,7 +83,7 @@ }; -extern int sr_viewportBelongsToPlayer[MAX_VIEWPORTS]; +extern int sr_viewportBelongsToPlayer[MAX_VIEWPORTS]; extern int s_newViewportBelongsToPlayer[MAX_VIEWPORTS]; Added: armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp (rev 0) +++ armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp 2009-01-07 12:12:48 UTC (rev 8761) @@ -0,0 +1,291 @@ +/* + +************************************************************************* + +ArmageTron -- Just another Tron Lightcycle Game in 3D. +Copyright (C) 2000 Manuel Moos (ma...@mo...) + +************************************************************************** + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*************************************************************************** + +*/ +#include "cockpit/cCamview.h" +#include "cockpit/cCockpit.h" +#include "nConfig.h" +#include "tCoord.h" + +#ifndef DEDICATED + +#include "rRender.h" +#include "rScreen.h" +#include "ePlayer.h" +#include "rViewport.h" +#include "eGrid.h" +#include "eCamera.h" +#include "gCycle.h" + +#endif + +static bool stc_forbidHudCamera = false; +static nSettingItem<bool> fcs("FORBID_HUD_CAMERA", stc_forbidHudCamera); + +#ifndef DEDICATED + +namespace cWidget { + +bool Camview::Process(tXmlParser::node cur) { + if ( + WithCoordinates ::Process(cur) || + WithForeground ::Process(cur) || + WithBackground ::Process(cur)) + return true; + if(cur.IsOfType("Camview")) { + view = cur.GetProp("view"); + if (view=="custom") { + camMode = CAMERA_CUSTOM; + } else if (view=="follow") { + camMode = CAMERA_FOLLOW; + } else if (view=="free") { + camMode = CAMERA_FREE; + } else if (view=="in") { + camMode = CAMERA_IN; + } else if (view=="server_custom") { + camMode = CAMERA_SERVER_CUSTOM; + } else if (view=="smart") { + camMode = CAMERA_SMART; + } else if (view=="mer") { + camMode = CAMERA_MER; + } else if (view=="main") { + camMode = CAMERA_SMART; + mainCameraFlag = true; + } else { + view = tString(""); + tERR_WARN("Empty view string"); + DisplayError(cur); + return false; + } +// con << "Set view " << view << "\n"; + return true; + } else if(cur.IsOfType("Translation")) { + cur.GetProp("x", posTranslation.x); + cur.GetProp("y", posTranslation.y); + cur.GetProp("z", z); + posTranslationFlag = true; +// con << "Set translation " << posTranslation.x << " " << posTranslation.y << " " << z << "\n"; + return true; + } else if(cur.IsOfType("Mirror")) { + mirror = cur.GetPropBool("value"); +// con << "Set mirror " << mirror << "\n"; + return true; + } else if(cur.IsOfType("Rise")) { + cur.GetProp("value", rise); + riseFlag = true; +// con << "Set rise " << rise << "\n"; + return true; + } else if(cur.IsOfType("MainCameraDir")) { + mainCameraDirFlag = cur.GetPropBool("value"); +// con << "Set MainCameraDir " << mainCameraDirFlag << "\n"; + return true; + } else if(cur.IsOfType("Rotation")) { + cur.GetProp("value",dirAngle); + dirAngle *= M_PI / 180.; + dirCos = cos(dirAngle); + dirSin = sin(dirAngle); + dirAngleFlag = true; +// con << "Set rotation " << dirAngle << "\n"; + return true; + } else if(cur.IsOfType("FOV")) { + cur.GetProp("value", fov); + fovFlag = true; + if (fov>120) fov=120; + if (fov<30) fov=30; +// con << "Set fov " << fov << "\n"; + return true; + } + + DisplayError(cur); + return false; +} + +void Camview::Render() { + // I haven't checked possible initial matrix state, so init to identity and modelview + if(stc_forbidHudCamera) return; // the server doesn't want us to do that + glClear(GL_DEPTH_BUFFER_BIT); + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + glLoadIdentity(); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + glLoadIdentity(); + // Rendering cameras + rViewportConfiguration* viewportConfiguration = rViewportConfiguration::CurrentViewportConfiguration(); + for ( int viewport = viewportConfiguration->num_viewports-1; viewport >= 0; --viewport ) + { + //con << "render subviewport\n"; + eCamera *mc = eGrid::CurrentGrid()->Cameras()(viewport); + if (mc) { + if (cam[viewport]) { + // force mode and FOV as it is lost between rounds ... + if (fovFlag) cam[viewport]->SetCameraFOV(fov); + if (cam[viewport]->GetCamMode()!=camMode) cam[viewport]->SetCamMode(camMode); + // keep original settings + tCoord posOrg = cam[viewport]->CameraPos(), dirOrg = cam[viewport]->CameraDir(); + REAL zOrg = cam[viewport]->CameraZ(), riseOrg = cam[viewport]->CameraRise(); + // apply specific settings + if (posTranslationFlag) { + tCoord d=cam[viewport]->CameraDir(); + tCoord o(-d.y, d.x); + tCoord newPos = posOrg + o*posTranslation.x + d*posTranslation.y; + cam[viewport]->SetCameraPos(newPos); + cam[viewport]->SetCameraZ(zOrg + z); + } + if (dirAngleFlag) { + tCoord dirNew; + if (mainCameraDirFlag) { + dirNew = tCoord(mc->CameraDir().x*dirCos-mc->CameraDir().y*dirSin, + mc->CameraDir().x*dirSin+mc->CameraDir().y*dirCos); + } else { + dirNew = tCoord(cam[viewport]->CameraDir().x*dirCos-cam[viewport]->CameraDir().y*dirSin, + cam[viewport]->CameraDir().x*dirSin+cam[viewport]->CameraDir().y*dirCos); + } + cam[viewport]->SetCameraDir( dirNew ); + } + if (riseFlag) cam[viewport]->SetCameraRise(rise); + // render + viewports[viewport]->Select(); + cam[viewport]->Render(); + cam[viewport]->SetRenderInCockpit(true); + // restore original settings + cam[viewport]->SetCameraPos(posOrg); + cam[viewport]->SetCameraDir(dirOrg); + cam[viewport]->SetCameraZ(zOrg); + cam[viewport]->SetCameraRise(riseOrg); + // check if camera center must be adjusted + if (cam[viewport]->Center()!=mc->Center()) { + cam[viewport]->SetCenter( mc->Center() ); + } + } else if (mainCameraFlag) { + // render + viewports[viewport]->Select(); + mc->Render(); + mc->SetRenderInCockpit(true); + } + } + } + + //restore gl context + glMatrixMode(GL_MODELVIEW); + glPopMatrix(); + glMatrixMode(GL_PROJECTION); + glPopMatrix(); +} + +void Camview::PostParsingProcess() +{ + rViewportConfiguration* viewportConfiguration = rViewportConfiguration::CurrentViewportConfiguration(); + rViewport *vpmod = new rViewport((m_position.x+1)/2,(m_position.y+1)/2,m_size.x,m_size.y*sr_screenWidth/sr_screenHeight); + eGrid *grid = eGrid::CurrentGrid(); + for ( int viewport = viewportConfiguration->num_viewports-1; viewport >= 0; --viewport ) + { + // get the viewport + rViewport *port = viewportConfiguration->Port( viewport ); + // create the subviewport + viewports[viewport] = new rViewport(*port, *vpmod); + viewports[viewport]->SetRootViewport(port); + // create the camera (if not the main cam to render) + if (!mainCameraFlag) { + CreateCamera(viewport); + } +// con << "create subviewport " << m_position.x << " " << m_position.y << " " << m_size.x << " " << m_size.y << "\n"; + } + ReadyFlag = true; + delete vpmod; +} + +// recreate viewports and cams if needed ... +void Camview::BeforeRoundProcess() { + if (!ReadyFlag) + PostParsingProcess(); +} + +// delete viewports and cams ... +void Camview::AfterRoundProcess() { + rViewportConfiguration* viewportConfiguration = rViewportConfiguration::CurrentViewportConfiguration(); + for ( int viewport = viewportConfiguration->num_viewports-1; viewport >= 0; --viewport ) + { + if (!mainCameraFlag) { + delete cam[viewport]; + } + cam[viewport]=0; + delete viewports[viewport]; + viewports[viewport]=0; + } + ReadyFlag = false; +} + +void Camview::CreateCamera(int vp) { + eGrid *grid = eGrid::CurrentGrid(); + const tList<eCamera>& cameras = grid->Cameras(); + int playerID = sr_viewportBelongsToPlayer[ vp ]; + ePlayer* player = ePlayer::PlayerConfig( playerID ); + cam[vp] = new eCamera(grid, + viewports[vp], + player->netPlayer, + player, + camMode, + false); + cam[vp]->SetMirrorView(mirror); + // get main cam + if (fovFlag) cam[vp]->SetCameraFOV(fov); +} + +Camview::Camview(): + view(tString("")), camMode(CAMERA_IN), + dirAngle(0), dirCos(0), dirSin(0), + posTranslation(tCoord(0,0)), + z(0), rise(0), fov(0), + mirror(false), dirAngleFlag(false), + posTranslationFlag(false), + riseFlag(false), fovFlag(false), mainCameraDirFlag(false), mainCameraFlag(false), ReadyFlag(false) +{ + rViewportConfiguration* viewportConfiguration = rViewportConfiguration::CurrentViewportConfiguration(); + for ( int viewport = viewportConfiguration->num_viewports-1; viewport >= 0; --viewport ) + { + viewports[viewport] = 0; + cam[viewport] = 0; + } +} + +Camview::~Camview() +{ + /* + rViewportConfiguration* viewportConfiguration = rViewportConfiguration::CurrentViewportConfiguration(); + for ( int viewport = viewportConfiguration->num_viewports-1; viewport >= 0; --viewport ) + { + // suppress references + viewports[viewport]->SetRootViewport(0); + // suppress widget cams and viewports + delete cam[viewport]; + delete viewports[viewport]; + cam[viewport] = 0; + viewports[viewport] = 0; + }*/ +} + +} +#endif Added: armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.h =================================================================== --- armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.h (rev 0) +++ armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.h 2009-01-07 12:12:48 UTC (rev 8761) @@ -0,0 +1,76 @@ +/* + +************************************************************************* + +ArmageTron -- Just another Tron Lightcycle Game in 3D. +Copyright (C) 2000 Manuel Moos (ma...@mo...) + +************************************************************************** + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*************************************************************************** + +*/ + +//! @file +//! @brief Contains the class for rendering the camera widget + +#ifndef ARMAGETRON_CCAMVIEW_H +#define ARMAGETRON_CCAMVIEW_H + +#include "cockpit/cWidgetBase.h" + +#ifndef DEDICATED + +#include "ePlayer.h" +#include "eCamera.h" + +namespace cWidget { + +//! Processes and renders a camera "subview" of the grid +class Camview : public WithCoordinates, public WithBackground, public WithForeground { + + // the subviewport and related camera ... + rViewport *viewports[MAX_VIEWPORTS]; + tCHECKED_PTR(eCamera) cam[MAX_VIEWPORTS]; + + // widget settings + tString view; + eCamMode camMode; + REAL dirAngle, dirCos, dirSin; //! Angle, cos and sin of the rotation to apply on camera direction (lookat) + tCoord posTranslation; //! translation to be apply on camera position + REAL z,rise; //! height above the floor and whether we look up or down + REAL fov; //! field of vision; + bool mirror; //! horizontal reflection (mirror view) + bool mainCameraFlag; //! render main player camera in the widget + bool mainCameraDirFlag; //! use main camera direction to deduce view direction + bool dirAngleFlag, posTranslationFlag, riseFlag, fovFlag; //! flag settings to be overwritten ... + bool ReadyFlag; //! flag to indicate whether the widget is ready or need to be reinit (cam and viewport) +public: + void Render(); + void CreateCamera(int vp); + virtual bool Process(tXmlParser::node cur); //!< Passes on to all Process() functions of the base classes and calls Base::DisplayError() on failure + virtual void PostParsingProcess(); + virtual void BeforeRoundProcess(); + virtual void AfterRoundProcess(); + Camview(); //!< default constructor + ~Camview(); //!< default destructor +}; + +} + +#endif +#endif Modified: armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.cpp 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.cpp 2009-01-07 12:12:48 UTC (rev 8761) @@ -31,6 +31,7 @@ #include "cockpit/cGauges.h" #include "cockpit/cLabel.h" #include "cockpit/cMap.h" +#include "cockpit/cCamview.h" #include "cockpit/cRectangle.h" #include "nConfig.h" @@ -502,6 +503,7 @@ widget.SetDefaultState(cur.GetPropBool("toggleDefault")); widget.SetSticky(cur.GetPropBool("toggleSticky")); ProcessWidgetCore(cur, widget); + widget.PostParsingProcess(); } void cCockpit::AddEventHandler(int id, cWidget::Base *widget) { @@ -519,6 +521,11 @@ return cWidget::Base_ptr(new cWidget::Label()); if(cur.IsOfType("Map")) return cWidget::Base_ptr(new cWidget::Map()); + if(cur.IsOfType("Camview")) { + cWidget::Camview *w = new cWidget::Camview(); + w->Process(cur); + return cWidget::Base_ptr(w); + } if(cur.IsOfType("Rectangle")) return cWidget::Base_ptr(new cWidget::Rectangle()); return cWidget::Base_ptr(); @@ -764,6 +771,22 @@ } } +void cCockpit::BeforeRoundProcess() { + FOREACH_COCKPIT(i) { + for(widget_list_t::const_iterator w=(*i)->m_Widgets.begin(); w!=(*i)->m_Widgets.end(); ++w) { + (*w)->BeforeRoundProcess(); + } + } +} + +void cCockpit::AfterRoundProcess() { + FOREACH_COCKPIT(i) { + for(widget_list_t::iterator iter = (*i)->m_Widgets.begin(); iter != (*i)->m_Widgets.end(); ++iter) { + (*iter)->AfterRoundProcess(); + } + } +} + static void display_cockpit_lucifer() { static cCockpit static_cockpit(cCockpit::VIEWPORT_TOP); Modified: armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.h =================================================================== --- armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.h 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.h 2009-01-07 12:12:48 UTC (rev 8761) @@ -98,6 +98,9 @@ void AddEventHandler(int id, cWidget::Base *widget); //!< add a key event handler void Render(); //!< Renders the cockpit + static void BeforeRoundProcess(); //!< prepare cockpit before round + static void AfterRoundProcess(); //!< Clean cockpit after a round + //void RenderRootwindow(); //!< Renders the main viewport (all widgets that belong to the entire screen) //void RenderPlayer(float factor); //!< Renders all widgets that belong to the currently active player Modified: armagetronad/trunk/armagetronad/src/tron/cockpit/cMap.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/cockpit/cMap.cpp 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/tron/cockpit/cMap.cpp 2009-01-07 12:12:48 UTC (rev 8761) @@ -40,7 +40,6 @@ #include "rViewport.h" #include "eGrid.h" -#include "eCamera.h" #include "gCycle.h" #endif @@ -467,7 +466,8 @@ m_toggleKey(0), m_clipper(new ClipperRect()), m_currentMode(0) -{} +{ +} } #endif Modified: armagetronad/trunk/armagetronad/src/tron/cockpit/cWidgetBase.h =================================================================== --- armagetronad/trunk/armagetronad/src/tron/cockpit/cWidgetBase.h 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/tron/cockpit/cWidgetBase.h 2009-01-07 12:12:48 UTC (rev 8761) @@ -69,6 +69,9 @@ Base() : m_ParsingTemplate(false), m_Render(true), m_RenderDefault(true), m_Sticky(true) {} virtual ~Base() { } virtual void Render() = 0; //!< Needs to be owerwritten for all widgets that can be rendered (and therefore created) + virtual void PostParsingProcess() {}; + virtual void BeforeRoundProcess() {}; + virtual void AfterRoundProcess() {}; void SetCam(int Cam); //!< Set the camera(s) this widget will be rendered for int GetCam(void) { return m_Cam; } //!< Get the camera(s) this widget will be rendered for Modified: armagetronad/trunk/armagetronad/src/tron/gGame.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2009-01-07 12:09:58 UTC (rev 8760) +++ armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2009-01-07 12:12:48 UTC (rev 8761) @@ -26,7 +26,6 @@ */ #include "eEventNotification.h" -#include "eEventNotification.h" #include "gStuff.h" #include "eSoundMixer.h" #include "eGrid.h" @@ -79,6 +78,7 @@ //#include "uWebinterface.h" #include "gRotation.h" +#include "cockpit/cCockpit.h" #include <math.h> #include <stdlib.h> @@ -759,6 +759,7 @@ su_prefetchInput=false; + cCockpit::AfterRoundProcess(); int i; for (i=ePlayer::Num()-1;i>=0;i--){ if (ePlayer::PlayerConfig(i)) @@ -1204,6 +1205,7 @@ lastTime_gameloop=lastTimeTimestep=0; } + cCockpit::BeforeRoundProcess(); #else se_ResetGameTimer( -PREPARE_TIME - sg_extraRoundTime ); se_PauseGameTimer(false); @@ -1268,14 +1270,18 @@ */ const tList<eCamera>& cameras = grid->Cameras(); - for (int i=cameras.Len()-1;i>=0;i--){ - int p=sr_viewportBelongsToPlayer[i]; - conf->Select(i); - rViewport *act=conf->Port(i); - if (act && ePlayer::PlayerConfig(p)) - ePlayer::PlayerConfig(p)->Render(); - else con << "hey! viewport " << i << " does not exist!\n"; + if (!cameras(i)->RenderInCockpit()) { + int p=sr_viewportBelongsToPlayer[i]; + conf->Select(i); + rViewport *act=conf->Port(i); + if (act && ePlayer::PlayerConfig(p)) + ePlayer::PlayerConfig(p)->Render(); + else con << "hey! viewport " << i << " does not exist!\n"; + } else { + cameras(i)->SetRenderInCockpit(false); + } + } // glDisable( GL_FOG ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:13:42
|
Revision: 8762 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8762&view=rev Author: bazaarmagetron Date: 2009-01-07 12:13:40 +0000 (Wed, 07 Jan 2009) Log Message: ----------- da...@da...: Credited voodoo for camview Modified Paths: -------------- armagetronad/trunk/armagetronad/AUTHORS Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-05 13:26:48.996000051 -0600 committer: da...@da... properties: branch-nick: 0.3.1_test + timestamp: 2009-01-05 13:28:06.628999949 -0600 committer: da...@da... properties: branch-nick: 0.3.1_test Modified: bzr:file-ids - src/tron/cockpit/cCamview.h ccamview.h-20080418145407-zn5xad2y1yz79x4e-2 src/tron/cockpit/cCamview.cpp ccamview.cpp-20080418145407-zn5xad2y1yz79x4e-1 + Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 Modified: armagetronad/trunk/armagetronad/AUTHORS =================================================================== --- armagetronad/trunk/armagetronad/AUTHORS 2009-01-07 12:12:48 UTC (rev 8761) +++ armagetronad/trunk/armagetronad/AUTHORS 2009-01-07 12:13:40 UTC (rev 8762) @@ -61,7 +61,7 @@ contributed Mac OS X icon and the title screen Emmanuel Rollet - clipping and basic movement for the overhead map + clipping and basic movement for the overhead map, camview widget Fabrice Holbe original Moviepack and font This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:15:11
|
Revision: 8763 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8763&view=rev Author: bazaarmagetron Date: 2009-01-07 12:15:04 +0000 (Wed, 07 Jan 2009) Log Message: ----------- da...@da...: Fixed bug where any cockpit widgets listed after a camview were rendered in that camview. Modified Paths: -------------- armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp armagetronad/trunk/armagetronad/src/tron/gGame.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-05 13:28:06.628999949 -0600 committer: da...@da... properties: branch-nick: 0.3.1_test + timestamp: 2009-01-06 13:44:28.697999954 -0600 committer: da...@da... properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 Modified: armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml =================================================================== --- armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml 2009-01-07 12:13:40 UTC (rev 8762) +++ armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml 2009-01-07 12:15:04 UTC (rev 8763) @@ -3,6 +3,22 @@ <Resource type="aacockpit" name="standard" version="0.0.1" author="Anonymous" category=""> <Cockpit version="0.0.1"> + <Camview camera="in" view="in"> + <Position x="-0.95" y="-0.95" /> + <Size height="0.15" width="0.3" /> + <Translation x="0.5" y="0" z="0" /> + <Rotation value="150" /> + <Mirror value="true" /> + </Camview> + + <Camview camera="in" view="in"> + <Position x="0.35" y="-0.95" /> + <Size height="0.15" width="0.3" /> + <Translation x="-0.5" y="0" z="0" /> + <Rotation value="210" /> + <Mirror value="true" /> + </Camview> + <WidgetTemplate id="Clock"> <Position x=".3" y=".4" /> <Size height="0.075" width="0.075" /> @@ -549,21 +565,5 @@ </Background> </Map> - <Camview camera="in" view="in"> - <Position x="-0.95" y="-0.95" /> - <Size height="0.15" width="0.3" /> - <Translation x="0.5" y="0" z="0" /> - <Rotation value="150" /> - <Mirror value="true" /> - </Camview> - - <Camview camera="in" view="in"> - <Position x="0.35" y="-0.95" /> - <Size height="0.15" width="0.3" /> - <Translation x="-0.5" y="0" z="0" /> - <Rotation value="210" /> - <Mirror value="true" /> - </Camview> - </Cockpit> </Resource> Modified: armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp 2009-01-07 12:13:40 UTC (rev 8762) +++ armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp 2009-01-07 12:15:04 UTC (rev 8763) @@ -132,8 +132,10 @@ glMatrixMode(GL_MODELVIEW); glPushMatrix(); glLoadIdentity(); + // Rendering cameras rViewportConfiguration* viewportConfiguration = rViewportConfiguration::CurrentViewportConfiguration(); + for ( int viewport = viewportConfiguration->num_viewports-1; viewport >= 0; --viewport ) { //con << "render subviewport\n"; @@ -193,6 +195,13 @@ glPopMatrix(); glMatrixMode(GL_PROJECTION); glPopMatrix(); + + // Restore the root viewport + sr_ResetRenderState(true); + glViewport (GLsizei(0), + GLsizei(0), + GLsizei(sr_screenWidth), + GLsizei(sr_screenWidth)); } void Camview::PostParsingProcess() Modified: armagetronad/trunk/armagetronad/src/tron/gGame.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2009-01-07 12:13:40 UTC (rev 8762) +++ armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2009-01-07 12:15:04 UTC (rev 8763) @@ -759,7 +759,9 @@ su_prefetchInput=false; +#ifndef DEDICATED cCockpit::AfterRoundProcess(); +#endif int i; for (i=ePlayer::Num()-1;i>=0;i--){ if (ePlayer::PlayerConfig(i)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:16:27
|
Revision: 8764 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8764&view=rev Author: bazaarmagetron Date: 2009-01-07 12:16:14 +0000 (Wed, 07 Jan 2009) Log Message: ----------- da...@da...: Fixed bug where any cockpit widgets listed after a camview were rendered in that camview. Modified Paths: -------------- armagetronad/trunk/armagetronad/src/engine/eCamera.cpp armagetronad/trunk/armagetronad/src/tron/gGame.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-06 13:44:28.697999954 -0600 committer: da...@da... properties: branch-nick: armagetronad + timestamp: 2009-01-06 13:47:53.582999945 -0600 committer: da...@da... properties: branch-nick: armagetronad Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 Modified: armagetronad/trunk/armagetronad/src/engine/eCamera.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/eCamera.cpp 2009-01-07 12:15:04 UTC (rev 8763) +++ armagetronad/trunk/armagetronad/src/engine/eCamera.cpp 2009-01-07 12:16:14 UTC (rev 8764) @@ -486,8 +486,9 @@ :id(-1),grid(g),netPlayer(p),localPlayer(lp), // centerID(0), mode(m),pos(0,0),dir(1,0),top(0,0), - mirrorView_(false), cameraMain_(rMain), renderInCockpit_(false), - vp(view){ + vp(view), + cameraMain_(rMain), renderInCockpit_(false), mirrorView_(false) + { /* if (p->pID>=0) localPlayer=playerConfig[p->pID]; @@ -551,6 +552,9 @@ break; case CAMERA_MER: break; + case CAMERA_COUNT: + tASSERT(0); + break; } return true; } Modified: armagetronad/trunk/armagetronad/src/tron/gGame.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2009-01-07 12:15:04 UTC (rev 8763) +++ armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2009-01-07 12:16:14 UTC (rev 8764) @@ -761,7 +761,8 @@ #ifndef DEDICATED cCockpit::AfterRoundProcess(); -#endif +#endif + int i; for (i=ePlayer::Num()-1;i>=0;i--){ if (ePlayer::PlayerConfig(i)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:20:28
|
Revision: 8765 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8765&view=rev Author: bazaarmagetron Date: 2009-01-07 12:20:20 +0000 (Wed, 07 Jan 2009) Log Message: ----------- da...@da...: Merged from trunk Modified Paths: -------------- armagetronad/trunk/armagetronad/.bzrignore armagetronad/trunk/armagetronad/AUTHORS armagetronad/trunk/armagetronad/Makefile.am armagetronad/trunk/armagetronad/Makefile.manual armagetronad/trunk/armagetronad/batch/make/version armagetronad/trunk/armagetronad/configure.ac armagetronad/trunk/armagetronad/language/deutsch.txt armagetronad/trunk/armagetronad/language/english_base.txt armagetronad/trunk/armagetronad/language/french.txt armagetronad/trunk/armagetronad/language/polish.txt armagetronad/trunk/armagetronad/language/polish_transliterated.txt armagetronad/trunk/armagetronad/language/spanish.txt armagetronad/trunk/armagetronad/src/Makefile.am armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp armagetronad/trunk/armagetronad/src/network/nNetwork.cpp armagetronad/trunk/armagetronad/src/tools/tCommandLine.cpp armagetronad/trunk/armagetronad/src/tools/tLocale.cpp armagetronad/trunk/armagetronad/src/tools/tLocale.h armagetronad/trunk/armagetronad/textures/Armagetronad.ttf armagetronad/trunk/armagetronad/textures/armagetronad.sfd Added Paths: ----------- armagetronad/trunk/armagetronad/src/tools/tVersion.cpp armagetronad/trunk/armagetronad/src/tools/tVersion.h Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-06 13:47:53.582999945 -0600 committer: da...@da... properties: branch-nick: armagetronad + timestamp: 2009-01-06 14:21:04.506999969 -0600 committer: da...@da... properties: branch-nick: armagetronad Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 Modified: bzr:file-ids - + src/tools/tVersion.h tversion.h-20090104214947-id6ltdjkfel7qw2l-1 src/tools/tVersion.cpp tversion.cpp-20090105174945-ptyb83050sd75p8d-1 Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo Modified: svk:merge - 02982148-85d2-4202-9ec6-589ac3039d34:/local/armagetronad:107d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8394 7d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8715 + 02982148-85d2-4202-9ec6-589ac3039d34:/local/armagetronad:107d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8394 7d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8715 7d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8754 Modified: armagetronad/trunk/armagetronad/.bzrignore =================================================================== --- armagetronad/trunk/armagetronad/.bzrignore 2009-01-07 12:16:14 UTC (rev 8764) +++ armagetronad/trunk/armagetronad/.bzrignore 2009-01-07 12:20:20 UTC (rev 8765) @@ -47,7 +47,7 @@ resource/automatic/ .deps src/armagetronad_main -src/nTrueVersion.h +src/tTrueVersion.h src/tUniversalVariables.h src/tUniversalVariables.h.in .dummy.dep Modified: armagetronad/trunk/armagetronad/AUTHORS =================================================================== --- armagetronad/trunk/armagetronad/AUTHORS 2009-01-07 12:16:14 UTC (rev 8764) +++ armagetronad/trunk/armagetronad/AUTHORS 2009-01-07 12:20:20 UTC (rev 8765) @@ -41,7 +41,6 @@ ? ? subby where and when did he go? - Additional contributions from ============================= @@ -75,6 +74,9 @@ Meriton Replacement for the old buggy Lag-O-Meter and new camera glancing code +mygal + French translation (part) + Oscilloscope Most default instant chats @@ -84,6 +86,9 @@ Rafal Cieslak Polish translation +tang322 + French translation (part) + Tomas Birraux french accents in font Modified: armagetronad/trunk/armagetronad/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/Makefile.am 2009-01-07 12:16:14 UTC (rev 8764) +++ armagetronad/trunk/armagetronad/Makefile.am 2009-01-07 12:20:20 UTC (rev 8765) @@ -152,7 +152,7 @@ test -n "$(uninstall_location)" && test -x "$(uninstall_location)" && "$(uninstall_location)" || true distclean-local: - rm -f uninstall.sh batch/relocate.in universal_variable* extrapaths src/tUniversalVariables.h* src/nTrueVersion.h* .changetag + rm -f uninstall.sh batch/relocate.in universal_variable* extrapaths src/tUniversalVariables.h* src/tTrueVersion.h* .changetag # remove files left over by distcheck distcheck-clean: Modified: armagetronad/trunk/armagetronad/Makefile.manual =================================================================== --- armagetronad/trunk/armagetronad/Makefile.manual 2009-01-07 12:16:14 UTC (rev 8764) +++ armagetronad/trunk/armagetronad/Makefile.manual 2009-01-07 12:20:20 UTC (rev 8765) @@ -141,8 +141,8 @@ # make snapshot of SVN state, tracking relevant changes in .changetag fingerprint: .changetag -# easy, just do svn info, that contains all the information needed - svn info ${top_srcdir} > $@ || svk info ${top_srcdir} > $@ || echo "unknown" > $@ +# easy, just do svn info, that contains all the information needed. If that fails, try other scms. + svn info ${top_srcdir} > $@ || svk info ${top_srcdir} > $@ || { bzr testament ${top_srcdir}; bzr info ${top_srcdir}; } > $@ || echo "unknown" > $@ svn info `dirname ${top_srcdir}` >> @$ || svn info `dirname ${top_srcdir}` >> $@ || echo "unknown" >> $@ diff $@ .changetag > /dev/null 2>&1 || { cp $@ .changetag; rm $(srcdir)/ChangeLog; touch -t 198001010000 $(srcdir)/ChangeLog; } @@ -157,8 +157,8 @@ # Keep the changelog up to date as well (triggered by make dist only) $(srcdir)/ChangeLog: .changetag rm -f $@ - @echo -e "\nGenerating ChangeLog from SVN, please be patient...\n" - cd ${srcdir}; svn log 2>&1 > ChangeLog || echo "No official releasse: no changelog" > ChangeLog + @echo -e "\nGenerating ChangeLog from SVN/BZR, please be patient...\n" + cd ${srcdir}; svn log 2>&1 > ChangeLog || bzr log 2>&1 > ChangeLog || echo "No official releasse: no changelog" > ChangeLog test -r $@ || touch $@ # extra target to make before a real distribution is built Modified: armagetronad/trunk/armagetronad/batch/make/version =================================================================== --- armagetronad/trunk/armagetronad/batch/make/version 2009-01-07 12:16:14 UTC (rev 8764) +++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-07 12:20:20 UTC (rev 8765) @@ -4,12 +4,48 @@ #set -x +show_usage() +{ + echo "USAGE: $1 [-v|--verbose] srcdir" +} + +if test $# -ne 1 && test $# -ne 2 +then + echo "ERROR: Invalid argument count" >&2 + show_usage $0 + exit 1 +fi + +verbose= srcdir="$1" +if ( test x"$1" = x"--verbose" || test x"$1" = x"-v" ) && test $# -eq 2 +then + verbose=# + srcdir=$2 +elif ( test x"$1" = x"--verbose" || test x"$1" = x"-v" ) +then + echo "ERROR: Invalid argument count" >&2 + show_usage $0 + exit 1 +fi + # set version parts to defaults for CVS snapshot major_version=`cat ${srcdir}/major_version` DATE=`date +%Y%m%d` +builddate=`date -R` +minor_version= +revid=0 +revno=0 +branchnick= +revcount=0 +tag= +srcchanged= +lca=0 +lcaz=0 +branchurl= + #echo $major_version #echo $minor_version @@ -86,30 +122,72 @@ # Check if bzr is installed, and if the path is versionned bzr >/dev/null 2>&1 # But for now, ignore it -#if test $? -eq 0 -if test 1 -eq 0 +if test $? -eq 0 && test -d ${srcdir}/.bzr +#if test 1 -eq 0 then + # Crappily, we can't rely on revision numbers to do anything + # ( ie. when one merges then pushes, the last revno might be lower than originally) + # So we count revisions, including merged ones, also including fools which have empty + # lines with only "revno: 15" in their commit messages + revno=$( bzr revno ${srcdir} 2>/dev/null) + revcount=$( bzr log ${srcdir} 2>/dev/null | sed -ne 's/^ *revno: [0-9\.]\+$/\0/p' | wc -l ) + lca=$revno + lcaz=$revcount + versioned=# + branchurl=$( bzr info ${srcdir} 2>/dev/null | sed -ne 's/^ parent branch: \(.*\)$/\1/p' ) + + + # We will check this branch diverged, and/or if tree changed + bzrmissingcout=$( cd ${srcdir} && bzr missing --this 2>/dev/null ) + missing=$? bzr diff ${srcdir} --quiet >/dev/null 2>&1 - # Test for the return code of bzr diff (see bzr diff --help) - if test $? -eq 0 + changed=$? + + + if test ${missing} -eq 1 + # if it diverged: then - # If no change was made, use revision number - # but first check if it's tagged + # Count the revisions we added locally + localrevisions=$( echo "${bzrmissingcout}" | sed -ne '2,1s/^You have \([0-9]\+\) extra revision(s):$/\1/p' ) + # See how many steps it is, with the fool's number + stepsbackwards=$( bzr log ${srcdir} -l ${localrevisions} | sed -ne 's/^ *revno: [0-9\.]\+$/\0/p' | wc -l ) + # And start dancing. + minor_version=_alpha_z$(( ${revcount} - ${stepsbackwards} ))_${DATE} + # Set last common ancestors + lca=$(( ${revno} - ${localrevisions})) + lcaz=$(( ${revcount} - ${stepsbackwards} )) + srcchanged=# + elif test ${missing} -eq 0 && ( test ${changed} -eq 1 || test ${changed} -eq 2 ) + then + # If a change was made and no more revision was added, just use revision fool's number plus build date + minor_version=_alpha_z${revcount}_${DATE} + # And this is versionned too + srcchanged=# + elif test ${missing} -eq 0 + then + # If really no change was made, use the fool's number, with tag if any + # So check if we have tags revno=$(bzr revno ${srcdir}) - tag=$(bzr tags | grep -P "^(.*?) +${revno}$" | awk '{ print $1 }') - if test $tag + tag=$(bzr tags -d ${srcdir} | sed -ne 's/^\(.*\) +${revno}$/\1/p' ) + if test ${tag} then # If it is tagged, use the tag - DATE=_$tag + minor_version=_alpha_z${revcount}_${tag} else - # If not, use revision number - DATE=_r$(bzr revno ${srcdir}) + # If not, use fool's number only + minor_version=_alpha_z${revcount} fi - elif test $? -lt 3 + # That's versioned as well + else + # Otherwise, this is just not versionned + versioned= + fi + + if test $versioned then - # If a change was made, use revision number plus build date - DATE=_r$(bzr revno ${srcdir})_$DATE - # It returns 3 if it's not versionned, so forget it + major_version=$( cd ${srcdir}; bzr nick ) + branchnick=$major_version + revid=$( bzr testament | sed -ne 's/^revision-id: \(.*\)/\1/p' ) fi fi @@ -118,4 +196,27 @@ test -z "$DATE" || minor_version=`cat ${srcdir}/minor_version | sed -e "s,DATE,$DATE," -e "s,YYYYMMDD,$DATE,"` fi -echo $major_version$minor_version +if test $verbose +then + echo VERSION \"$major_version$minor_version\" + echo REVID \"$revid\" + echo REVNO $revno + echo BRANCHNICK \"$branchnick\" + echo ZNR $revcount + echo REVTAG \"$tag\" + + if test $srcchanged + then + echo CHANGED true + else + echo CHANGED false + fi + + echo BUILDDATE \"$builddate\" + echo BRANCHLCA $lca + echo BRANCHLCAZ $lcaz + echo BRANCHURL \"$branchurl\" +else + echo $major_version$minor_version +fi + Modified: armagetronad/trunk/armagetronad/configure.ac =================================================================== --- armagetronad/trunk/armagetronad/configure.ac 2009-01-07 12:16:14 UTC (rev 8764) +++ armagetronad/trunk/armagetronad/configure.ac 2009-01-07 12:20:20 UTC (rev 8765) @@ -338,8 +338,11 @@ test $DEBUGLEVEL -ge 5 && CXXFLAGS="$CXXFLAGS -DMEM_DEB" dnl oddly, this macro needs to be called once unconditionally, or automake -dnl borks up. -AX_CXXFLAGS_GCC_OPTION() +dnl borks up. Backup CXXFLAGS and restore them in case the test passes. Which it does +dnl for some versions of GCC. +CXXFLAGS_BACK="${CXXFLAGS}" +AX_CXXFLAGS_GCC_OPTION(-nobodyreadsconfigureoutputanyway) +CXXFLAGS="${CXXFLAGS_BACK}" if test $CODELEVEL -ge 1; then CXXFLAGS="$CXXFLAGS -Wall" Modified: armagetronad/trunk/armagetronad/language/deutsch.txt =================================================================== --- armagetronad/trunk/armagetronad/language/deutsch.txt 2009-01-07 12:16:14 UTC (rev 8764) +++ armagetronad/trunk/armagetronad/language/deutsch.txt 2009-01-07 12:20:20 UTC (rev 8765) @@ -1,7 +1,3 @@ -# maintained (mainly) by z-man -# distributed under the same conditions as the -# rest of Armagetron Advanced (see COPYING) - language Deutsch #***************************************** Modified: armagetronad/trunk/armagetronad/language/english_base.txt =================================================================== --- armagetronad/trunk/armagetronad/language/english_base.txt 2009-01-07 12:16:14 UTC (rev 8764) +++ armagetronad/trunk/armagetronad/language/english_base.txt 2009-01-07 12:20:20 UTC (rev 8765) @@ -19,6 +19,8 @@ sinclude_help Includes the following file silently, without error message if it is not found rinclude_help Includes a file using the resource system. Use the direct link syntax to your profit here. new_team_allowed_help Is it currently allowed to create a new team? +yes Yes +no No #******************************************** #******************************************** @@ -2418,6 +2420,9 @@ help_commands_tourney_shortdesc Tourney related commands help_commands_tourney_text 0x88ff88/lock0xffff88: Locks your current team. Nobody can join it any more on their own. To let someone in, you need to invoke\n0x88ff88/invite <player>0xffff88: From that moment on, the player is allowed to join you. Another effect of /invite, even if your team is not locked, is that the invited player can read all of your team's /team messages. Invitations are permanent until revoked. That means a player who is invited into your team can join and leave it freely without further need to /invite him again. Players who were on the team when you /locked it are not automatically invited when they leave on their own account.\n0x88ff88/uninvite <player>0xffff88: reverses /invite. The invitation is revoked, the player can no longer join you, and if he currently is on your team, he will be thrown out.\n0x88ff88/unlock0xffff88: makes your team available for everyone to join again. +help_version_shortdesc This server's version +help_version_text 0xffff7fThis is running:\n0x7fff7f \g \v\n0xffff7fIt was built on 0x7fff7f\d0xffff7f, from revision 0x7fff7fr\o0xffff7f(0x7fff7fz\z0xffff7f), which has revision 0x7fff7fr\l0xffff7f(0x7fff7fz\m0xffff7f) for last common ancestor with branch 0x7fff7f\p0xffff7f, which can be found at:\n0x7fff7f \b\n0xffff7fThis revision's ID is:\n0x7fff7f \i\n0xffff7fIt was tagged(empty if not tagged):\n0x7fff7f \t\n0xffff7fSource changed:\n0x7fff7f \c + invite_no_team Can't use \1 if you're not on a team.\n invite_team_locked \1 locked, you'll need an invitation from a team leader via the /invite command to join from now on.\n invite_team_unlocked \1 unlocked, you can join it freely again.\n Modified: armagetronad/trunk/armagetronad/language/french.txt =================================================================== --- armagetronad/trunk/armagetronad/language/french.txt 2009-01-07 12:16:14 UTC (rev 8764) +++ armagetronad/trunk/armagetronad/language/french.txt 2009-01-07 12:20:20 UTC (rev 8765) @@ -1,13 +1,3 @@ -#***************************************** -# -# Traduction francaise par mygal -# Commentaires, critiques, etc.? -# the...@gm... -# Thx 2 tang322 4 his help -# -#***************************************** - - language Francais #***************************************** Modified: armagetronad/trunk/armagetronad/language/polish.txt =================================================================== --- armagetronad/trunk/armagetronad/language/polish.txt 2009-01-07 12:16:14 UTC (rev 8764) +++ armagetronad/trunk/armagetronad/language/polish.txt 2009-01-07 12:20:20 UTC (rev 8765) @@ -1,2859 +1,3042 @@ -#Polish translation by Rafal Cieslak. -#based on english_base.txt :) +#***************************************** +#***************************************** +#***************************************** +#***************************************** +# +# Help texts for the various configuration +# options that can be set via the console. +# +# The text item for a configuration item +# with name NAME has the ID name_help. +# +#***************************************** +#***************************************** +#***************************************** +#***************************************** +language Polish +#***************************************** +#***************************************** +#***************************************** +#***************************************** +# +# Help texts for the various configuration +# options that can be set via the console. +# +# The text item for a configuration item +# with name NAME has the ID name_help. +# +#***************************************** +#***************************************** +#***************************************** +#***************************************** -#***************************************** -#***************************************** -#***************************************** -#***************************************** -# -# Help texts for the various configuration -# options that can be set via the console. -# -# The text item for a configuration item -# with name NAME has the ID name_help. -# -#***************************************** -#***************************************** -#***************************************** -#***************************************** -language Polish - -first_use_help Czy po raz pierwszy u\xBFywasz \g? -include_help Do\xB3\xB9cza poni\xBFszy plik -sinclude_help Do\xB3\xB9cza poni\xBFszy plik, nie zwracaj\xB9c b\xB3\xEAdu, je\xBFeli go nie znaleziono -new_team_allowed_help Czy tworzenie nowej dru\xBFyny jest aktualnie dozwolone? - -#******************************************** -#******************************************** -# -# lost settings -# -#******************************************** -#******************************************** - -keyboard_help Ustawienia klawiatury - -#******************************************** -#******************************************** -# -# keyboard settings -# -#******************************************** -#******************************************** - -doublebind_time_help Czas w sekundach pomi\xEAdzy wywo\xB3aniem tej samej akcji przez inne klawisze. - -#******************************************** -#******************************************** -# -# Cycle physics related configuration options -# -#******************************************** -#******************************************** - -cycle_speed_help Podstawowa pr\xEAdko\x9C\xE6 cyklu podczas jazdy prosto i nie w pobli\xBFu \x9Ccian -cycle_speed_min_help Minimalna pr\xEAdko\x9C\xE6 cyklu, mierzona wzgl\xEAdem CYCLE_SPEED -cycle_speed_max_help Maksymalna pr\xEAdko\x9C\xE6 cyklu, mierzona wzgl\xEAdem CYCLE_SPEED. 0 = bez limitu. -cycle_start_speed_help Pocz\xB9tkowa pr\xEAdko\x9C\xE6 cyklu -cycle_sound_speed_help Dzielnik pr\xEAdko\x9Cci d\x9Fwi\xEAku - -cycle_accel_help Mno\xBFnik przy\x9Cpieszenia przy \x9Ccianach -cycle_accel_self_help Mno\xBFnik do CYCLE_ACCEL dla w\xB3asnej \x9Cciany -cycle_accel_team_help Mno\xBFnik do CYCLE_ACCEL dla \x9Cciany graczy z dru\xBFyny -cycle_accel_enemy_help Mno\xBFnik do CYCLE_ACCEL dla \x9Cciany przeciwnik\xF3w -cycle_accel_rim_help Mno\xBFnik do CYCLE_ACCEL dla zewn\xEAtrznych \x9Ccian -cycle_accel_slingshot_help Mno\xBFnik do ca\xB3kowitego CYCLE_ACCEL, je\x9Cli cykl jest pomi\xEAdzy dwiema \x9Ccianami, z czego jedna jest jego w\xB3asna -cycle_accel_tunnel_help Mno\xBFnik do ca\xB3kowitego CYCLE_ACCEL, je\x9Cli cykl jest pomi\xEAdzy dwiema \x9Ccianami, a \xBFadna nie jest jego -cycle_accel_offset_help Minimalny odst\xEAp od \x9Cciany, musi by\xE6 dodatni -cycle_wall_near_help Maksymalny przy\x9Cpieszaj\xB9cy odst\xEAp od \x9Cciany - -cycle_boost_self_help Dodatkowe przy\x9Cpieszenie otrzymywane podczas zrywania w\xB3asnej \x9Cciany. -cycle_boost_team_help Dodatkowe przy\x9Cpieszenie otrzymywane podczas zrywania \x9Cciany gracza z dru\xBFyny. -cycle_boost_enemy_help Dodatkowe przy\x9Cpieszenie otrzymywane podczas zrywania \x9Cciany przeciwnika. -cycle_boost_rim_help Dodatkowe przy\x9Cpieszenie otrzymywane podczas zrywania \x9Cciany kraw\xEAdzi. -cycle_boostfactor_self_help Mno\xBFnik do przy\x9Cpieszenia otrzymywany podczas zrywania w\xB3asnej \x9Cciany. -cycle_boostfactor_team_help Mno\xBFnik do przy\x9Cpieszenia otrzymywany podczas zrywania \x9Cciany gracza z dru\xBFyny. -cycle_boostfactor_enemy_help Mno\xBFnik do przy\x9Cpieszenia otrzymywany podczas zrywania \x9Cciany przeciwnika. -cycle_boostfactor_rim_help Mno\xBFnik do przy\x9Cpieszenia otrzymywany podczas zrywania \x9Cciany kraw\xEAdzi. - -cycle_turn_memory_help Ilo\x9C\xE6 oczekuj\xB9cych ruch\xF3w cyklu, jakie s\xB9 zapami\xEAtywane i wykonywane. (Bufor) - -cycle_delay_help Minimalny odst\xEAp czasowy pomi\xEAdzy skr\xEAtami.(musi by\xE6 wi\xEAkszy od 0) -cycle_delay_bonus_help Dodatkowy mno\xBFnik CYCLE_DELAY stosowany tylko na serwerze dedykowanym serwerze. -cycle_delay_timebased_help Je\x9Cli warto\x9C\xE6 tej opcji to 1, to odst\xEAp pomi\xEAdzy skr\xEAtami b\xEAdzie bazowany na czasie, natomiast 0 spowoduje, \xBFe b\xEAdzie bazowany na odleg\xB3o\x9Cci. Warto\x9Cci po\x9Crednie i inne te\xBF s\xB9 obs\xB3ugiwane. -cycle_turn_speed_factor_help Mno\xBFnik pr\xEAdko\x9Cci cyklu podczas skr\xEAcania. -cycle_delay_doublebind_bonus_help Mno\xBFnik do CYCLE_DELAY dla skr\xEAt\xF3w w t\xEA sam\xB9 stron\xEA pod rz\xB9d. - - -cycle_brake_help Si\xB3a hamulc\xF3w - -cycle_width_help Kolizyjna szeroko\x9C\xE6 tunelu. Je\x9Cli cykl wjedzie do tunelu o takiej szeroko\x9Cci, lub w\xEA\xBFszego, odniesie szkody. -cycle_width_side_help Minimalna odleg\xB3o\x9C\xE6 cyklu od \x9Cciany zanim odniesie szkody. -cycle_width_rubber_min_help Je\xBFeli warunki okre\x9Clone w cycle_width s\xB9 lekko przekroczone, zu\xBFywane b\xEAdzie tak du\xBFo Rubber'a. Je\xBFeli ta warto\x9C\xE6 wynosi 1, zu\xBFycie rubbera b\xEAdzie takie samo, jakby cykl sta\xB3 naprzeciw \x9Cciany. -cycle_width_rubber_max_help Je\xBFeli warunki okre\x9Clone w cycle_width s\xB9 mocno przekroczone, zu\xBFywane b\xEAdzie tak du\xBFo Rubber'a. Je\xBFeli ta warto\x9C\xE6 wynosi 1, zu\xBFycie rubbera b\xEAdzie takie samo, jakby cykl sta\xB3 naprzeciw \x9Cciany. - -cycle_rubber_help Ilo\x9C\xE6 Rubber'a. Ta przyjazna graczom warto\x9C\xE6 okre\x9Cla w praktyce jak d\xB3ugo mog\xB9 sta\xE6 naprzeciw \x9Cciany zanim ulegn\xB9 zniszczeniu. -cycle_rubber_time_help Czas, w jakim przywracany jest ca\xB3y Rubber. -cycle_rubber_legacy_help Kod Rubber'a dla starych klient\xF3w. Starych tzn. <= 0.2.7.0. -cycle_rubber_timebased_help Je\x9Cli warto\x9C\xE6 tej opcji to 1, to zu\xBFycie Ruber'a bazowane na czasie, natomiast 0 spowoduje, \xBFe b\xEAdzie bazowane na odleg\xB3o\x9Cci. Warto\x9Cci po\x9Crednie i inne te\xBF s\xB9 obs\xB3ugiwane. -cycle_rubber_speed_help Pr\xEAdko\x9C\xE6, gdy cykl zu\xBFywa Rubber stoj\xB9c naprzeciw \x9Cciany (w ci\xB9gu ka\xBFdej sekundy znajdujesz si\xEA bli\xBFej \x9Cciany o ~0.4^{ta watro\x9C\xE6}) -cycle_rubber_mindistance_help Minimalna odleg\xB3o\x9C\xE6 na jakiej mo\xBFe znajdowa\xE6 si\xEA cykl od \x9Cciany wskutek Rubber'a. -cycle_rubber_mindistance_gap_help Je\xBFeli wi\xEAksze od zera 0, CYCLE_RUBBER_MINDISTANCE jest automatycznie modyfikowany tak, aby w powsta\xB3ym tunelu m\xF3g\xB3 si\xEA zmie\x9Cci\xE6 cykl. -cycle_rubber_mindistance_gap_side_help CYCLE_RUBBER_MINDISTANCE_GAP zadzia\xB3a tylko wtedy, je\xBFeli przez ten teoretyczny tunel m\xF3g\xB3by przejecha\xE6 cykl w ci\xB9gu okre\x9Clonej tu liczby sekund -cycle_rubber_mindistance_ratio_help Dodatkowa odleg\xB3o\x9C\xE6 powi\xEAkszaj\xB9ca CYCLE_RUBBER_MINDISTANCE w zale\xBFno\x9Cci od d\xB3ugo\x9Cci \x9Cciany naprzeciw kt\xF3rej stoisz -cycle_rubber_mindistance_reservoir_help Dodatkowy dystans je\xBFeli masz pusty Miernik Ruber'a (Zmienia si\xEA w miar\xEA jak zu\xBFywasz Rubber) -cycle_rubber_mindistance_unprepared_help Dodatkowy dystans dla nieprzygotowanych grind\xF3w; zostaje stosowany gdy ostatni skr\xEAt gracza by\xB3 tylko po\x9Clizgiem i przekroczy\xB3 czas na przygotowanie okre\x9Clony w CYCLE_RUBBER_MINDISTANCE_PREPARATION. -cycle_rubber_mindistance_preparation_help Skala czasu, do kt\xF3rej por\xF3wnywany jest czas od ostatniego skr\xEAtu gracza, aby okre\x9Cli\xE6 skutki CYCLE_RUBBER_MINDISTANCE_UNPREPARED. -cycle_rubber_mindistance_legacy_help Dodatkowy mno\xBFnik do CYCLE_RUBBER_MINDISTANCE, aktywowany gdy starsi gracze z b\xB3\xEAdem \x84rip bug\x94 s\xB9 pod\xB3\xB9czeni -cycle_rubber_minadjust_help Kiedy wyr\xF3wnywanie do \x9Cciany, pozw\xF3l zbli\xBFy\xE6 si\xEA do niej co najmniej na t\xEA odleg\xB3o\x9C\xE6, wzgl\xEAdem poprzedniej pozycji -cycle_rubber_delay_help Podczas tego odst\xEApu czasu po ostatnim skr\xEAcie gracza, efektywno\x9C\xE6 Rubbera zostanie zwielokrotniona o CYCLE_RUBBER_DELAY_BONUS. -cycle_rubber_delay_bonus_help Mno\xBFnik \x96 dodatkowe ustawienie potrzebne do CYCLE_RUBBER_DELAY. -cycle_ping_rubber_help Dodatkowe zwi\xEAkszenie przyjazno\x9Cci Rubbera graczom o du\xBFym ping'u. -cycle_rubber_wall_shrink_help Przy sko\xF1czonej d\xB3ugo\x9Cci \x9Ccian, zu\xBFyty Rubber jest mno\xBFony przez t\xEA warto\x9C\xE6 a d\xB3ugo\x9C\xE6 \x9Cciany jest zmniejszana o ten wynik -cycle_brake_refill_help Stopie\xF1, w jakim prze\xB3adowuj\xB9 si\xEA hamulce graczy, kiedy nie s\xB9 u\xBFywane -cycle_brake_deplete_help Stopie\xF1, w jakim prze\xB3adowuj\xB9 si\xEA hamulce graczy, kiedy S\xA5 u\xBFywane -cycle_sync_interval_enemy_help Czas pomi\xEAdzy od\x9Cwie\xBFaniem przez klienta informacji o po\xB3o\xBFeniu cykli -cycle_sync_interval_self_help Odst\xEAp czasu pomi\xEAdzy informacjami wysy\xB3anymi przez klienta o pozycji jego cyklu -cycle_avoid_oldclient_bad_sync_help Je\xBFeli ustawione na 1, klienci w starej wersji nie b\xEAd\xB9 otrzymywali informacji w sytuacjach kiedy wiadomo, \xBFe spowoduje to ich niekompatybilno\x9C\xE6. -cycle_fair_antilag_help Je\x9Cli ustawione na 1, dezaktywuje kod odpowiedzialny za \x84po\x9Clizgi\x94 spowodowane lagiem, gdy klienci w starej wersji s\xB9 po\xB3\xB9czeni. -cycle_time_tolerance_help Maksymalny odst\xEAp czasowy pomi\xEAdzy wykonaniem tej samej akcji na serwerze i kliencie. -cycle_packetloss_tolerance_help \x8Cmier\xE6 cyklu jest tak d\xB3ugo unikana, jak b\xB3\xB9d gracza mo\xBFe zosta\xE6 wyja\x9Cniony przez utracone w sieci pakiety. Wybranie tego umo\xBFliwia oszukiwanie. -cycle_sync_ff_help Pr\xEAdko\x9C\xE6 prognozowania synchronizowania; zmniejsz dla mniejszego obci\xB9\xBFenia CPU, ale wi\xEAksze warto\x9Cci mog\xB9 poprawia\xE6 ping -cycle_sync_ff_steps_help Ilo\x9C\xE6 krok\xF3w symulacji na jeden krok prawdziwy; zwi\xEAksz dla wi\xEAkszej dok\xB3adno\x9Cci -topology_police_help Sprawdzanie, czy te ruchy w grze by\xB3y prawid\xB3owe. -topology_police_parallel_help Dodatek do TOPOLOGY_POLICE sprawdzaj\xB9cy \x9Cciany wewn\xB9trz struktury mapy, kt\xF3re s\xB9 r\xF3wnoleg\xB3e. -cycle_smooth_time_help Skala czasowa dla opcji synchronizacji. Zwi\xEAkszenie tego spowoduje, \xBFe interpolacja b\xEAdzie p\xB3ynniejsza, ale mniej dok\xB3adna. Zmniejszenie os\xB3abi p\xB3ynno\x9C\xE6 synchronizacji -cycle_smooth_min_speed_help Minimalna pr\xEAdko\x9C\xE6 korekcji p\xB3ynno\x9Cci wzgl\xEAdem pr\xEAdko\x9Cci cyklu -cycle_smooth_threshold_help Tylko synchronizacje w kt\xF3rych zmiana po\xB3o\xBFenia graczy s\xB9 mniejsze od tej warto\x9Cci (mierzonej w pr\xEAdko\x9Cci) b\xEAd\xB9 wprowadzane p\xB3ynnie. Wi\xEAksze zmiany b\xEAd\xB9 wprowadzane natychmiast. - -#******************************************** -#******************************************** -# -# Score rules configuration items -# -#******************************************** -#******************************************** -enemy_suicide_timeout_help \x8Cmier\xE6 gracza zostanie zaliczona jako samob\xF3jstwo, je\xBFeli nie znaleziono wp\xB3ywu innych graczy na niego w ci\xB9gu tylu sekund. -score_die_help Ilo\x9C\xE6 punkt\xF3w, jak\xB9 zdobywasz za \x9Cmier\xE6 -score_survive_help Ilo\x9C\xE6 punkt\xF3w, jak\xB9 zdobywasz za prze\xBFycie -score_hole_help Ilo\x9C\xE6 punkt\xF3w, jak\xB9 zdobywasz za robienie dziur w \x9Ccianach przeciwnik\xF3w dla dobra w\xB3asnej dru\xBFyny -score_kill_help Ilo\x9C\xE6 punkt\xF3w, jak\xB9 zdobywasz za zabicie kogo\x9C -score_suicide_help Ilo\x9C\xE6 punkt\xF3w, jak\xB9 zdobywasz za samob\xF3jstwo -score_win_help Ilo\x9C\xE6 punkt\xF3w, jak\xB9 zdobywasz za wygranie rundy -score_deathzone_help Ilo\x9C\xE6 punkt\xF3w, jak\xB9 zdobywasz za dotkni\xEAcie strefy \x9Cmierci - -sp_score_win_help Ilo\x9C\xE6 punkt\xF3w, jak\xB9 zdobywasz za wygranie rundy w trybie pojedynczego gracza -sp_walls_stay_up_delay_help Czas w sekundach po jakim znikaj\xB9 \x9Cciany gracza, kt\xF3ry zgin\xB9\xB3; ujemne warto\x9Cci zostawi\xB9 te \x9Cciany na zawsze. -sp_walls_length_help D\xB3ugo\x9C\xE6 \x9Cciany cyklu w metrach; ujemne warto\x9Cci spowoduj\xB9, \xBFe \x9Ccian b\xEAd\xB9 mia\xB3y niesko\xF1czon\xB9 d\xB3ugo\x9C\xE6. -sp_explosion_radius_help Promie\xF1 wybuchu eksploduj\xB9cego cyklu w trybie pojedynczego gracza -sp_team_balance_on_quit_help Wyr\xF3wnywa\xE6 dru\xBFyny w trybie pojedynczego gracza po wyj\x9Cciu? -sp_team_balance_with_ais_help Wyr\xF3wnywa\xE6 dru\xBFyny w trybie pojedynczego graczami AI? -sp_team_max_imbalance_help Maksymalna dopuszczalna nier\xF3wno\x9C\xE6 dru\xBFyn w trybie pojedynczego gracza -sp_team_max_players_help Maksimum graczy na jedn\xB9 dru\xBFyn\xEA w trybie pojedynczego gracza -sp_team_min_players_help Minimum graczy na jedn\xB9 dru\xBFyn\xEA w trybie pojedynczego gracza -sp_teams_max_help Maksymalna ilo\x9C\xE6 dru\xBFyn w trybie pojedynczego gracza -sp_teams_min_help Minimalna ilo\x9C\xE6 dru\xBFyn w trybie pojedynczego gracza -sp_finish_type_help Co si\xEA dzieje, kiedy zginie ostatni cz\xB3owiek w trybie pojedynczego gracza? -sp_game_type_help Typ rozgrywki w trybie pojedynczego gracza. 0 - Freestyle, 1 - ostatni \xBFywy gracz lub 2 \x96 Ludzie vs. AI. -sp_auto_iq_help Automatycznie dobiera\xE6 IQ graczy komputerowych w trybie pojedynczego gracza? -sp_auto_ais_help Automatycznie tworzy\xE6 graczy AI w trybie pojedynczego gracza? -sp_ai_iq_help Inteligencja graczy AI w trybie pojedynczego gracza -sp_min_players_help Minimalna ilo\x9C\xE6 graczy w trybie pojedynczego gracza -sp_num_ais_help Ilo\x9C\xE6 graczy AI w trybie pojedynczego gracza -sp_limit_score_help Gdy kt\xF3ry\x9C z graczy w trybie pojedynczego gracza przekroczy ten limit punkt\xF3w, rozpocznie si\xEA nowy mecz -sp_limit_rounds_help Ilo\x9C\xE6 rund na jeden mecz w trybie pojedynczego gracza -sp_limit_time_help Maksymalny czas trwania jednego meczu w minutach w trybie pojedynczego gracza - -spawn_wingmen_back_help Okre\x9Cla, jak daleko w ty\xB3 znajduje si\xEA pozycja startowa skrzyd\xB3owych. -spawn_wingmen_side_help Okre\x9Cla, jak daleko w bok znajduje si\xEA pozycja startowa skrzyd\xB3owych. - -walls_stay_up_delay_help Czas w sekundach, po jakim znikaj\xB9 \x9Cciany po wybuchu cyklu; ujemne warto\x9Cci zostawi\xB9 \x9Cciany na zawsze. -walls_length_help D\xB3ugo\x9C\xE6 \x9Cciany w metrach; ujemne warto\x9Cci spowoduj\xEA, \xBFe \x9Cciany b\xEAd\xB9 niesko\xF1czenie d\xB3ugie. -explosion_radius_help Promie\xF1 wybuchu po eksplozji cyklu -team_balance_on_quit_help Wyr\xF3wnywa\xE6 dru\xBFyny po wyj\x9Cciu? -team_balance_with_ais_help Wyr\xF3wnywa\xE6 si\xB3\xEA dru\xBFyn graczami AI? -team_max_imbalance_help Maksymalna dopuszczana r\xF3\xBFnica w ilo\x9Cci graczy poszczeg\xF3lnych dru\xBFyn -team_max_players_help Maksymalna ilo\x9C\xE6 graczy na dru\xBFyn\xEA -team_min_players_help Minimalna ilo\x9C\xE6 graczy na dru\xBFyn\xEA -team_allow_shuffle_up_help Je\xBFeli wynosi 1, gracze mog\xB9 si\xEA przetasowywa\xE6 do woli. Je\x9Cli 0, to mog\xB9 tylko spada\xE6 na mniejsze pozycje. -team_center_is_boss_help Je\xBFeli wynosi 1, graczem startuj\xB9cym na \x9Crodku b\xEAdzie szef dru\xBFyny. Je\xBFeli 0, b\xEAdzie to gracz, kt\xF3ry jest w tej dru\xBFynie przez najd\xB3u\xBFszy okres czasu. - -teams_max_help Maksymalna ilo\x9C\xE6 dru\xBFyn -teams_min_help Minimalna ilo\x9C\xE6 dru\xBFyn -finish_type_help Co si\xEA dzieje, gdy wszyscy ludzcy gracze zgin\xB9? -game_type_help Typ rozgrywki. 0 - Freestyle, 1 - ostatni \xBFywy gracz lub 2 \x96 Ludzie vs. AI. -auto_iq_help Automatycznie dobiera\xE6 IQ graczy komputerowych? -auto_ais_help Automatycznie tworzy\xE6 graczy AI? -ai_iq_help Inteligencja graczy AI -min_players_help Minimalna ilo\x9C\xE6 graczy -num_ais_help Ilo\x9C\xE6 graczy AI -limit_score_help Gdy kt\xF3ry\x9C z graczy przekroczy ten limit punkt\xF3w, rozpocznie si\xEA nowy mecz -limit_rounds_help Ilo\x9C\xE6 rund na jeden mecz -limit_time_help Maksymalny czas trwania jednego meczu w minutach - -auto_team_help Oznacza, czy gracze powinny by\xE6 automatycznie umieszczani w dru\xBFynach. -no_spectators_allowed Niestety, nie dzia\xB3a z automatycznym przypisywaniem dru\xBFyn.\n -auto_team_spec_spam_help Je\x9Cli 0, przyj\x9Ccie/odej\x9Ccie obserwatora nie b\xEAdzie oznaczane. - -allow_team_name_color_help Nazywanie dru\xBFyn po kolorze -allow_team_name_player_help Nazywanie dru\xBFyn po nazwie lidera -allow_team_name_leader_help Pozwala liderowi utworzy\xE6 dru\xBFyn\xEA. - -play_time_total_help \xA3\xB9czny czas gry, z jakim kt\xF3rym kt\xF3\x9C gra\xB3 na tym kliencie -play_time_online_help \xA3\xB9czny czas gry, z jakim kt\xF3rym kt\xF3\x9C gra\xB3 na tym kliencie online -play_time_team_help \xA3\xB9czny czas gry, z jakim kt\xF3rym kt\xF3\x9C gra\xB3 na tym kliencie w dru\xBFynie -min_play_time_total_help \xA3\xB9czny czas gry, wymagany aby m\xF3c zagra\xE6 tutaj. -min_play_time_online_help \xA3\xB9czny czas gry online, wymagany aby m\xF3c zagra\xE6 tutaj. -min_play_time_team_help \xA3\xB9czny czas gry w dru\xBFynie, wymagany aby m\xF3c zagra\xE6 tutaj. -play_time_total_lacking Nie mo\xBFesz tu gra\xE6, najpierw musisz zdoby\xE6 wi\xEAcej do\x9Cwiadczenia. Zagraj przez \1 min. (tak\xBFe lokalnie), aby uzyska\xE6 dost\xEAp do gry na tym serwerze.\n -play_time_online_lacking Nie mo\xBFesz tu gra\xE6, najpierw musisz zdoby\xE6 wi\xEAcej do\x9Cwiadczenia w grze online. Zagraj przez \1 min. na innych serwerach, aby uzyska\xE6 dost\xEAp do gry na tym serwerze.\n -play_time_team_lacking Nie mo\xBFesz tu gra\xE6, najpierw musisz zdoby\xE6 wi\xEAcej do\x9Cwiadczenia w grze dru\xBFynowej. Zagraj przez \1 minut na serwerzch dru\xBFynowych, aby uzyska\xE6 dost\xEAp do gry na tym serwerze.\n - - -team_name_1_help nazwa dru\xBFyny 1 -team_name_2_help nazwa dru\xBFyny 2 -team_name_3_help nazwa dru\xBFyny 3 -team_name_4_help nazwa dru\xBFyny 4 -team_name_5_help nazwa dru\xBFyny 5 -team_name_6_help nazwa dru\xBFyny 6 -team_name_7_help nazwa dru\xBFyny 7 -team_name_8_help nazwa dru\xBFyny 8 - -team_red_1_help czerwona cz\xEA\x9C\xE6 koloru dru\xBFyny 1 -team_red_2_help czerwona cz\xEA\x9C\xE6 koloru dru\xBFyny 2 -team_red_3_help czerwona cz\xEA\x9C\xE6 koloru dru\xBFyny 3 -team_red_4_help czerwona cz\xEA\x9C\xE6 koloru dru\xBFyny 4 -team_red_5_help czerwona cz\xEA\x9C\xE6 koloru dru\xBFyny 5 -team_red_6_help czerwona cz\xEA\x9C\xE6 koloru dru\xBFyny 6 -team_red_7_help czerwona cz\xEA\x9C\xE6 koloru dru\xBFyny 7 -team_red_8_help czerwona cz\xEA\x9C\xE6 koloru dru\xBFyny 8 - -team_green_1_help zielona cz\xEA\x9C\xE6 koloru dru\xBFyny 1 -team_green_2_help zielona cz\xEA\x9C\xE6 koloru dru\xBFyny 2 -team_green_3_help zielona cz\xEA\x9C\xE6 koloru dru\xBFyny 3 -team_green_4_help zielona cz\xEA\x9C\xE6 koloru dru\xBFyny 4 -team_green_5_help zielona cz\xEA\x9C\xE6 koloru dru\xBFyny 5 -team_green_6_help zielona cz\xEA\x9C\xE6 koloru dru\xBFyny 6 -team_green_7_help zielona cz\xEA\x9C\xE6 koloru dru\xBFyny 7 -team_green_8_help zielona cz\xEA\x9C\xE6 koloru dru\xBFyny 8 - -team_blue_1_help niebieska cz\xEA\x9C\xE6 koloru dru\xBFyny 1 -team_blue_2_help niebieska cz\xEA\x9C\xE6 koloru dru\xBFyny 2 -team_blue_3_help niebieska cz\xEA\x9C\xE6 koloru dru\xBFyny 3 -team_blue_4_help niebieska cz\xEA\x9C\xE6 koloru dru\xBFyny 4 -team_blue_5_help niebieska cz\xEA\x9C\xE6 koloru dru\xBFyny 5 -team_blue_6_help niebieska cz\xEA\x9C\xE6 koloru dru\xBFyny 6 -team_blue_7_help niebieska cz\xEA\x9C\xE6 koloru dru\xBFyny 7 -team_blue_8_help niebieska cz\xEA\x9C\xE6 koloru dru\xBFyny 8 - -# wall length modification -cycle_dist_wall_shrink_help Mno\xBFnik wszystkich odleg\xB3o\x9Cci w obliczeniach \x9Ccian. Wszystkie warto\x9Cci s\xB9 dozwolone. Zobacz do settings.cfg po szczeg\xF3\xB3owe informacje. -cycle_dist_wall_shrink_offset_help Offset wszystkich odleg\xB3o\x9Cci w obliczeniach \x9Ccian. Zobacz do settings.cfg po szczeg\xF3\xB3owe informacje. - -# respawn relevant settings (no server supports respawning yet, but the client is prepared) -cycle_blink_frequency_help Cz\xEAstotliwo\x9C\xE6 w Hz z kt\xF3r\xB9 migocze nie\x9Cmiertelny cykl. -cycle_invulnerable_time_help Czas w sekundach w jakim cykl jest nie\x9Cmiertelny po restarcie. -cycle_wall_time_help Czas w sekundach po jakim cykl zaczyna tworzy\xE6 za sob\xB9 \x9Ccian\xEA po restarcie. -cycle_first_spawn_protection_help Ustaw na 1, je\xBFeli \xBFyczysz sobie, aby ustawienia nie\x9Cmiertelno\x9Cci i op\xF3\x9Fnienie zostawiania \x9Cciany dotyczy\xB3y te\xBF pierwszego, pocz\xB9tkowego startu cykli. - -#******************************************** -#******************************************** -# -# Game rules configuration items -# -#******************************************** -#******************************************** - -# map file -map_file_help Plik mapy u\xBFywanej do gry -map_uri_help U\xBFywaj RESOURCE_REPOSITORY_SERVER i MAP_FILE zamiast tego! -arena_axes_help W ilu kierunkach mo\xBFe jecha\xE6 cykl: 4 - domy\x9Clne, 6 to hexatron. -resource_repository_client_help URI kt\xF3rego u\xBFywa klient szukaj\xB9c map, kt\xF3rych mu brakuje do gry. Lepiej nie zmienia\xE6. -resource_repository_server_help URI kt\xF3rego u\xBFywaj\xB9 klient i serwer szukaj\xB9c map, kt\xF3rych in brakuje. - -# limits -speed_factor_help Mno\xBFnik pr\xEAdko\x9Cci cykl\xF3w -sp_speed_factor_help Mno\xBFnik pr\xEAdko\x9Cci cykl\xF3w w trybie pojedynczego gracza -size_factor_help Mno\xBFnik rozmiaru areny -sp_size_factor_help Mno\xBFnik rozmiaru areny w trybie pojedynczego gracza - -# single player settings (used by dedicated server only) -sp_ais_help ilo\x9C\xE6 graczy AI w trybie pojedynczego gracza - -start_new_match_help Rozpoczyna nowy mecz - -# ladder and highscore rules -ladder_min_bet_help Minimalny wynik, potrzebny do zostania umieszczonym w rankingu -ladder_percent_bet_help Procent Twojego wyniku, kt\xF3ry umieszczasz w rankingu. -ladder_tax_help Procent Twojego wyniku w rankingu, kt\xF3ry jeste\x9C winien fiskusowi :-) -ladder_lose_percent_on_load_help Procent wyniku w rankingu tracony przy ka\xBFdym za\xB3adowaniu -ladder_lose_min_on_load_help Minimalna ilo\x9C\xE6 punkt\xF3w w rankingu tracona przy ka\xBFdym za\xB3adowaniu - -ladder_gain_extra_help Zale\xBFny od pinga dodatkowy bonus do rankingu jaki otrzymuje zwyci\xEAzca - -real_arena_size_factor_help Aktualny rozmiar areny. Zostaw t\xEA warto\x9C\xE6! Zmieniaj size_factor. -real_cycle_speed_factor_help Aktualna pr\xEAdko\x9C\xE6 cykli. Zostaw t\xEA warto\x9C\xE6! Zmieniaj speed_factor. - -sp_win_zone_min_round_time_help Minimalna liczba sekund jaka musi up\xB3yn\xB9\xE6 od pocz\xB9tku rundy, aby mog\xB3a zosta\xE6 aktywowana strefa wygranej w trybie pojedynczego gracza -sp_win_zone_min_last_death_help Minimalna liczba sekund jaka musi up\xB3yn\xB9\xE6 od ostatniej \x9Cmierci, aby mog\xB3a zosta\xE6 aktywowana strefa wygranej w trybie pojedynczego gracza -win_zone_min_round_time_help Minimalna liczba sekund jaka musi up\xB3yn\xB9\xE6 od pocz\xB9tku rundy, aby mog\xB3a zosta\xE6 aktywowana strefa wygranej -win_zone_min_last_death_help Minimalna liczba sekund jaka musi up\xB3yn\xB9\xE6 od ostatniej \x9Cmierci, aby mog\xB3a zosta\xE6 aktywowana strefa wygranej -win_zone_expansion_help Pr\xEAdko\x9C\xE6 ekspansji strefy wygranej -win_zone_initial_size_help Pocz\xB9tkowy rozmiar strefy wygranej -win_zone_deaths_help Warto\x9C\xE6 = 1 zmienia j\xB9 w stref\xEA \x9Cmierci. -win_zone_randomness_help Losowo\x9C\xE6 startowego po\xB3o\xBFenia strefy wygranej. 0 umieszcza j\xB9 zawsze na \x9Crodku, 1 rozmieszcza j\xB9 po ca\xB3ej mapie. - -game_timeout_help Podstawowy limit czasowy dla synchronizacji; oznacza dok\xB3adny czas pomi\xEAdzy rundami. -last_chat_break_time_help Czas ostatniej rundy, na jaki gracz prowadz\xB9cy rozmow\xEA mo\xBFe zatrzyma\xE6 gr\xEA. -extra_round_time_help D\xB3ugo\x9C\xE6 dodatkowej przerwy na pocz\xB9tku rundy. -player_chat_wait_max_help Maksymalny czas w sekundach w jakim czeka si\xEA na pojedynczego gracza, a\xBF sko\xF1czy rozmawia\xE6. -player_chat_wait_fraction_help Maksymalny po\x9Clizg czasu w sekundach w jakim czeka si\xEA na pojedynczego gracza, a\xBF sko\xF1czy rozmawia\xE6 . -player_chat_wait_single_help Ustaw na 1, je\x9Cli powinno si\xEA czeka\xE6 tylko na jednego rozmawiaj\xB9cego gracza. -player_chat_wait_teamleader_help Ustaw na 1, je\xBFeli \xBFyczysz sobie aby tylko kapitanowie dru\xBFyn mogli zatrzymywa\xE6 czas gry rozmawiaj\xB9c. - -chatter_remove_time_help Czas w sekundach, po jakim gracz ci\xB9gle rozmawiaj\xB9cy jest usuwany z gry. -idle_remove_time_help Czas w sekundach, po jakim nieaktywny gracz jest usuwany z gry. -idle_kick_time_help Czas w sekundach, po jakim nieaktywny gracz jest wykopywany z serwera. - -#******************************************** -#******************************************** -# -# Player Configuration items -# -#******************************************** -#******************************************** - -player_name_confitem_help Imi\xEA Gracza -player_teamname_confitem_help Nazwa dru\xBFyny -player_user_confitem_help Globalny ID Gracza -auto_login_confitem_help Czy ten gracz powinien automatycznie prosi\xE6 o autentykacj\xEA? -camcenter_help Automatycznie ustaw kamer\xEA wewn\xEAtrzn\xB9 zgodnie z kierunkiem jazdy. -start_cam_help Pocz\xB9tkowa kamera -start_fov_help Pocz\xB9tkowy zasi\xEAg widoku -allow_cam_help Pozw\xF3l/zabro\xF1 graczom u\xBFycie innych kamer -instant_chat_string_help Szybki Chat dost\xEApny przy naci\x9Cni\xEAciu jednego klawisza -name_team_after_player_help Je\x9Cli wybrane, dru\xBFyny b\xEAd\xB9 nosi\xE6 nazwy po ich liderach. -fav_num_per_team_player_help Ulubiona ilo\x9C\xE6 graczy na dru\xBFyn\xEA -spectator_mode_help Ustawia tryb obserwatora temu graczu. -auto_incam_help Automatycznie prze\xB3\xB9cza na kamer\xEA wewn\xEAtrzn\xB9 w labiryncie -camwobble_help Pozwala kamerze wewn\xEAtrznej pochyla\xE6 si\xEA razem z Twoim cyklem. - -color_b_help Cz\xEA\x9C\xE6 niebieska koloru gracza \x96 \x9Cciany i cyklu. -color_g_help Cz\xEA\x9C\xE6 zielona koloru gracza \x96 \x9Cciany i cyklu. -color_r_help Cz\xEA\x9C\xE6 czerwona koloru gracza \x96 \x9Cciany i cyklu. - -#******************************************** -#******************************************** -# -# Convenience -# -#******************************************** -#******************************************** - -history_size_console_help Ilo\x9C\xE6 linii trzymanych w historii konsoli. -history_size_chat_help Ilo\x9C\xE6 linii trzymanych w historii chatu. -enable_name_hilighting_help Pod\x9Cwiatla\xE6 Twoje imi\xEA w wiadomo\x9Cciach wysy\xB3\xB9nych przez innych graczy? - -#******************************************** -#******************************************** -# -# Spam protection -# -#******************************************** -#******************************************** - -ping_flood_time_10_help Minimalny dozwolony czas na otrzymanie 10 pakiet\xF3w ping z jednego komputera. -ping_flood_time_20_help Minimalny dozwolony czas na otrzymanie 20 pakiet\xF3w ping z jednego komputera. -ping_flood_time_50_help Minimalny dozwolony czas na otrzymanie 50 pakiet\xF3w ping z jednego komputera. -ping_flood_time_100_help Minimalny dozwolony czas na otrzymanie 100 pakiet\xF3w ping z jednego komputera. -ping_flood_global_help Czasy z PING_FLOOD_TIME_X, pomno\xBFone przez t\xEA warto\x9C\xE6, licz\xB9 pingi dla wszystkich komputer\xF3w. Ujemne warto\x9Cci wy\xB3\xB9cz\xB9 ochron\xEA przed pingfloodem. - -spam_protection_repeat_help Minimalny odst\xEAp czasowy pomi\xEAdzy dwiema identycznymi wiadomo\x9Cciami tekstowymi. -spam_protection_help Minimalny odst\xEAp czasowy pomi\xEAdzy kolejnymi wiadomo\x9Cciami, ochrona przez spamem. -spam_protection_vote_help Mno\xBFnik do SPAM_PROTECTION dotycz\xB9cy g\xB3osowa\xF1. -spam_protection_chat_help Mno\xBFnik do SPAM_PROTECTION dotycz\xB9cy wiadomo\x9Cci tekstowych. -spam_penalty_help Ilo\x9C\xE6 sekund, na jak\xB9 ma zosta\xE6 wyciszony spamer. -spam_maxlen_help Maksymalna d\xB3ugo\x9C\xE6 wiadomo\x9Cci tekstowej. -spam_autokick_help Ilo\x9C\xE6 spamu, po kt\xF3rej gracz zostanie automatycznie wykopany. -silence_all_help Je\xBFeli 1, to nowi gracze b\xEAd\xB9 od pocz\xB9tku wyciszeni. -enable_chat_help Je\xBFeli 0, wszystkie wiadomo\x9Cci tekstowe b\xEAd\xB9 magazynowane (je\xBFeli zostan\xB9 zmienione na serwerze, to te zapami\xEAtane na komputerach graczy nie ulegn\xB9 zmianie) -allow_team_change_help Je\x9Cli ustawione na 1, to ka\xBFdy gracz b\xEAdzie m\xF3g\xB3 wg. W\xB3asnego uznania zmienia\xE6 dru\xBFyn\xEA. W przeciwnym wypadku gracze b\xEAd\xB9 mogli to robi\xE6 tylko wtedy, gdy otrzymaj\xB9 specjalne pozwolenie tzn. ustawienie ALLOW_TEAM_CHANGE_PLAYER - -spam_autokick_count_help Ilo\x9C\xE6 ostrzerze\xF1 jak\xB9 otrzyma spamer przed wykopaniem. -# spam kick messages -spam_chat Rozmawia\xB3e\x9C za du\xBFo. -spam_teamchage Zbyt cz\xEAsto zmienia\xB3e\x9C dru\xBFyny. -spam_vote_kick_issue Zg\xB3asza\xB3e\x9C zbyt du\xBFo ankiet. -spam_vote_rejected Zbyt wiele Twoich g\xB3os\xF3w zosta\xB3o odrzuconych. - -#******************************************** -#******************************************** -# -# Cheat protection -# -#******************************************** -#******************************************** - -allow_enemies_same_ip_help Pozwala walczy\xE6 dw\xF3m graczom o tym samym IP. -allow_enemies_same_client_help Pozwala walczy\xE6 dw\xF3m graczom z tego samego klienta. - -allow_control_during_chat_help Pozwala graczowi wpisywa\xE6 komendy podczas rozmowy. - -allow_imposters_help Je\xBFeli ustawione na 1, to gracze o tej samej nazwie b\xEAd\xB9 tolerowani. W przeciwnym wypadku wszyscy opr\xF3cz jednego b\xEAd\xB9 automatycznie zmienia\xE6 nazw\xEA. -allow_impostors_help Je\xBFeli ustawione na 1, to gracze o tej samej nazwie b\xEAd\xB9 tolerowani. W przeciwnym wypadku wszyscy opr\xF3cz jednego b\xEAd\xB9 automatycznie zmienia\xE6 nazw\xEA. - -#******************************************** -#******************************************** -# -# Banning -# -#******************************************** -#******************************************** - -network_min_ban_help Minimalny okres,czasu, na jaki mo\xBFe zosta\xE6 zbanowany u\xBFytkownik. - -network_autoban_offset_help Automatycznie banuj graczy na NETWORK_AUTOBAN_FACTOR * ( kph - NETWORK_AUTOBAN_OFFSET ) minut kiedy zostan\xB9 wykopani; kph to \x9Crednia ilo\x9C\xE6 wykopa\xF1 na godzin\xEA. -network_autoban_factor_help Automatycznie banuj graczy na NETWORK_AUTOBAN_FACTOR * ( kph - NETWORK_AUTOBAN_OFFSET ) minut kiedy zostan\xB9 wykopani; kph to \x9Crednia ilo\x9C\xE6 wykopa\xF1 na godzin\xEA. -network_autoban_max_kph_help Maksymalna warto\x9C\xE6 kph, wykona\xF1 na godzin\xEA. - -network_spectator_time_help Je\xBFeli ustawione na wi\xEAcej ni\xBF zero, to b\xEAdzie maksymalny czas w sekundach, w ci\xB9gu kt\xF3rego tolerowany jest klient bez graczy. - -#******************************************** -#******************************************** -# -# Voting settings -# -#******************************************** -#******************************************** - -vote_use_server_controlled_kick_help Ustaw na jeden, je\xBFeli chcesz u\xBFy\xE6 ulepszonego sterowania ankietami przez serwer. -voting_timeout_help Czas trwania ankiety. -voting_timeout_per_voter_help Dodatek do VOTING_TIMEOUT dla ka\xBFdego ankietowanego. -allow_voting_help Je\x9Cli 1, gracze b\xEAd\xB9 mogli g\xB3osowa\xE6. -allow_voting_spectator_help Je\x9Cli 1, obserwatorzy b\xEAd\xB9 mogli g\xB3osowa\xE6. -min_voters_help Ilo\x9C\xE6 graczy mog\xB9cych g\xB3osowa\xE6, jaka musi by\xE6 pod\xB3\xB9czona, aby mo\xBFna by\xB3o utworzy\xE6 ankiet\xEA. -max_votes_help Maksymalna ilo\x9C\xE6 ankiet, jakie mog\xB9 by\xE6 aktywne w danej chwili. -max_votes_per_voter_help Maksymalna ilo\x9C\xE6 ankiet wys\xB3anych przez jednego gracza, jakie mog\xB9 by\xE6 aktywne w danej chwili. -voting_start_decay_help Ilo\x9C\xE6 sekund, po kt\xF3rych ci, co nie g\xB3osowani s\xB9 ignorowani. -voting_decay_help Jeden z nie g\xB3osuj\xB9cych zostaje ignorowany po up\xB3ywie tylu sekund, ile tu ustawiono. -voting_bias_help Dodaj wirtualnych g\xB3osuj\xB9cych, kt\xF3rzy przeciwstawi\xB9 si\xEA ka\xBFdej zmianie. -voting_privacy_help Kontrola prywatno\x9Cci ankiet. 2: nic nie jest pokazywane 1: nades\xB3anie ankiety jest widoczne dla administratora 0: g\xB3osowanie jest widoczne dla administratora -1: nades\xB3anie ankiety jest publiczne -2: wszystko jest publiczne -voting_spam_issue_help Poziom spamu dla nadsy\xB3ania ankiet. -voting_spam_reject_help Poziom spamu dla odrzucania ankiet. -voting_kick_time_help Minimalny odst\xEAp czasu pomi\xEAdzy ankietami dotycz\xB9cymi wykopania tego samego gracza. -voting_maturity_help Czas w sekundach, po jakim \x9Cwie\xBFo pod\xB3\xB9czony do serwera gracz mo\xBFe zacz\xB9\xE6 wysy\xB3a\xE6 ankiety. -votes_cancel_help Anuluj wszystkie aktywne ankiety. - -voting_suspend_help Blokuje g\xB3osowanie na n sekund. -voting_suspend_default_help Domy\x9Clna warto\x9C\xE6 VOTING_SUSPEND. -voting_unsuspend_help Przeciwie\xF1stwo VOTING_SUSPEND. -voting_suspended G\xB3osowanie zosta\xB3o zawieszone na nast\xEApne \1 min..\n -voting_unsuspended G\xB3osowanie jest ponownie dozwolone.\n -vote_rejected_voting_suspended G\xB3osowanie zosta\xB3o zawies... [truncated message content] |
From: <baz...@us...> - 2009-01-07 12:21:33
|
Revision: 8766 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8766&view=rev Author: bazaarmagetron Date: 2009-01-07 12:21:29 +0000 (Wed, 07 Jan 2009) Log Message: ----------- da...@da...: Build work Modified Paths: -------------- armagetronad/trunk/armagetronad/configure.ac armagetronad/trunk/armagetronad/minor_version Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-06 14:21:04.506999969 -0600 committer: da...@da... properties: branch-nick: armagetronad + timestamp: 2009-01-06 17:43:35.940000057 -0600 committer: da...@da... properties: branch-nick: armagetronad Modified: bzr:file-ids - src/tools/tVersion.h tversion.h-20090104214947-id6ltdjkfel7qw2l-1 src/tools/tVersion.cpp tversion.cpp-20090105174945-ptyb83050sd75p8d-1 + Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri Modified: armagetronad/trunk/armagetronad/configure.ac =================================================================== --- armagetronad/trunk/armagetronad/configure.ac 2009-01-07 12:20:20 UTC (rev 8765) +++ armagetronad/trunk/armagetronad/configure.ac 2009-01-07 12:21:29 UTC (rev 8766) @@ -25,7 +25,7 @@ dnl AC_CANONICAL_HOST AC_PROG_RANLIB -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE(tar-ustar) dnl detect which link commant to use AC_PROG_LN_S Modified: armagetronad/trunk/armagetronad/minor_version =================================================================== --- armagetronad/trunk/armagetronad/minor_version 2009-01-07 12:20:20 UTC (rev 8765) +++ armagetronad/trunk/armagetronad/minor_version 2009-01-07 12:21:29 UTC (rev 8766) @@ -1 +1 @@ -.1_alpha1 +.1_alpha2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:22:44
|
Revision: 8767 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8767&view=rev Author: bazaarmagetron Date: 2009-01-07 12:22:34 +0000 (Wed, 07 Jan 2009) Log Message: ----------- da...@da...: Merged from trunk Modified Paths: -------------- armagetronad/trunk/armagetronad/configure.ac armagetronad/trunk/armagetronad/src/Makefile.am Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-06 17:43:35.940000057 -0600 committer: da...@da... properties: branch-nick: armagetronad + timestamp: 2009-01-06 17:48:11.278000116 -0600 committer: da...@da... properties: branch-nick: armagetronad Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql Modified: armagetronad/trunk/armagetronad/configure.ac =================================================================== --- armagetronad/trunk/armagetronad/configure.ac 2009-01-07 12:21:29 UTC (rev 8766) +++ armagetronad/trunk/armagetronad/configure.ac 2009-01-07 12:22:34 UTC (rev 8767) @@ -25,8 +25,10 @@ dnl AC_CANONICAL_HOST AC_PROG_RANLIB -AM_INIT_AUTOMAKE(tar-ustar) +dnl use slighly less ancient tar format allowing slighlty longer filenames. +AM_INIT_AUTOMAKE([tar-ustar filename-length-max=255]) + dnl detect which link commant to use AC_PROG_LN_S Modified: armagetronad/trunk/armagetronad/src/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-07 12:21:29 UTC (rev 8766) +++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-07 12:22:34 UTC (rev 8767) @@ -30,7 +30,9 @@ # keep track of true version tTrueVersion.h: $(wildcard $(top_srcdir)/*_version) $(wildcard $(top_srcdir)/.svn) $(wildcard $(top_srcdir)/CVS) $(wildcard $(top_srcdir)/.bzr) $(wildcard $(top_srcdir)/batch/make/version) Makefile # if the version generation files exist, use it to define the version. Else, Fallback to the autopackage version. - if test -r $(top_srcdir)/batch/make/version; then \ + if test -f $(top_srcdir)/src/tFakeVersion.h; then \ + cp $(top_srcdir)/src/tFakeVersion.h $(top_srcdir)/src/tTrueVersion.h; \ + elif test -r $(top_srcdir)/batch/make/version; then \ sh $(top_srcdir)/batch/make/version --verbose $(top_srcdir) | awk '{ print "#define TRUE_ARMAGETRONAD_" $$1 " " substr( $$0, index( $$0, $$2 ) ) }' >$@; \ else \ echo "#define TRUE_ARMAGETRONAD_VERSION VERSION" > $@; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:23:25
|
Revision: 8768 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8768&view=rev Author: bazaarmagetron Date: 2009-01-07 12:23:23 +0000 (Wed, 07 Jan 2009) Log Message: ----------- da...@da...: Maps had a similar problem to cockpits where the dtd was improperly referencing resource.dtd. Hopefully fixed, but I can't test it just yet Modified Paths: -------------- armagetronad/trunk/armagetronad/resource/proto/map.dtd Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-06 17:48:11.278000116 -0600 committer: da...@da... properties: branch-nick: armagetronad + timestamp: 2009-01-06 20:11:07.232000113 -0600 committer: da...@da... properties: branch-nick: trunk-armagetronad-work Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp Modified: armagetronad/trunk/armagetronad/resource/proto/map.dtd =================================================================== --- armagetronad/trunk/armagetronad/resource/proto/map.dtd 2009-01-07 12:22:34 UTC (rev 8767) +++ armagetronad/trunk/armagetronad/resource/proto/map.dtd 2009-01-07 12:23:23 UTC (rev 8768) @@ -6,7 +6,7 @@ <!ENTITY % resource.module "INCLUDE"> <![%resource.module;[ <!ENTITY % resource.mod - SYSTEM "AATeam/resource-0.3.1-a.dtd"> + SYSTEM "resource-0.3.1-a.dtd"> %resource.mod;]]> <!ELEMENT Map (Settings?, World)> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:24:49
|
Revision: 8769 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8769&view=rev Author: bazaarmagetron Date: 2009-01-07 12:24:44 +0000 (Wed, 07 Jan 2009) Log Message: ----------- da...@da...: Made sortresources also rewrite any references to resource.dtd to the current version Modified Paths: -------------- armagetronad/trunk/armagetronad/batch/make/sortresources armagetronad/trunk/armagetronad/batch/make/sortresources.py armagetronad/trunk/armagetronad/batch/make/version armagetronad/trunk/armagetronad/resource/proto/cockpit.dtd armagetronad/trunk/armagetronad/resource/proto/map.dtd Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-06 20:11:07.232000113 -0600 committer: da...@da... properties: branch-nick: trunk-armagetronad-work + timestamp: 2009-01-06 23:14:47.095999956 -0600 committer: da...@da... properties: branch-nick: trunk-armagetronad-work Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a Modified: armagetronad/trunk/armagetronad/batch/make/sortresources =================================================================== --- armagetronad/trunk/armagetronad/batch/make/sortresources 2009-01-07 12:23:23 UTC (rev 8768) +++ armagetronad/trunk/armagetronad/batch/make/sortresources 2009-01-07 12:24:44 UTC (rev 8769) @@ -29,18 +29,23 @@ # rename them properly python ${sortresources} -v ${destination} || exit 1 -# silently remove empty directories -find ${destination} -type d -depth -exec rmdir \{\} \; > /dev/null 2>&1 - # copy dtds test -r ${destination}/AATeam || mkdir ${destination}/AATeam +# get resource.dtd's new version +RESOURCEVERSION=`grep "<!-- version=" < ${source}/resource.dtd | sed -e "s,.*=\",," -e "s,\".*,,"` + for type in `ls ${source} | grep '.dtd$' | grep -v -- - | sed -e 's,.dtd,,'`; do # copy dtd file to one with correct version VERSION=`grep "<!-- version=" < ${destination}/${type}.dtd | sed -e "s,.*=\",," -e "s,\".*,,"` - cp ${destination}/${type}.dtd ${destination}/AATeam/${type}-$VERSION.dtd + # If the file includes resource.dtd, make it include the properly + # versioned resource-version.dtd + sed "s,resource.dtd,resource-$RESOURCEVERSION.dtd,g" < ${destination}/${type}.dtd > ${destination}/AATeam/${type}-$VERSION.dtd echo $VERSION > ${destination}/.${type}version done +# silently remove empty directories +find ${destination} -type d -depth -exec rmdir \{\} \; > /dev/null 2>&1 + # tag completion touch ${destination} || exit 1 chmod 755 ${destination} || exit 1 Modified: armagetronad/trunk/armagetronad/batch/make/sortresources.py =================================================================== --- armagetronad/trunk/armagetronad/batch/make/sortresources.py 2009-01-07 12:23:23 UTC (rev 8768) +++ armagetronad/trunk/armagetronad/batch/make/sortresources.py 2009-01-07 12:24:44 UTC (rev 8769) @@ -78,6 +78,7 @@ # fallback: return empty stream, result: no dtd checking is done. # Not horribly bad in this context print "warning, could not find requested entity", sysid + return StringIO.StringIO("") # parse: create parser... Modified: armagetronad/trunk/armagetronad/batch/make/version =================================================================== --- armagetronad/trunk/armagetronad/batch/make/version 2009-01-07 12:23:23 UTC (rev 8768) +++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-07 12:24:44 UTC (rev 8769) @@ -4,48 +4,12 @@ #set -x -show_usage() -{ - echo "USAGE: $1 [-v|--verbose] srcdir" -} - -if test $# -ne 1 && test $# -ne 2 -then - echo "ERROR: Invalid argument count" >&2 - show_usage $0 - exit 1 -fi - -verbose= srcdir="$1" -if ( test x"$1" = x"--verbose" || test x"$1" = x"-v" ) && test $# -eq 2 -then - verbose=# - srcdir=$2 -elif ( test x"$1" = x"--verbose" || test x"$1" = x"-v" ) -then - echo "ERROR: Invalid argument count" >&2 - show_usage $0 - exit 1 -fi - # set version parts to defaults for CVS snapshot major_version=`cat ${srcdir}/major_version` DATE=`date +%Y%m%d` -builddate=`date -R` -minor_version= -revid=0 -revno=0 -branchnick= -revcount=0 -tag= -srcchanged= -lca=0 -lcaz=0 -branchurl= - #echo $major_version #echo $minor_version @@ -122,72 +86,30 @@ # Check if bzr is installed, and if the path is versionned bzr >/dev/null 2>&1 # But for now, ignore it -if test $? -eq 0 && test -d ${srcdir}/.bzr -#if test 1 -eq 0 +#if test $? -eq 0 +if test 1 -eq 0 then - # Crappily, we can't rely on revision numbers to do anything - # ( ie. when one merges then pushes, the last revno might be lower than originally) - # So we count revisions, including merged ones, also including fools which have empty - # lines with only "revno: 15" in their commit messages - revno=$( bzr revno ${srcdir} 2>/dev/null) - revcount=$( bzr log ${srcdir} 2>/dev/null | sed -ne 's/^ *revno: [0-9\.]\+$/\0/p' | wc -l ) - lca=$revno - lcaz=$revcount - versioned=# - branchurl=$( bzr info ${srcdir} 2>/dev/null | sed -ne 's/^ parent branch: \(.*\)$/\1/p' ) - - - # We will check this branch diverged, and/or if tree changed - bzrmissingcout=$( cd ${srcdir} && bzr missing --this 2>/dev/null ) - missing=$? bzr diff ${srcdir} --quiet >/dev/null 2>&1 - changed=$? - - - if test ${missing} -eq 1 - # if it diverged: + # Test for the return code of bzr diff (see bzr diff --help) + if test $? -eq 0 then - # Count the revisions we added locally - localrevisions=$( echo "${bzrmissingcout}" | sed -ne '2,1s/^You have \([0-9]\+\) extra revision(s):$/\1/p' ) - # See how many steps it is, with the fool's number - stepsbackwards=$( bzr log ${srcdir} -l ${localrevisions} | sed -ne 's/^ *revno: [0-9\.]\+$/\0/p' | wc -l ) - # And start dancing. - minor_version=_alpha_z$(( ${revcount} - ${stepsbackwards} ))_${DATE} - # Set last common ancestors - lca=$(( ${revno} - ${localrevisions})) - lcaz=$(( ${revcount} - ${stepsbackwards} )) - srcchanged=# - elif test ${missing} -eq 0 && ( test ${changed} -eq 1 || test ${changed} -eq 2 ) - then - # If a change was made and no more revision was added, just use revision fool's number plus build date - minor_version=_alpha_z${revcount}_${DATE} - # And this is versionned too - srcchanged=# - elif test ${missing} -eq 0 - then - # If really no change was made, use the fool's number, with tag if any - # So check if we have tags + # If no change was made, use revision number + # but first check if it's tagged revno=$(bzr revno ${srcdir}) - tag=$(bzr tags -d ${srcdir} | sed -ne 's/^\(.*\) +${revno}$/\1/p' ) - if test ${tag} + tag=$(bzr tags | grep -P "^(.*?) +${revno}$" | awk '{ print $1 }') + if test $tag then # If it is tagged, use the tag - minor_version=_alpha_z${revcount}_${tag} + DATE=_$tag else - # If not, use fool's number only - minor_version=_alpha_z${revcount} + # If not, use revision number + DATE=_r$(bzr revno ${srcdir}) fi - # That's versioned as well - else - # Otherwise, this is just not versionned - versioned= - fi - - if test $versioned + elif test $? -lt 3 then - major_version=$( cd ${srcdir}; bzr nick ) - branchnick=$major_version - revid=$( bzr testament | sed -ne 's/^revision-id: \(.*\)/\1/p' ) + # If a change was made, use revision number plus build date + DATE=_r$(bzr revno ${srcdir})_$DATE + # It returns 3 if it's not versionned, so forget it fi fi @@ -196,27 +118,4 @@ test -z "$DATE" || minor_version=`cat ${srcdir}/minor_version | sed -e "s,DATE,$DATE," -e "s,YYYYMMDD,$DATE,"` fi -if test $verbose -then - echo VERSION \"$major_version$minor_version\" - echo REVID \"$revid\" - echo REVNO $revno - echo BRANCHNICK \"$branchnick\" - echo ZNR $revcount - echo REVTAG \"$tag\" - - if test $srcchanged - then - echo CHANGED true - else - echo CHANGED false - fi - - echo BUILDDATE \"$builddate\" - echo BRANCHLCA $lca - echo BRANCHLCAZ $lcaz - echo BRANCHURL \"$branchurl\" -else - echo $major_version$minor_version -fi - +echo $major_version$minor_version Modified: armagetronad/trunk/armagetronad/resource/proto/cockpit.dtd =================================================================== --- armagetronad/trunk/armagetronad/resource/proto/cockpit.dtd 2009-01-07 12:23:23 UTC (rev 8768) +++ armagetronad/trunk/armagetronad/resource/proto/cockpit.dtd 2009-01-07 12:24:44 UTC (rev 8769) @@ -1,4 +1,4 @@ -<!-- version="" --> +<!-- version="0.3.1-c" --> <!ENTITY % ResourceContents "Cockpit" > <!ENTITY % ResourceType "aacockpit" > Modified: armagetronad/trunk/armagetronad/resource/proto/map.dtd =================================================================== --- armagetronad/trunk/armagetronad/resource/proto/map.dtd 2009-01-07 12:23:23 UTC (rev 8768) +++ armagetronad/trunk/armagetronad/resource/proto/map.dtd 2009-01-07 12:24:44 UTC (rev 8769) @@ -6,7 +6,7 @@ <!ENTITY % resource.module "INCLUDE"> <![%resource.module;[ <!ENTITY % resource.mod - SYSTEM "resource-0.3.1-a.dtd"> + SYSTEM "resource.dtd"> %resource.mod;]]> <!ELEMENT Map (Settings?, World)> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:25:53
|
Revision: 8770 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8770&view=rev Author: bazaarmagetron Date: 2009-01-07 12:25:46 +0000 (Wed, 07 Jan 2009) Log Message: ----------- da...@da...: Merged from trunk Modified Paths: -------------- armagetronad/trunk/armagetronad/Makefile.am armagetronad/trunk/armagetronad/src/Makefile.am Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-06 23:14:47.095999956 -0600 committer: da...@da... properties: branch-nick: trunk-armagetronad-work + timestamp: 2009-01-07 01:12:55.476000071 -0600 committer: da...@da... properties: branch-nick: trunk-armagetronad-work Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 Modified: armagetronad/trunk/armagetronad/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/Makefile.am 2009-01-07 12:24:44 UTC (rev 8769) +++ armagetronad/trunk/armagetronad/Makefile.am 2009-01-07 12:25:46 UTC (rev 8770) @@ -74,7 +74,9 @@ # regenerate dependant files so they no longer reference to the file "version" which will be removed cp @srcdir@/bootstrap.sh $(distdir) - cd $(distdir); rm -f aa_config.h.in version; sh ./bootstrap.sh; rm version + cd $(distdir); rm -f aa_config.h.in version; sh ./bootstrap.sh +# fix internal version info + mv $(distdir)/src/tTrueVersion.h $(distdir)/src/tFakeVersion.h rm -rf $(distdir)/autom4te.cache dist-hook: Modified: armagetronad/trunk/armagetronad/src/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-07 12:24:44 UTC (rev 8769) +++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-07 12:25:46 UTC (rev 8770) @@ -31,7 +31,7 @@ tTrueVersion.h: $(wildcard $(top_srcdir)/*_version) $(wildcard $(top_srcdir)/.svn) $(wildcard $(top_srcdir)/CVS) $(wildcard $(top_srcdir)/.bzr) $(wildcard $(top_srcdir)/batch/make/version) Makefile # if the version generation files exist, use it to define the version. Else, Fallback to the autopackage version. if test -f $(top_srcdir)/src/tFakeVersion.h; then \ - cp $(top_srcdir)/src/tFakeVersion.h $(top_srcdir)/src/tTrueVersion.h; \ + cp $(top_srcdir)/src/tFakeVersion.h $@; \ elif test -r $(top_srcdir)/batch/make/version; then \ sh $(top_srcdir)/batch/make/version --verbose $(top_srcdir) | awk '{ print "#define TRUE_ARMAGETRONAD_" $$1 " " substr( $$0, index( $$0, $$2 ) ) }' >$@; \ else \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:26:49
|
Revision: 8771 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8771&view=rev Author: bazaarmagetron Date: 2009-01-07 12:26:46 +0000 (Wed, 07 Jan 2009) Log Message: ----------- Manuel Moos: Merging own work. Modified Paths: -------------- armagetronad/trunk/armagetronad/Makefile.am armagetronad/trunk/armagetronad/Makefile.manual armagetronad/trunk/armagetronad/src/Makefile.am Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-07 01:12:55.476000071 -0600 committer: da...@da... properties: branch-nick: trunk-armagetronad-work + timestamp: 2009-01-07 11:59:02.163000107 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: merge Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 Modified: armagetronad/trunk/armagetronad/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/Makefile.am 2009-01-07 12:25:46 UTC (rev 8770) +++ armagetronad/trunk/armagetronad/Makefile.am 2009-01-07 12:26:46 UTC (rev 8771) @@ -69,14 +69,9 @@ # replace dynamic version in configure.ac with the version this build is configured with sed -e "s/m4_include(version)//" -e "s/AUTOMATIC_VERSION/$(VERSION)/" < @srcdir@/configure.ac > $(distdir)/configure.ac -# same for src/macosx/config_common.h.in - sed -e "s/@ver""sion@/\"$(VERSION)\"/" < @srcdir@/src/macosx/version.h.in > $(distdir)/src/macosx/version.h.in - # regenerate dependant files so they no longer reference to the file "version" which will be removed cp @srcdir@/bootstrap.sh $(distdir) cd $(distdir); rm -f aa_config.h.in version; sh ./bootstrap.sh -# fix internal version info - mv $(distdir)/src/tTrueVersion.h $(distdir)/src/tFakeVersion.h rm -rf $(distdir)/autom4te.cache dist-hook: @@ -98,6 +93,9 @@ # generate ChangeLog and configure.ac test -r $(srcdir)/version && $(MAKE) dist-hook-scm || echo "Version not from SCM, skipping version fixing." +# fix internal version info + mv $(distdir)/src/tTrueVersion.h $(distdir)/src/tFakeVersion.h + if USE_UNINSTALL # installed location of the uninstall script Modified: armagetronad/trunk/armagetronad/Makefile.manual =================================================================== --- armagetronad/trunk/armagetronad/Makefile.manual 2009-01-07 12:25:46 UTC (rev 8770) +++ armagetronad/trunk/armagetronad/Makefile.manual 2009-01-07 12:26:46 UTC (rev 8771) @@ -165,7 +165,7 @@ # triggers regeneration of ChangeLog and version distprep: # rebuild fingerprint and update source change tag that way - if test -d ${srcdir}/.svn; then rm -f fingerprint; $(MAKE) fingerprint; fi + if test -d ${srcdir}/.svn || test -d ${srcdir}/.bzr; then rm -f fingerprint; $(MAKE) fingerprint; fi ############# # Debugging # Modified: armagetronad/trunk/armagetronad/src/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-07 12:25:46 UTC (rev 8770) +++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-07 12:26:46 UTC (rev 8771) @@ -32,12 +32,72 @@ # if the version generation files exist, use it to define the version. Else, Fallback to the autopackage version. if test -f $(top_srcdir)/src/tFakeVersion.h; then \ cp $(top_srcdir)/src/tFakeVersion.h $@; \ - elif test -r $(top_srcdir)/batch/make/version; then \ + else \ sh $(top_srcdir)/batch/make/version --verbose $(top_srcdir) | awk '{ print "#define TRUE_ARMAGETRONAD_" $$1 " " substr( $$0, index( $$0, $$2 ) ) }' >$@; \ - else \ - echo "#define TRUE_ARMAGETRONAD_VERSION VERSION" > $@; \ fi +# clean up true version +distclean-local: + rm -f tTrueVersion.h + +# fix internal version info + mv $(distdir)/src/tTrueVersion.h $(distdir)/src/tFakeVersion.h + +if USE_UNINSTALL + +# installed location of the uninstall script +uninstall_location=$(DESTDIR)${bindir}/${uninstaller} + +# generate and install uninstallation script +install-uninstall: ${top_srcdir}/batch/make/uninstall Makefile + $(install_sh_PROGRAM) $< $(uninstall_location) + rm $(uninstall_location) + ROOTDIR=$(ROOTDIR) DESTDIR=$(DESTDIR) MAKE="$(MAKE)" PREFIX="${prefix}" PROGTITLE="${progtitle}" PROGNAME="${progname}" SCRIPTDIR="${scriptdir}" sh $< $(uninstall_location) "$(external_uninstall_cmd)" +else +install-uninstall: +endif + +# additional things on installation +install-exec-hook: install-uninstall +# rename executable to armagetronad-VERSION and link to armagetronad +if BUILDMAIN + cd $(DESTDIR)${bindir}; mv armagetronad_main$(EXEEXT) @progname@$(executable_suffix) +endif + +# delegate to special tasks + $(masterInstallTasks) + +install-data-hook: +# install systemwide files +if USE_SYSINSTALL + DESTDIR=$(DESTDIR) ROOTDIR=$(ROOTDIR) bash $(DESTDIR)${scriptdir}/sysinstall install $(prefix) +endif + +uninstall-hook: +# delete executable and uninstaller + rm -f $(DESTDIR)${bindir}/@progname@$(executable_suffix) + +# delegate to special tasks + $(masterUninstallTasks) + +if USE_UNINSTALL + rm -f $(uninstall_location) +endif +# rm -rf $(DESTDIR)$(aa_datadir) + +# this has to be done first on uninstall/install. Unfortuantely. +# automake uses strict bottom-up logic here, so it is +# a special target recursively made from within src. +uninstall-first: +# uninstall systemwide files +if USE_SYSINSTALL + if test -z "$(AA_FAKE_UNINSTALL)"; then DESTDIR=$(DESTDIR) ROOTDIR=$(ROOTDIR) bash $(DESTDIR)${scriptdir}/sysinstall uninstall $(prefix); fi +endif + +install-first: +# uninstall previous version (if it exists), ignoring errors + test -n "$(uninstall_location)" && test -x "$(uninstall_location)" && "$(uninstall_location)" || true + ${srcdir}/tools/tLocale.cpp: ${srcdir}/tools/tVersion.cpp ${srcdir}/tools/tVersion.cpp: tTrueVersion.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:28:01
|
Revision: 8772 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8772&view=rev Author: bazaarmagetron Date: 2009-01-07 12:27:53 +0000 (Wed, 07 Jan 2009) Log Message: ----------- Manuel Moos: Redone warning fixes; Lucifer squashed them in his merge. Modified Paths: -------------- armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-07 11:59:02.163000107 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: merge + timestamp: 2009-01-07 12:18:42.707000017 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri Modified: armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp 2009-01-07 12:26:46 UTC (rev 8771) +++ armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp 2009-01-07 12:27:53 UTC (rev 8772) @@ -208,7 +208,7 @@ { rViewportConfiguration* viewportConfiguration = rViewportConfiguration::CurrentViewportConfiguration(); rViewport *vpmod = new rViewport((m_position.x+1)/2,(m_position.y+1)/2,m_size.x,m_size.y*sr_screenWidth/sr_screenHeight); - eGrid *grid = eGrid::CurrentGrid(); + // eGrid *grid = eGrid::CurrentGrid(); for ( int viewport = viewportConfiguration->num_viewports-1; viewport >= 0; --viewport ) { // get the viewport @@ -249,7 +249,7 @@ void Camview::CreateCamera(int vp) { eGrid *grid = eGrid::CurrentGrid(); - const tList<eCamera>& cameras = grid->Cameras(); + // const tList<eCamera>& cameras = grid->Cameras(); int playerID = sr_viewportBelongsToPlayer[ vp ]; ePlayer* player = ePlayer::PlayerConfig( playerID ); cam[vp] = new eCamera(grid, @@ -268,9 +268,12 @@ dirAngle(0), dirCos(0), dirSin(0), posTranslation(tCoord(0,0)), z(0), rise(0), fov(0), - mirror(false), dirAngleFlag(false), + mirror(false), + mainCameraFlag(false), + mainCameraDirFlag(false), + dirAngleFlag(false), posTranslationFlag(false), - riseFlag(false), fovFlag(false), mainCameraDirFlag(false), mainCameraFlag(false), ReadyFlag(false) + riseFlag(false), fovFlag(false),ReadyFlag(false) { rViewportConfiguration* viewportConfiguration = rViewportConfiguration::CurrentViewportConfiguration(); for ( int viewport = viewportConfiguration->num_viewports-1; viewport >= 0; --viewport ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:28:49
|
Revision: 8773 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8773&view=rev Author: bazaarmagetron Date: 2009-01-07 12:28:47 +0000 (Wed, 07 Jan 2009) Log Message: ----------- Manuel Moos: Undid accidental copy/paste from root Makefile.am. Whoops. Modified Paths: -------------- armagetronad/trunk/armagetronad/src/Makefile.am Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-07 12:18:42.707000017 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-07 12:31:41.026999950 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 Modified: armagetronad/trunk/armagetronad/src/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-07 12:27:53 UTC (rev 8772) +++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-07 12:28:47 UTC (rev 8773) @@ -40,64 +40,6 @@ distclean-local: rm -f tTrueVersion.h -# fix internal version info - mv $(distdir)/src/tTrueVersion.h $(distdir)/src/tFakeVersion.h - -if USE_UNINSTALL - -# installed location of the uninstall script -uninstall_location=$(DESTDIR)${bindir}/${uninstaller} - -# generate and install uninstallation script -install-uninstall: ${top_srcdir}/batch/make/uninstall Makefile - $(install_sh_PROGRAM) $< $(uninstall_location) - rm $(uninstall_location) - ROOTDIR=$(ROOTDIR) DESTDIR=$(DESTDIR) MAKE="$(MAKE)" PREFIX="${prefix}" PROGTITLE="${progtitle}" PROGNAME="${progname}" SCRIPTDIR="${scriptdir}" sh $< $(uninstall_location) "$(external_uninstall_cmd)" -else -install-uninstall: -endif - -# additional things on installation -install-exec-hook: install-uninstall -# rename executable to armagetronad-VERSION and link to armagetronad -if BUILDMAIN - cd $(DESTDIR)${bindir}; mv armagetronad_main$(EXEEXT) @progname@$(executable_suffix) -endif - -# delegate to special tasks - $(masterInstallTasks) - -install-data-hook: -# install systemwide files -if USE_SYSINSTALL - DESTDIR=$(DESTDIR) ROOTDIR=$(ROOTDIR) bash $(DESTDIR)${scriptdir}/sysinstall install $(prefix) -endif - -uninstall-hook: -# delete executable and uninstaller - rm -f $(DESTDIR)${bindir}/@progname@$(executable_suffix) - -# delegate to special tasks - $(masterUninstallTasks) - -if USE_UNINSTALL - rm -f $(uninstall_location) -endif -# rm -rf $(DESTDIR)$(aa_datadir) - -# this has to be done first on uninstall/install. Unfortuantely. -# automake uses strict bottom-up logic here, so it is -# a special target recursively made from within src. -uninstall-first: -# uninstall systemwide files -if USE_SYSINSTALL - if test -z "$(AA_FAKE_UNINSTALL)"; then DESTDIR=$(DESTDIR) ROOTDIR=$(ROOTDIR) bash $(DESTDIR)${scriptdir}/sysinstall uninstall $(prefix); fi -endif - -install-first: -# uninstall previous version (if it exists), ignoring errors - test -n "$(uninstall_location)" && test -x "$(uninstall_location)" && "$(uninstall_location)" || true - ${srcdir}/tools/tLocale.cpp: ${srcdir}/tools/tVersion.cpp ${srcdir}/tools/tVersion.cpp: tTrueVersion.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:29:43
|
Revision: 8774 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8774&view=rev Author: bazaarmagetron Date: 2009-01-07 12:29:41 +0000 (Wed, 07 Jan 2009) Log Message: ----------- Manuel Moos: Added ylwrap to ignore list. Modified Paths: -------------- armagetronad/trunk/armagetronad/.bzrignore Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-07 12:31:41.026999950 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-07 12:35:17.226000071 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e Modified: armagetronad/trunk/armagetronad/.bzrignore =================================================================== --- armagetronad/trunk/armagetronad/.bzrignore 2009-01-07 12:28:47 UTC (rev 8773) +++ armagetronad/trunk/armagetronad/.bzrignore 2009-01-07 12:29:41 UTC (rev 8774) @@ -23,6 +23,7 @@ ./configure ./depcomp ./install-sh +./ylwrap ./missing ./touch ./version This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-07 12:30:40
|
Revision: 8775 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8775&view=rev Author: bazaarmagetron Date: 2009-01-07 12:30:38 +0000 (Wed, 07 Jan 2009) Log Message: ----------- Manuel Moos: Restored version script; it too got squashed by accident. Modified Paths: -------------- armagetronad/trunk/armagetronad/batch/make/version Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-07 12:35:17.226000071 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-07 12:41:51.782000065 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 Modified: armagetronad/trunk/armagetronad/batch/make/version =================================================================== --- armagetronad/trunk/armagetronad/batch/make/version 2009-01-07 12:29:41 UTC (rev 8774) +++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-07 12:30:38 UTC (rev 8775) @@ -4,12 +4,48 @@ #set -x +show_usage() +{ + echo "USAGE: $1 [-v|--verbose] srcdir" +} + +if test $# -ne 1 && test $# -ne 2 +then + echo "ERROR: Invalid argument count" >&2 + show_usage $0 + exit 1 +fi + +verbose= srcdir="$1" +if ( test x"$1" = x"--verbose" || test x"$1" = x"-v" ) && test $# -eq 2 +then + verbose=# + srcdir=$2 +elif ( test x"$1" = x"--verbose" || test x"$1" = x"-v" ) +then + echo "ERROR: Invalid argument count" >&2 + show_usage $0 + exit 1 +fi + # set version parts to defaults for CVS snapshot major_version=`cat ${srcdir}/major_version` DATE=`date +%Y%m%d` +builddate=`date -R` +minor_version= +revid=0 +revno=0 +branchnick= +revcount=0 +tag= +srcchanged= +lca=0 +lcaz=0 +branchurl= + #echo $major_version #echo $minor_version @@ -86,30 +122,72 @@ # Check if bzr is installed, and if the path is versionned bzr >/dev/null 2>&1 # But for now, ignore it -#if test $? -eq 0 -if test 1 -eq 0 +if test $? -eq 0 && test -d ${srcdir}/.bzr +#if test 1 -eq 0 then + # Crappily, we can't rely on revision numbers to do anything + # ( ie. when one merges then pushes, the last revno might be lower than originally) + # So we count revisions, including merged ones, also including fools which have empty + # lines with only "revno: 15" in their commit messages + revno=$( bzr revno ${srcdir} 2>/dev/null) + revcount=$( bzr log ${srcdir} 2>/dev/null | sed -ne 's/^ *revno: [0-9\.]\+$/\0/p' | wc -l ) + lca=$revno + lcaz=$revcount + versioned=# + branchurl=$( bzr info ${srcdir} 2>/dev/null | sed -ne 's/^ parent branch: \(.*\)$/\1/p' ) + + + # We will check this branch diverged, and/or if tree changed + bzrmissingcout=$( cd ${srcdir} && bzr missing --this 2>/dev/null ) + missing=$? bzr diff ${srcdir} --quiet >/dev/null 2>&1 - # Test for the return code of bzr diff (see bzr diff --help) - if test $? -eq 0 + changed=$? + + + if test ${missing} -eq 1 + # if it diverged: then - # If no change was made, use revision number - # but first check if it's tagged + # Count the revisions we added locally + localrevisions=$( echo "${bzrmissingcout}" | sed -ne '2,1s/^You have \([0-9]\+\) extra revision(s):$/\1/p' ) + # See how many steps it is, with the fool's number + stepsbackwards=$( bzr log ${srcdir} -l ${localrevisions} | sed -ne 's/^ *revno: [0-9\.]\+$/\0/p' | wc -l ) + # And start dancing. + minor_version=_alpha_z$(( ${revcount} - ${stepsbackwards} ))_${DATE} + # Set last common ancestors + lca=$(( ${revno} - ${localrevisions})) + lcaz=$(( ${revcount} - ${stepsbackwards} )) + srcchanged=# + elif test ${missing} -eq 0 && ( test ${changed} -eq 1 || test ${changed} -eq 2 ) + then + # If a change was made and no more revision was added, just use revision fool's number plus build date + minor_version=_alpha_z${revcount}_${DATE} + # And this is versionned too + srcchanged=# + elif test ${missing} -eq 0 + then + # If really no change was made, use the fool's number, with tag if any + # So check if we have tags revno=$(bzr revno ${srcdir}) - tag=$(bzr tags | grep -P "^(.*?) +${revno}$" | awk '{ print $1 }') - if test $tag + tag=$(bzr tags -d ${srcdir} | sed -ne 's/^\(.*\) +${revno}$/\1/p' ) + if test ${tag} then # If it is tagged, use the tag - DATE=_$tag + minor_version=_alpha_z${revcount}_${tag} else - # If not, use revision number - DATE=_r$(bzr revno ${srcdir}) + # If not, use fool's number only + minor_version=_alpha_z${revcount} fi - elif test $? -lt 3 + # That's versioned as well + else + # Otherwise, this is just not versionned + versioned= + fi + + if test $versioned then - # If a change was made, use revision number plus build date - DATE=_r$(bzr revno ${srcdir})_$DATE - # It returns 3 if it's not versionned, so forget it + major_version=$( cd ${srcdir}; bzr nick ) + branchnick=$major_version + revid=$( bzr testament | sed -ne 's/^revision-id: \(.*\)/\1/p' ) fi fi @@ -118,4 +196,27 @@ test -z "$DATE" || minor_version=`cat ${srcdir}/minor_version | sed -e "s,DATE,$DATE," -e "s,YYYYMMDD,$DATE,"` fi -echo $major_version$minor_version +if test $verbose +then + echo VERSION \"$major_version$minor_version\" + echo REVID \"$revid\" + echo REVNO $revno + echo BRANCHNICK \"$branchnick\" + echo ZNR $revcount + echo REVTAG \"$tag\" + + if test $srcchanged + then + echo CHANGED true + else + echo CHANGED false + fi + + echo BUILDDATE \"$builddate\" + echo BRANCHLCA $lca + echo BRANCHLCAZ $lcaz + echo BRANCHURL \"$branchurl\" +else + echo $major_version$minor_version +fi + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-11 23:40:16
|
Revision: 8793 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8793&view=rev Author: bazaarmagetron Date: 2009-01-11 23:40:02 +0000 (Sun, 11 Jan 2009) Log Message: ----------- Manuel Moos: Merging from 0.3.1: Daniel Lee Harple 2009-01-07 The -R flag for ?\226?\128?\156date?\226?\128?\157 is a GNU extension. Modified Paths: -------------- armagetronad/trunk/armagetronad/batch/make/version Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-07 12:41:51.782000065 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-12 00:25:23.026999950 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 Modified: armagetronad/trunk/armagetronad/batch/make/version =================================================================== --- armagetronad/trunk/armagetronad/batch/make/version 2009-01-11 23:10:00 UTC (rev 8792) +++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-11 23:40:02 UTC (rev 8793) @@ -33,7 +33,7 @@ # set version parts to defaults for CVS snapshot major_version=`cat ${srcdir}/major_version` DATE=`date +%Y%m%d` -builddate=`date -R` +builddate=`date +'%a, %d %b %Y %T %z'` minor_version= revid=0 revno=0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-11 23:42:24
|
Revision: 8795 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8795&view=rev Author: bazaarmagetron Date: 2009-01-11 23:42:20 +0000 (Sun, 11 Jan 2009) Log Message: ----------- author: Manuel Moos Merging from 0.3.1: Daniel Lee Harple 2009-01-08 Use --trace flag when executing rake. dave@davefancella... 2009-01-08 Added armabuild python module to co... dave@davefancella... 2009-01-08 Replaced sortresource shell script ... Daniel Lee Harple 2009-01-07 No tTrueVersion.h when using Xcode. Daniel Lee Harple 2009-01-07 Add missing files Modified Paths: -------------- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj armagetronad/trunk/armagetronad/batch/make/sortresources.py armagetronad/trunk/armagetronad/bootstrap.sh armagetronad/trunk/armagetronad/resource/Makefile.am armagetronad/trunk/armagetronad/resource/proto/cockpit-0.3.0.dtd armagetronad/trunk/armagetronad/src/tools/tVersion.cpp Added Paths: ----------- armagetronad/trunk/armagetronad/batch/armabuild/ armagetronad/trunk/armagetronad/batch/armabuild/__init__.py armagetronad/trunk/armagetronad/batch/armabuild/resource.py armagetronad/trunk/armagetronad/batch/make/copyresources.py armagetronad/trunk/armagetronad/batch/win32/ armagetronad/trunk/armagetronad/batch/win32/makedist.py Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-12 00:26:19.993999958 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-12 00:30:14.709000111 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow Modified: bzr:file-ids - + batch/make/copyresources.py copyresources.py-20090108062653-7vghf8ihg1nlinpn-1 batch/armabuild armabuild-20090108121259-vpk81px2ze01659r-1 batch/armabuild/resource.py resource.py-20090108121259-vpk81px2ze01659r-3 batch/armabuild/__init__.py __init__.py-20090108121259-vpk81px2ze01659r-2 batch/win32 win32-20090108062754-q6xz9gpvvbrp64cy-1 batch/win32/makedist.py makedist.py-20090108121327-pnpjgubq7os5b3lj-1 Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj =================================================================== --- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2009-01-11 23:40:46 UTC (rev 8794) +++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2009-01-11 23:42:20 UTC (rev 8795) @@ -73,6 +73,14 @@ /* Begin PBXBuildFile section */ 8CBA60B1089F00F2007E21DC /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CBA60B0089F00F2007E21DC /* OpenGL.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; + 9B1ECD060F159F3500288C28 /* cCamview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B1ECD040F159F3500288C28 /* cCamview.cpp */; }; + 9B1ECD070F159F3500288C28 /* cCamview.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B1ECD050F159F3500288C28 /* cCamview.h */; }; + 9B1ECD080F159F3500288C28 /* cCamview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B1ECD040F159F3500288C28 /* cCamview.cpp */; }; + 9B1ECD090F159F3500288C28 /* cCamview.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B1ECD050F159F3500288C28 /* cCamview.h */; }; + 9B1ECD260F159FF800288C28 /* tVersion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B1ECD240F159FF800288C28 /* tVersion.cpp */; }; + 9B1ECD270F159FF800288C28 /* tVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B1ECD250F159FF800288C28 /* tVersion.h */; }; + 9B1ECD280F159FF800288C28 /* tVersion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B1ECD240F159FF800288C28 /* tVersion.cpp */; }; + 9B1ECD290F159FF800288C28 /* tVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B1ECD250F159FF800288C28 /* tVersion.h */; }; 9B7CFE190EFCE74700126634 /* tResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B7CFE130EFCE74700126634 /* tResource.cpp */; }; 9B7CFE1A0EFCE74700126634 /* tResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B7CFE140EFCE74700126634 /* tResource.h */; }; 9B7CFE1B0EFCE74700126634 /* tResourceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B7CFE150EFCE74700126634 /* tResourceManager.cpp */; }; @@ -525,6 +533,10 @@ 8C11CA42095A268E007AE0EA /* armagetronad-dedicated */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "armagetronad-dedicated"; sourceTree = BUILT_PRODUCTS_DIR; }; 8CBA60B0089F00F2007E21DC /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; 8D1107320486CEB800E47090 /* Armagetron Advanced.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Armagetron Advanced.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9B1ECD040F159F3500288C28 /* cCamview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cCamview.cpp; sourceTree = "<group>"; }; + 9B1ECD050F159F3500288C28 /* cCamview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cCamview.h; sourceTree = "<group>"; }; + 9B1ECD240F159FF800288C28 /* tVersion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tVersion.cpp; sourceTree = "<group>"; }; + 9B1ECD250F159FF800288C28 /* tVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tVersion.h; sourceTree = "<group>"; }; 9B715F4C0F0BD95100034EBF /* release.rake */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; indentWidth = 2; path = release.rake; sourceTree = "<group>"; tabWidth = 2; }; 9B715F4D0F0BD95100034EBF /* config.rake */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; indentWidth = 2; path = config.rake; sourceTree = "<group>"; tabWidth = 2; }; 9B715F4E0F0BD95100034EBF /* aabeta.rake */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; indentWidth = 2; path = aabeta.rake; sourceTree = "<group>"; tabWidth = 2; }; @@ -1294,6 +1306,8 @@ 9BB7B7EE0D830422004FE8C3 /* tToDo.h */, 9BB7B7EF0D830422004FE8C3 /* tValue.h */, 9BB7B7F00D830422004FE8C3 /* tValueParser.h */, + 9B1ECD240F159FF800288C28 /* tVersion.cpp */, + 9B1ECD250F159FF800288C28 /* tVersion.h */, 9BB7B7F10D830422004FE8C3 /* tXmlParser.cpp */, 9BB7B7F20D830422004FE8C3 /* tXmlParser.h */, 9BB7B7FA0D830423004FE8C3 /* values */, @@ -1400,6 +1414,8 @@ 9BB7B8E50D830448004FE8C3 /* cockpit */ = { isa = PBXGroup; children = ( + 9B1ECD040F159F3500288C28 /* cCamview.cpp */, + 9B1ECD050F159F3500288C28 /* cCamview.h */, 9BB7B8E60D830448004FE8C3 /* cCockpit.cpp */, 9BB7B8E70D830448004FE8C3 /* cCockpit.h */, 9BB7B8E80D830448004FE8C3 /* cGauges.cpp */, @@ -1497,6 +1513,8 @@ 9B7CFE1A0EFCE74700126634 /* tResource.h in Headers */, 9B7CFE1C0EFCE74700126634 /* tResourceManager.h in Headers */, 9B7CFE1E0EFCE74700126634 /* tResourceType.h in Headers */, + 9B1ECD070F159F3500288C28 /* cCamview.h in Headers */, + 9B1ECD270F159FF800288C28 /* tVersion.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1509,6 +1527,8 @@ 9B7CFE200EFCE74700126634 /* tResource.h in Headers */, 9B7CFE220EFCE74700126634 /* tResourceManager.h in Headers */, 9B7CFE240EFCE74700126634 /* tResourceType.h in Headers */, + 9B1ECD090F159F3500288C28 /* cCamview.h in Headers */, + 9B1ECD290F159FF800288C28 /* tVersion.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1615,7 +1635,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/bin/bash -l"; - shellScript = "rake xcode:prepare"; + shellScript = "rake --trace xcode:prepare"; }; 8CAD91B7095A459400DA0ECC /* Run script: Cleanup */ = { isa = PBXShellScriptBuildPhase; @@ -1629,7 +1649,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rake xcode:cleanup\n\nfor f in *.in *.svn *.cvs *.cvsignore *.am astylerc\ndo\n\tfind \"${CONFIGURATION_BUILD_DIR}\" -name $f -depth -exec rm -rf \\{\\} \\;\ndone"; + shellScript = "rake --trace xcode:cleanup\n\nfor f in *.in *.svn *.cvs *.cvsignore *.am astylerc\ndo\n\tfind \"${CONFIGURATION_BUILD_DIR}\" -name $f -depth -exec rm -rf \\{\\} \\;\ndone"; }; 8CBA6203089F11BE007E21DC /* Run script: Cleanup */ = { isa = PBXShellScriptBuildPhase; @@ -1643,7 +1663,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/bin/bash -l"; - shellScript = "rake xcode:cleanup\n\nfor f in *.in *.svn *.cvs *.cvsignore *.am astylerc\ndo\n\tfind \"${CONFIGURATION_BUILD_DIR}\" -name $f -depth -exec rm -rf \\{\\} \\;\ndone"; + shellScript = "rake --trace xcode:cleanup\n\nfor f in *.in *.svn *.cvs *.cvsignore *.am astylerc\ndo\n\tfind \"${CONFIGURATION_BUILD_DIR}\" -name $f -depth -exec rm -rf \\{\\} \\;\ndone"; }; 9B3139B40EFD0586009690D0 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -1656,7 +1676,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/bin/bash -l"; - shellScript = "PRODUCT_NAME=\"Armagetron Advanced\" rake release:dmg\n"; + shellScript = "PRODUCT_NAME=\"Armagetron Advanced\" rake --trace release:dmg\n"; }; 9B3139C00EFD073A009690D0 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -1669,7 +1689,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/bin/bash -l"; - shellScript = "PRODUCT_NAME=\"Armagetron Advanced Dedicated\"\nCONFIGURATION_BUILD_DIR=\"${CONFIGURATION_BUILD_DIR}/Armagetron Advanced Dedicated\"\n\nrake release:dmg\n"; + shellScript = "PRODUCT_NAME=\"Armagetron Advanced Dedicated\"\nCONFIGURATION_BUILD_DIR=\"${CONFIGURATION_BUILD_DIR}/Armagetron Advanced Dedicated\"\n\nrake --trace release:dmg\n"; }; 9B3139EB0EFD0963009690D0 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -1682,7 +1702,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/bin/bash -l"; - shellScript = "rake update-version"; + shellScript = "rake --trace update-version"; }; 9B6377410F0AACC2009F661F /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -1695,7 +1715,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/bin/bash -l"; - shellScript = "PRODUCT_NAME=\"Armagetron Advanced\" rake aabeta:release"; + shellScript = "PRODUCT_NAME=\"Armagetron Advanced\" rake --trace aabeta:release"; }; 9BD7DB490A2CBA7A00D7033C /* Run script: Prepare */ = { isa = PBXShellScriptBuildPhase; @@ -1709,7 +1729,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/bin/bash -l"; - shellScript = "rake xcode:prepare"; + shellScript = "rake --trace xcode:prepare"; }; /* End PBXShellScriptBuildPhase section */ @@ -1861,6 +1881,8 @@ 9B7CFE1F0EFCE74700126634 /* tResource.cpp in Sources */, 9B7CFE210EFCE74700126634 /* tResourceManager.cpp in Sources */, 9B7CFE230EFCE74700126634 /* tResourceType.cpp in Sources */, + 9B1ECD080F159F3500288C28 /* cCamview.cpp in Sources */, + 9B1ECD280F159FF800288C28 /* tVersion.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2017,6 +2039,8 @@ 9B7CFE190EFCE74700126634 /* tResource.cpp in Sources */, 9B7CFE1B0EFCE74700126634 /* tResourceManager.cpp in Sources */, 9B7CFE1D0EFCE74700126634 /* tResourceType.cpp in Sources */, + 9B1ECD060F159F3500288C28 /* cCamview.cpp in Sources */, + 9B1ECD260F159FF800288C28 /* tVersion.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Added: armagetronad/trunk/armagetronad/batch/armabuild/__init__.py =================================================================== --- armagetronad/trunk/armagetronad/batch/armabuild/__init__.py (rev 0) +++ armagetronad/trunk/armagetronad/batch/armabuild/__init__.py 2009-01-11 23:42:20 UTC (rev 8795) @@ -0,0 +1,5 @@ + + + + + Added: armagetronad/trunk/armagetronad/batch/armabuild/resource.py =================================================================== --- armagetronad/trunk/armagetronad/batch/armabuild/resource.py (rev 0) +++ armagetronad/trunk/armagetronad/batch/armabuild/resource.py 2009-01-11 23:42:20 UTC (rev 8795) @@ -0,0 +1,286 @@ +#!/usr/bin/env python + +# This module contains functions used to build resources + +# sorts resources by their included name and version information +# usage: call from the directory containing the resources or +# call +# sortresources.py <path_to_seach_and_sort> +# use sortresources.py -h to get command line option help + +from xml import sax +from xml.sax import handler +import string +import os.path +import os +import sys +import StringIO + +# parse a resource xml file and fill in data property data strucure +def parseResource(filename, data): + # document parser class + class docHandler(handler.ContentHandler): + def __init__(self,data): + self.data = data + + # fill in defaults + data.type = "unknown" + data.name = "" + data.version = "1.0" + data.author = "Anonymous" + data.category = "" + + def startElement(self,name,attr): + # just parse the <map> tag and fill data + if name in("Resource","Map","Cockpit"): + # set type from tag name it is not already set + try: oldtype = self.data.type + except: self.data.type = name.lower() + + # read values from file + if "name" in attr.getNames(): + self.data.name = attr.getValue("name") + else: + return #invalid element + if "author" in attr.getNames(): + self.data.author = attr.getValue("author") + else: + return #invalid element + + if "type" in attr.getNames(): + self.data.type = attr.getValue("type") + if "version" in attr.getNames(): + self.data.version = attr.getValue("version") + if "category" in attr.getNames(): + self.data.category = attr.getValue("category") + + # rudimentary entity resolver + class entityResolver: + # initialize, storing a path and a data object + def __init__(self,path,data): + self.path = path + self.data = data + + # return a stream for a given external entity + def resolveEntity(self,pubid,sysid): + path = self.path + + # extract data type: the base name of the DTD + self.data.type = string.split(sysid,"-")[0] + + # look in current and parent directories for dtds + while len(path) > 0 and path != "/": + fullfile = os.path.join(path, sysid) + try: + return open( fullfile ) + except: + pass + # go to "parent" directory + path = os.path.split(path)[0] + + # fallback: return empty stream, result: no dtd checking is done. + # Not horribly bad in this context + print "warning, could not find requested entity", sysid + + return StringIO.StringIO("") + + # parse: create parser... + parser = sax.make_parser() + # set it's content handler to extract the category data we want... + parser.setContentHandler( docHandler(data) ) + # give it a dummy entity resolver that tries to find external entites in a + # half-assed way... + parser.setEntityResolver( entityResolver(os.path.split(filename)[0], data) ) + # and go! + parser.parse( open(filename) ) + + # exception rule for the moment: Translate type = map to type = aamap. + try: + if data.type == "map": + data.type = "aamap" + if data.type == "cockpit": + data.type = "aacockpit" + except: pass + +# take the parsed data and trandsform it into a filename +def getName(data): + return os.path.join(data.author, data.category, data.name) + "-" + data.version + "." + data.type + ".xml" + +# determine the canonical name of a xml resource +def getCanonicalPath(path): + # trivial data class + class Data: + pass + + # parse xml file and return name + data = Data() + parseResource(path, data) + return getName(data) + +# scan for all XML files in the directory and rename them according to the rules +def scanDir(sourceDir, destinationDir, function): + def visitor( arg, dirname, names ): + for filename in names: + if filename.endswith(".xml"): + path = os.path.join(dirname, filename) + newPath = getCanonicalPath(path) + # call the passed function + function(path, os.path.join(destinationDir, newPath), newPath) + + os.path.walk(sourceDir, visitor, visitor ) + +# move file oldFile to newFile +def Move(oldFile, newFile, canonicalPath ): + if oldFile == newFile: + return False + + Print( oldFile, newFile, canonicalPath ) + + # generate target directory + dir = os.path.split(newFile)[0] + if not os.path.exists(dir): + os.makedirs(dir) + + # move file + os.rename(oldFile, newFile) + return True + +# dummy replacement: just print +def Print(oldFile, newFile, canonicalPath ): + if oldFile == newFile: + return False + + if doPrint: + print "renaming", oldFile, "->", newFile + +# move file oldFile to newFile, setting apache rewrite rules to keep the file +# fetchable from its old position +def Redirect(oldFile, newFile, canonicalPath ): + # move the file + if Move( oldFile, newFile, canonicalPath ): + # determine full path + fullCanonicalPath = "/resource/" + canonicalPath + + # file was really moved, see what directory it came from + oldPath = os.path.split( oldFile ) + + # determine filename of the .htaccess file + htaccessPath = os.path.join( oldPath[0], ".htaccess" ) + + # determine whether we need to add the RewriteEngine On line: + needEngine = True + try: + # open .htaccess file in the old directory for reading + accessFile = open(htaccessPath) + for line in accessFile: + splitLineLower = string.split(line.lower()) + splitLine = string.split(line) + if splitLineLower[0] == "rewriteengine": + # rewriting is already mentioned; we don't have to enable it laster. + needEngine = False + + # see if there already is a rewrite rule for our file + if splitLineLower[0] == "rewriterule" and splitLine[1] == oldPath[1]: + if splitLine[2] == fullCanonicalPath: + # nothing to do + return + else: + print "Warning: There already is a different RewriteRule for", oldFile, "in place." + except: pass + + # open .htaccess file for appended writing + accessFile = open(htaccessPath, "a") + + # enable rewriting + if needEngine: + accessFile.write("RewriteEngine On\n") + + # add rewrite rule + accessFile.write( "RewriteRule " + oldPath[1] + " " + fullCanonicalPath + "\n"); + +# print usage message and exit. +def Options( ret ): + print + print "Usage: sortresources.py [OPTIONS] <source directory> <destination directory>" + print " Omitting the destination directory makes it equal to the source." + print " Omitting both directories makes them the current working directory." + print "Options: -r add apache rewrite rules" + print " -n don't do anything, just print what would be done" + print " -v print non-warning status messages" + print " -h print this message" + print + sys.exit( ret ) + +def GetDtdVersion(dtdfile): + dtdfileObj = open(dtdfile) + + for line in dtdfileObj: + line = line.strip() + + if line.startswith("<!-- version="): + varList = line.split('"') + + # the version should be the second item in the list + dtdfileObj.close() + + return varList[1] + return "" + +def CopyDtd(source, destination, dtdVersion): + sourceObj = open(source, "r") + destObj = open(destination, "w") + + for line in sourceObj: + line = line.replace("resource.dtd", dtdVersion) + destObj.write(line) + + sourceObj.close() + destObj.close() + +def main(argList): + destinationDirectory = "." + sourceDirectory = "." + function = Move + + global doPrint + doPrint = False + + # parse arguments + for arg in argList: + # parse options + if len(arg)>0 and arg[0] == "-": + if len(arg) > 1: + if arg[1] == "h": + Options( 0 ) + continue + if arg[1] == "n": + function = Print + doPrint = True + continue + if arg[1] == "r": + function = Redirect + continue + if arg[1] == "v": + doPrint = True + continue + print "\nUnknown option:", arg + Options(-1) + else: + Options(-1) + else: + # non-dashed argument gives the target and destination directory + if "." == destinationDirectory: + sourceDirectory = arg + destinationDirectory = arg + + # print sourceDirectory, destinationDirectory + + # do the work + scanDir(sourceDirectory, destinationDirectory, function) + + + + + + + Added: armagetronad/trunk/armagetronad/batch/make/copyresources.py =================================================================== --- armagetronad/trunk/armagetronad/batch/make/copyresources.py (rev 0) +++ armagetronad/trunk/armagetronad/batch/make/copyresources.py 2009-01-11 23:42:20 UTC (rev 8795) @@ -0,0 +1,81 @@ +#!/usr/bin/env PYTHON + +# This script replaces the previous sortresources shell script +# links resources from one directory to another and sorts them there +# usage: resources <source> <destination> <path to sortresources.py> + +import sys, os +import shutil +foundModule = False + +newPathSearch = os.path.dirname(os.path.abspath(sys.argv[0]) ) +sys.path.insert(0, newPathSearch) + +maxnumAttempts = 10 +numAttempts = 0 + +while not foundModule: + try: + import armabuild + foundModule = True + print "Found armabuild!" + except: + sys.path[0] = os.path.dirname(newPathSearch) + numAttempts += 1 + + if numAttempts > 9: + print "Unable to find armabuild module. Can't continue." + sys.exit(1) + +from armabuild import resource + +def IgnoreFiles(visitdir, contents): + ignoreList = ["CVS", ".svn", ".bzr"] + + for a in contents: + if contents.endswith("~"): + ignoreList.append(a) + + return ignoreList + +if __name__ == "__main__": + source = sys.argv[1] + destination = sys.argv[2] + #sortresources = sys.argv[3] + print "Sorting resources from", source, "to", destination + if os.path.exists(source) is False: + sys.exit(1) + + if os.path.exists(destination): + shutil.rmtree(destination) + + shutil.copytree(source, destination, IgnoreFiles) + + print "Running sortresources" + resource.main(["-v", destination] ) + print "Done" + + if os.path.exists(os.path.join(destination, "AATeam") ) is False: + os.mkdir(os.path.join(destination, "AATeam") ) + + resourceVersion = resource.GetDtdVersion(os.path.join(source, "resource.dtd") ) + + resourceName = "resource-" + resourceVersion + ".dtd" + + dtdList = os.listdir(source) + + for a in dtdList: + base, ext = os.path.splitext(a) + if ext.lower() == ".dtd": + resourceVersion = resource.GetDtdVersion(os.path.join(source, a) ) + + resource.CopyDtd(os.path.join(source, a), + os.path.join(destination, "AATeam", + base + "-" + resourceVersion + ".dtd"), + resourceName + ) + # a little hack to maintain compatibility with older sortresources shell script + theTypeFile = open(os.path.join(destination, "." + base + "version"), "w" ) + theTypeFile.write(resourceVersion) + theTypeFile.close() + Property changes on: armagetronad/trunk/armagetronad/batch/make/copyresources.py ___________________________________________________________________ Added: svn:executable + * Modified: armagetronad/trunk/armagetronad/batch/make/sortresources.py =================================================================== --- armagetronad/trunk/armagetronad/batch/make/sortresources.py 2009-01-11 23:40:46 UTC (rev 8794) +++ armagetronad/trunk/armagetronad/batch/make/sortresources.py 2009-01-11 23:42:20 UTC (rev 8795) @@ -1,250 +1,30 @@ #!/usr/bin/python -# sorts resources by their included name and version information -# usage: call from the directory containing the resources or -# call -# sortresources.py <path_to_seach_and_sort> -# use sortresources.py -h to get command line option help -from xml import sax -from xml.sax import handler -import string -import os.path -import os -import sys -import StringIO +import sys, os -# parse a resource xml file and fill in data property data strucure -def parseResource(filename, data): - # document parser class - class docHandler(handler.ContentHandler): - def __init__(self,data): - self.data = data +foundModule = False - # fill in defaults - data.type = "unknown" - data.name = "" - data.version = "1.0" - data.author = "Anonymous" - data.category = "" +newPathSearch = os.path.dirname(os.path.abspath(sys.argv[0]) ) +sys.path.insert(0, newPathSearch) - def startElement(self,name,attr): - # just parse the <map> tag and fill data - if name in("Resource","Map","Cockpit"): - # set type from tag name it is not already set - try: oldtype = self.data.type - except: self.data.type = name.lower() +maxnumAttempts = 10 +numAttempts = 0 - # read values from file - if "name" in attr.getNames(): - self.data.name = attr.getValue("name") - else: - return #invalid element - if "author" in attr.getNames(): - self.data.author = attr.getValue("author") - else: - return #invalid element +while not foundModule: + try: + import armabuild + foundModule = True + print "Found armabuild!" + except: + sys.path[0] = os.path.dirname(newPathSearch) + numAttempts += 1 - if "type" in attr.getNames(): - self.data.type = attr.getValue("type") - if "version" in attr.getNames(): - self.data.version = attr.getValue("version") - if "category" in attr.getNames(): - self.data.category = attr.getValue("category") - - # rudimentary entity resolver - class entityResolver: - # initialize, storing a path and a data object - def __init__(self,path,data): - self.path = path - self.data = data + if numAttempts > 9: + print "Unable to find armabuild module. Can't continue." + sys.exit(1) - # return a stream for a given external entity - def resolveEntity(self,pubid,sysid): - path = self.path - - # extract data type: the base name of the DTD - self.data.type = string.split(sysid,"-")[0] - - # look in current and parent directories for dtds - while len(path) > 0 and path != "/": - fullfile = os.path.join(path, sysid) - try: - return open( fullfile ) - except: - pass - # go to "parent" directory - path = os.path.split(path)[0] - - # fallback: return empty stream, result: no dtd checking is done. - # Not horribly bad in this context - print "warning, could not find requested entity", sysid - - return StringIO.StringIO("") - - # parse: create parser... - parser = sax.make_parser() - # set it's content handler to extract the category data we want... - parser.setContentHandler( docHandler(data) ) - # give it a dummy entity resolver that tries to find external entites in a - # half-assed way... - parser.setEntityResolver( entityResolver(os.path.split(filename)[0], data) ) - # and go! - parser.parse( open(filename) ) - - # exception rule for the moment: Translate type = map to type = aamap. - try: - if data.type == "map": - data.type = "aamap" - if data.type == "cockpit": - data.type = "aacockpit" - except: pass - -# take the parsed data and trandsform it into a filename -def getName(data): - return os.path.join(data.author, data.category, data.name) + "-" + data.version + "." + data.type + ".xml" - -# determine the canonical name of a xml resource -def getCanonicalPath(path): - # trivial data class - class Data: - pass - - # parse xml file and return name - data = Data() - parseResource(path, data) - return getName(data) - -# scan for all XML files in the directory and rename them according to the rules -def scanDir(sourceDir, destinationDir, function): - def visitor( arg, dirname, names ): - for filename in names: - if filename.endswith(".xml"): - path = os.path.join(dirname, filename) - newPath = getCanonicalPath(path) - # call the passed function - function(path, os.path.join(destinationDir, newPath), newPath) - - os.path.walk(sourceDir, visitor, visitor ) - -# move file oldFile to newFile -def Move(oldFile, newFile, canonicalPath ): - if oldFile == newFile: - return False - - Print( oldFile, newFile, canonicalPath ) - - # generate target directory - dir = os.path.split(newFile)[0] - if not os.path.exists(dir): - os.makedirs(dir) - - # move file - os.rename(oldFile, newFile) - return True - -# dummy replacement: just print -def Print(oldFile, newFile, canonicalPath ): - if oldFile == newFile: - return False - - if doPrint: - print "renaming", oldFile, "->", newFile - -# move file oldFile to newFile, setting apache rewrite rules to keep the file -# fetchable from its old position -def Redirect(oldFile, newFile, canonicalPath ): - # move the file - if Move( oldFile, newFile, canonicalPath ): - # determine full path - fullCanonicalPath = "/resource/" + canonicalPath - - # file was really moved, see what directory it came from - oldPath = os.path.split( oldFile ) - - # determine filename of the .htaccess file - htaccessPath = os.path.join( oldPath[0], ".htaccess" ) - - # determine whether we need to add the RewriteEngine On line: - needEngine = True - try: - # open .htaccess file in the old directory for reading - accessFile = open(htaccessPath) - for line in accessFile: - splitLineLower = string.split(line.lower()) - splitLine = string.split(line) - if splitLineLower[0] == "rewriteengine": - # rewriting is already mentioned; we don't have to enable it laster. - needEngine = False - - # see if there already is a rewrite rule for our file - if splitLineLower[0] == "rewriterule" and splitLine[1] == oldPath[1]: - if splitLine[2] == fullCanonicalPath: - # nothing to do - return - else: - print "Warning: There already is a different RewriteRule for", oldFile, "in place." - except: pass - - # open .htaccess file for appended writing - accessFile = open(htaccessPath, "a") - - # enable rewriting - if needEngine: - accessFile.write("RewriteEngine On\n") - - # add rewrite rule - accessFile.write( "RewriteRule " + oldPath[1] + " " + fullCanonicalPath + "\n"); - -# print usage message and exit. -def Options( ret ): - print - print "Usage: sortresources.py [OPTIONS] <source directory> <destination directory>" - print " Omitting the destination directory makes it equal to the source." - print " Omitting both directories makes them the current working directory." - print "Options: -r add apache rewrite rules" - print " -n don't do anything, just print what would be done" - print " -v print non-warning status messages" - print " -h print this message" - print - sys.exit( ret ) - if __name__ == "__main__": - destinationDirectory = "." - sourceDirectory = "." - function = Move + armabuild.resource.main(sys.argv[1:]) - global doPrint - doPrint = False - # parse arguments - for arg in sys.argv[1:]: - # parse options - if len(arg)>0 and arg[0] == "-": - if len(arg) > 1: - if arg[1] == "h": - Options( 0 ) - continue - if arg[1] == "n": - function = Print - doPrint = True - continue - if arg[1] == "r": - function = Redirect - continue - if arg[1] == "v": - doPrint = True - continue - print "\nUnknown option:", arg - Options(-1) - else: - Options(-1) - else: - # non-dashed argument gives the target and destination directory - if "." == destinationDirectory: - sourceDirectory = arg - destinationDirectory = arg - # print sourceDirectory, destinationDirectory - - # do the work - scanDir(sourceDirectory, destinationDirectory, function) Added: armagetronad/trunk/armagetronad/batch/win32/makedist.py =================================================================== --- armagetronad/trunk/armagetronad/batch/win32/makedist.py (rev 0) +++ armagetronad/trunk/armagetronad/batch/win32/makedist.py 2009-01-11 23:42:20 UTC (rev 8795) @@ -0,0 +1,161 @@ +#!/usr/bin/env python + +# This script copies everything needed to build a windows distribution +# to the appropriate places. +# If run without commandline options, this script assumes it's running +# from batch/win32 + +import os, glob, shutil, sys, stat + +foundModule = False + +newPathSearch = os.path.dirname(os.path.abspath(sys.argv[0]) ) +sys.path.insert(0, newPathSearch) + +maxnumAttempts = 10 +numAttempts = 0 + +while not foundModule: + try: + import armabuild + foundModule = True + print "Found armabuild!" + except: + sys.path[0] = os.path.dirname(newPathSearch) + numAttempts += 1 + + if numAttempts > 9: + print "Unable to find armabuild module. Can't continue." + sys.exit(1) + + +# List of library directories that contain binary libaries +# Please make sure to use os.path.join and don't assume this script +# is only ever going to run in Windows.... +winlibDirs = [os.path.join('SDL_image', 'VisualC','graphics','lib'), + os.path.join('SDL_mixer','VisualC','smpeg','lib'), + os.path.join('libxml2','lib'), + os.path.join('iconv','lib'), + os.path.join('FTGL','win32','freetype','lib') ] + +# List of directories that are needed in the dist directory unmodified +armaDirs = [ + "config", + "language", + "models", + "music", + "sound", + "textures"] + +# List of files in arma root that are also needed in the dist directory +# unmodified. Wildcards are fine. +armaFiles = ["*.txt", + "README", + "README-SDL" ] + +# List of files used by the nsis installer. Wildcards fine here, too. +installerFiles = ["*.nsi", + "*.bmp", + "*.url" ] + +def IgnoreFiles(visitdir, contents): + ignoreList = ["CVS", ".svn", ".bzr"] + + for a in contents: + if a.endswith("~"): + ignoreList.append(a) + + return ignoreList + +def CopyTree(source, destination): + if os.path.exists(source): + shutil.copytree(source, destination, IgnoreFiles) + # None of the code down there works for me, but it should + ''' + print source, destination + if os.path.exists(source): + if(source.endswith("/") or source.endswith("\\") ): + source = source[0:len(source)-1] + basesource = os.path.dirname(source) + + if not os.path.exists(destination): + os.mkdir(destination) + for root, dirs, files in os.walk(source): + aPath = root.replace(basesource, "") + destPath = aPath + + for a in IgnoreFiles(os.path.join(source, root), dirs + files): + if a in dirs: + dirs.remove(a) + if a in files: + files.remove(a) + for a in dirs: + if not os.path.exists(os.path.join(destination, a) ): + os.mkdir(os.path.join(destination, a) ) + os.chmod(os.path.join(destination, a), + stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR | + stat.S_IRGRP | stat.S_IWGRP | stat.S_IXGRP | + stat.S_IROTH | stat.S_IXOTH ) + for a in files: + print destination + CopyFile(os.path.join(root, a), + os.path.join(destination, destPath, a) ) + ''' + +# Only copies the file if it doesn't exist, or if the source was +# changed. Uses timestamp to determine changes. +def CopyFile(source, destination): + if os.path.exists(destination): + if os.path.getmtime(source) > os.path.getmtime(destination): + shutil.copy2(source, destination) + else: + shutil.copy2(source, destination) + +if __name__ == "__main__": + from optparse import OptionParser + + parser = OptionParser() + + parser.add_option("-s", "--source-dir", action="store", + default=os.path.join("..", ".."), + help="location of armagetronad sources", dest="sources") + parser.add_option("-b", "--build-dir", action="store", + default=os.path.join("..", "..", "build"), + help="location of build directory", dest="builddir") + parser.add_option("-l", "--libs", action="store", + default=os.path.join("..", "..", "..", "winlibs"), + help="location of winlibs module", dest="winlibsdir") + (options, args) = parser.parse_args() + + if not os.path.exists(options.builddir): + os.mkdir(options.builddir) + + for a in ['dist', 'debug', 'profile']: + destdir = os.path.join(options.builddir, a) + if not os.path.exists(os.path.join(options.builddir, a) ): + os.mkdir(destdir) + + # Copy whole directories first + for b in armaDirs: + CopyTree(os.path.join(options.sources, b), os.path.join(destdir, b) ) + sys.exit() + + # Copy the files now + for b in armaFiles: + for c in glob.glob(os.path.join(options.sources, b) ): + CopyFile(c, destdir) + + winlibSourceDirs = winlibDirs + winlibSourceDirs.append("build") + + for b in winlibSourceDirs: + for c in glob.glob(os.path.join(options.winlibsdir, b, "*.dll") ): + CopyFile(c, destdir) + + for b in installerFiles: + for c in glob.glob(os.path.join(options.sources, "win32", b) ): + CopyFile(c, destdir) + + # todo: add sortresources stuff here + + Property changes on: armagetronad/trunk/armagetronad/batch/win32/makedist.py ___________________________________________________________________ Added: svn:executable + * Modified: armagetronad/trunk/armagetronad/bootstrap.sh =================================================================== --- armagetronad/trunk/armagetronad/bootstrap.sh 2009-01-11 23:40:46 UTC (rev 8794) +++ armagetronad/trunk/armagetronad/bootstrap.sh 2009-01-11 23:42:20 UTC (rev 8795) @@ -25,7 +25,7 @@ $AUTOCONF || { rm configure; exit 1; } echo "Running automake..." -$AUTOMAKE -a || exit 1 +$AUTOMAKE -av || { echo "Automake failed"; exit 1; } echo "Flagging scripts as executable..." chmod a+x $MYDIR/*.sh || exit 1 Modified: armagetronad/trunk/armagetronad/resource/Makefile.am =================================================================== --- armagetronad/trunk/armagetronad/resource/Makefile.am 2009-01-11 23:40:46 UTC (rev 8794) +++ armagetronad/trunk/armagetronad/resource/Makefile.am 2009-01-11 23:42:20 UTC (rev 8795) @@ -5,8 +5,9 @@ sourcefiles = $(shell test -d ${srcdir}/proto && find ${srcdir}/proto -type f | grep -v CVS | grep -v "~") -included: ${sourcefiles} ${top_srcdir}/batch/make/sortresources.py ${top_srcdir}/batch/make/sortresources Makefile - @sh ${top_srcdir}/batch/make/sortresources ${srcdir}/proto $@ ${top_srcdir}/batch/make/sortresources.py || { rm -rf $@; false; } +included: ${sourcefiles} ${top_srcdir}/batch/make/sortresources.py ${top_srcdir}/batch/make/copyresources.py Makefile + python ${top_srcdir}/batch/make/copyresources.py ${srcdir}/proto $@ +# @sh ${top_srcdir}/batch/make/sortresources ${srcdir}/proto $@ ${top_srcdir}/batch/make/sortresources.py || { rm -rf $@; false; } all: included Modified: armagetronad/trunk/armagetronad/resource/proto/cockpit-0.3.0.dtd =================================================================== --- armagetronad/trunk/armagetronad/resource/proto/cockpit-0.3.0.dtd 2009-01-11 23:40:46 UTC (rev 8794) +++ armagetronad/trunk/armagetronad/resource/proto/cockpit-0.3.0.dtd 2009-01-11 23:42:20 UTC (rev 8795) @@ -1,4 +1,4 @@ -<!-- version="AATeam/0.3.0" --> +<!-- version="0.3.0" --> <!ELEMENT Resource (Cockpit)> <!ATTLIST Resource Modified: armagetronad/trunk/armagetronad/src/tools/tVersion.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tools/tVersion.cpp 2009-01-11 23:40:46 UTC (rev 8794) +++ armagetronad/trunk/armagetronad/src/tools/tVersion.cpp 2009-01-11 23:42:20 UTC (rev 8795) @@ -25,8 +25,13 @@ */ #ifndef TRUE_ARMAGETRONAD_VERSION -#include "tTrueVersion.h" +#include "aa_config.h" + +#ifndef MACOSX_XCODE +# include "tTrueVersion.h" +#endif + #include "tVersion.h" #include "tString.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-12 10:47:41
|
Revision: 8800 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8800&view=rev Author: bazaarmagetron Date: 2009-01-12 10:47:35 +0000 (Mon, 12 Jan 2009) Log Message: ----------- author: Manuel Moos Merging from 0.3.1: Manuel Moos 2009-01-12 Bumping version to alpha_2.1 for fixed windows... Modified Paths: -------------- armagetronad/trunk/armagetronad/minor_version Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-12 00:30:14.709000111 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-12 11:38:58.053999901 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow z-...@us...-20090112094132-31xbu83j367i7qck Modified: bzr:file-ids - batch/make/copyresources.py copyresources.py-20090108062653-7vghf8ihg1nlinpn-1 batch/armabuild armabuild-20090108121259-vpk81px2ze01659r-1 batch/armabuild/resource.py resource.py-20090108121259-vpk81px2ze01659r-3 batch/armabuild/__init__.py __init__.py-20090108121259-vpk81px2ze01659r-2 batch/win32 win32-20090108062754-q6xz9gpvvbrp64cy-1 batch/win32/makedist.py makedist.py-20090108121327-pnpjgubq7os5b3lj-1 + Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz Modified: armagetronad/trunk/armagetronad/minor_version =================================================================== --- armagetronad/trunk/armagetronad/minor_version 2009-01-12 09:12:42 UTC (rev 8799) +++ armagetronad/trunk/armagetronad/minor_version 2009-01-12 10:47:35 UTC (rev 8800) @@ -1 +1 @@ -.1_alpha2 +.1_alpha2.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-12 11:17:20
|
Revision: 8802 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8802&view=rev Author: bazaarmagetron Date: 2009-01-12 11:17:16 +0000 (Mon, 12 Jan 2009) Log Message: ----------- author: Manuel Moos Merging from 0.3.1: Manuel Moos 2009-01-12 Fixed flashing of teamname between rounds if s... Manuel Moos 2009-01-12 Got rid of sn_programVersion, replaced with ... Modified Paths: -------------- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp armagetronad/trunk/armagetronad/src/network/astat.cpp armagetronad/trunk/armagetronad/src/network/master.cpp armagetronad/trunk/armagetronad/src/network/nNetwork.cpp armagetronad/trunk/armagetronad/src/network/nNetwork.h armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp armagetronad/trunk/armagetronad/src/tron/gGame.cpp armagetronad/trunk/armagetronad/src/tron/gMenus.cpp Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-12 11:40:18.132999897 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-12 11:41:23.887000084 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow z-...@us...-20090112094132-31xbu83j367i7qck z-...@us...-20090112102021-296xw0o0kas9uloi + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow z-...@us...-20090112094132-31xbu83j367i7qck z-...@us...-20090112102021-296xw0o0kas9uloi z-...@us...-20090112103632-yroyhl5crs8uad38 Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2009-01-12 10:48:11 UTC (rev 8801) +++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2009-01-12 11:17:16 UTC (rev 8802) @@ -5776,7 +5776,7 @@ if (!greeted){ tOutput o; o.SetTemplateParameter(1, GetName() ); - o.SetTemplateParameter(2, sn_programVersion); + o.SetTemplateParameter(2, st_programVersion); o << "$player_welcome"; tString s; s << o; @@ -7190,7 +7190,8 @@ void ePlayerNetID::SetTeamname(const char* newTeamname) { teamname = newTeamname; - if (bool(currentTeam) && currentTeam->OldestHumanPlayer() && + if (sn_GetNetState() != nCLIENT && + bool(currentTeam) && currentTeam->OldestHumanPlayer() && currentTeam->OldestHumanPlayer()->ID()==ID()) { currentTeam->UpdateAppearance(); Modified: armagetronad/trunk/armagetronad/src/network/astat.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/network/astat.cpp 2009-01-12 10:48:11 UTC (rev 8801) +++ armagetronad/trunk/armagetronad/src/network/astat.cpp 2009-01-12 11:17:16 UTC (rev 8802) @@ -88,7 +88,7 @@ // Poll(); tCommandLineData commandLine; - commandLine.programVersion_ = &sn_programVersion; + commandLine.programVersion_ = &st_programVersion; commandLine.Analyse(argc, argv); tLocale::Load("languages.txt"); Modified: armagetronad/trunk/armagetronad/src/network/master.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/network/master.cpp 2009-01-12 10:48:11 UTC (rev 8801) +++ armagetronad/trunk/armagetronad/src/network/master.cpp 2009-01-12 11:17:16 UTC (rev 8802) @@ -72,7 +72,7 @@ int main(int argc, char** argv) { tCommandLineData commandLine; - commandLine.programVersion_ = &sn_programVersion; + commandLine.programVersion_ = &st_programVersion; commandLine.Analyse(argc, argv); tLocale::Load("languages.txt"); atexit(tLocale::Clear); Modified: armagetronad/trunk/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2009-01-12 10:48:11 UTC (rev 8801) +++ armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2009-01-12 11:17:16 UTC (rev 8802) @@ -100,12 +100,6 @@ tString sn_bigBrotherString; // tString sn_greeting[5]; //made 4 = 5 (lol i broke the laws of maths. subby), k's bug fix -#ifndef TRUE_ARMAGETRONAD_VERSION -#define TRUE_ARMAGETRONAD_VERSION VERSION -#endif - -tString sn_programVersion (TRUE_ARMAGETRONAD_VERSION) ; - tString sn_serverName("Unnamed Server"); const unsigned int sn_defaultPort = 4534; Modified: armagetronad/trunk/armagetronad/src/network/nNetwork.h =================================================================== --- armagetronad/trunk/armagetronad/src/network/nNetwork.h 2009-01-12 10:48:11 UTC (rev 8801) +++ armagetronad/trunk/armagetronad/src/network/nNetwork.h 2009-01-12 11:17:16 UTC (rev 8802) @@ -55,8 +55,6 @@ extern tString sn_bigBrotherString; // the string that is sent // to the server for system information -extern tString sn_programVersion; // our version - extern tString sn_serverName; // telling name of the server extern unsigned int sn_serverPort; // port we listen on when in server mode Modified: armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2009-01-12 10:48:11 UTC (rev 8801) +++ armagetronad/trunk/armagetronad/src/network/nServerInfo.cpp 2009-01-12 11:17:16 UTC (rev 8802) @@ -2715,7 +2715,7 @@ users = sn_NumRealUsers(); version_ = sn_CurrentVersion(); - release_ = sn_programVersion; + release_ = st_programVersion; #ifdef WIN32 release_ += " win"; Modified: armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp 2009-01-12 10:48:11 UTC (rev 8801) +++ armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp 2009-01-12 11:17:16 UTC (rev 8802) @@ -547,7 +547,7 @@ try { tCommandLineData commandLine; - commandLine.programVersion_ = &sn_programVersion; + commandLine.programVersion_ = &st_programVersion; // analyse command line // tERR_MESSAGE( "Analyzing command line." ); @@ -558,7 +558,7 @@ { // embed version in recording const char * versionSection = "VERSION"; - tString version( sn_programVersion ); + tString version( st_programVersion ); tRecorder::Playback( versionSection, version ); tRecorder::Record( versionSection, version ); } @@ -754,7 +754,7 @@ gLogo::SetBig(false); gLogo::SetSpinning(true); - sn_bigBrotherString = renderer_identification + "VER=" + sn_programVersion + "\n\n"; + sn_bigBrotherString = renderer_identification + "VER=" + st_programVersion + "\n\n"; #ifdef HAVE_LIBRUBY try { Modified: armagetronad/trunk/armagetronad/src/tron/gGame.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2009-01-12 10:48:11 UTC (rev 8801) +++ armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2009-01-12 11:17:16 UTC (rev 8802) @@ -2013,7 +2013,7 @@ } tOutput title; - title.SetTemplateParameter( 1, sn_programVersion ); + title.SetTemplateParameter( 1, st_programVersion ); if (!ingame) title << "$main_menu_text"; else Modified: armagetronad/trunk/armagetronad/src/tron/gMenus.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tron/gMenus.cpp 2009-01-12 10:48:11 UTC (rev 8801) +++ armagetronad/trunk/armagetronad/src/tron/gMenus.cpp 2009-01-12 11:17:16 UTC (rev 8802) @@ -75,7 +75,7 @@ static tConfItemLine c_ver("GL_VERSION",gl_version); static tConfItemLine c_rEnd("GL_RENDERER",gl_renderer); static tConfItemLine c_vEnd("GL_VENDOR",gl_vendor); -// static tConfItemLine a_ver("ARMAGETRON_VERSION",sn_programVersion); +// static tConfItemLine a_ver("ARMAGETRON_VERSION",st_programVersion); #ifndef DEDICATED static uMenuItemStringWithHistory::history_t &sg_consoleHistory() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-12 13:22:14
|
Revision: 8805 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8805&view=rev Author: bazaarmagetron Date: 2009-01-12 12:04:42 +0000 (Mon, 12 Jan 2009) Log Message: ----------- author: Manuel Moos Merging from 0.3.1: Manuel Moos 2009-01-12 Copying documentation files. Modified Paths: -------------- armagetronad/trunk/armagetronad/win32/makedist.bat Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-12 12:45:14.734999895 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-12 12:59:26.983999968 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow z-...@us...-20090112094132-31xbu83j367i7qck z-...@us...-20090112102021-296xw0o0kas9uloi z-...@us...-20090112103632-yroyhl5crs8uad38 ma...@mo...-20090112112802-yk5fp7eetdy8ef48 + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow z-...@us...-20090112094132-31xbu83j367i7qck z-...@us...-20090112102021-296xw0o0kas9uloi z-...@us...-20090112103632-yroyhl5crs8uad38 ma...@mo...-20090112112802-yk5fp7eetdy8ef48 ma...@mo...-20090112115717-sd79x6ml6zk0noom Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc Modified: armagetronad/trunk/armagetronad/win32/makedist.bat =================================================================== --- armagetronad/trunk/armagetronad/win32/makedist.bat 2009-01-12 11:52:10 UTC (rev 8804) +++ armagetronad/trunk/armagetronad/win32/makedist.bat 2009-01-12 12:04:42 UTC (rev 8805) @@ -51,6 +51,7 @@ echo ^| updating %2 echo +------------------------------------------------------- echo *** copying files... + xcopy %AA_DIR%\src\doc %1\doc /I /E /Y /C xcopy %AA_DIR%\arenas %1\arenas /I /E /Y /C xcopy %AA_DIR%\config %1\config /I /E /Y /C xcopy %AA_DIR%\language %1\language /I /E /Y /C This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-12 13:22:17
|
Revision: 8804 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8804&view=rev Author: bazaarmagetron Date: 2009-01-12 11:52:10 +0000 (Mon, 12 Jan 2009) Log Message: ----------- author: Manuel Moos Merging from 0.3.1: Manuel Moos 2009-01-12 Removed obsolete/unused source files. Manuel Moos 2009-01-12 More adaptions to new version variables. Manuel Moos 2009-01-12 Fixed output. Manuel Moos 2009-01-12 Hopefully adapted to new version stuff. Manuel Moos 2009-01-12 Removed obsolete version.h include. Modified Paths: -------------- armagetronad/trunk/armagetronad/src/network/nNetwork.cpp armagetronad/trunk/armagetronad/src/win32/armagetron.rc armagetronad/trunk/armagetronad/win32/code_blocks/Dedicated.cbp armagetronad/trunk/armagetronad/win32/update_version.bat Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-12 11:41:23.887000084 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-12 12:45:14.734999895 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow z-...@us...-20090112094132-31xbu83j367i7qck z-...@us...-20090112102021-296xw0o0kas9uloi z-...@us...-20090112103632-yroyhl5crs8uad38 + svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715 voodoo-20080418152302-ig27bh2y1fbkwp6b z-...@us...-20090105231059-64ezj2pllnvlf5s6 svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754 z-...@us...-20090106232555-c0rb04zb284g544v z-...@us...-20090106235948-tei6dwt5b5ac0s6j z-...@us...-20090107093029-m0zav0ckcpf5b8b7 lee...@gm...-20090107170845-jnex0i7u41wb3ovq da...@da...-20090108021335-ep7dny6f7hrl380e lee...@gm...-20090109021549-p0ce8in8453gexow z-...@us...-20090112094132-31xbu83j367i7qck z-...@us...-20090112102021-296xw0o0kas9uloi z-...@us...-20090112103632-yroyhl5crs8uad38 ma...@mo...-20090112112802-yk5fp7eetdy8ef48 Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz Modified: armagetronad/trunk/armagetronad/src/network/nNetwork.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2009-01-12 11:22:46 UTC (rev 8803) +++ armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2009-01-12 11:52:10 UTC (rev 8804) @@ -56,10 +56,6 @@ #include "version.h" #endif // MACOSX_XCODE -#ifdef WIN32 -#include "version.h" -#endif // WIN32 - // my IP address. Master server/game server hopefully tell me a correct one. static tString sn_myAddress ("*.*.*.*:*"); tString const & sn_GetMyAddress() @@ -1112,7 +1108,7 @@ if ( sn_filterColorStrings ) s = tColoredString::RemoveColors( s, false ); else if ( sn_filterDarkColorStrings ) - s = tColoredString::RemoveColors( s, true ); + s = tColoredString::RemoveColors( s, true ); return *this; } @@ -1502,7 +1498,7 @@ #ifndef DEDICATED // expiration for public beta versions if ( !sn_AcceptingFromMaster && - ( strstr( VERSION, "rc" ) || strstr( VERSION, "alpha" ) || strstr( VERSION, "beta" ) ) && + ( strstr( st_programVersion.c_str(), "rc" ) || strstr( st_programVersion.c_str(), "alpha" ) || strstr( st_programVersion.c_str(), "beta" ) ) && sn_Connections[0].version.Max() > sn_currentProtocolVersion + 1 ) { throw tGenericException( tOutput("$testing_version_expired"), tOutput("$testing_version_expired_title" ) ); @@ -1512,7 +1508,7 @@ } else sn_Connections[0].version = nVersion( 0, 0); - + // read my public IP if ( !m.End() ) { @@ -1538,7 +1534,7 @@ static const char * section = "LOGIN_SALT"; tRecorder::Playback( section, compare ); tRecorder::Record( section, compare ); - + if ( compare != 0 ) { nReadError( false ); @@ -2735,10 +2731,10 @@ // write our version (*mess) << sn_MyVersion(); - + // write our supported authentication methods (*mess) << nKrawall::nMethod::SupportedMethods(); - + // write a random salt nKrawall::RandomSalt( loginSalt ); nKrawall::WriteScrambledPassword( loginSalt, *mess ); Modified: armagetronad/trunk/armagetronad/src/win32/armagetron.rc =================================================================== --- armagetronad/trunk/armagetronad/src/win32/armagetron.rc 2009-01-12 11:22:46 UTC (rev 8803) +++ armagetronad/trunk/armagetronad/src/win32/armagetron.rc 2009-01-12 11:52:10 UTC (rev 8804) @@ -1,7 +1,7 @@ //Microsoft Developer Studio generated resource script. //http://msdn.microsoft.com/library/default.asp?url=/library/en-us/tools/tools/about_resource_files.asp #include "resource.h" -#include "..\version.h" +#include "..\tTrueVersion.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -85,14 +85,14 @@ BEGIN VALUE "CompanyName", "\0" VALUE "FileDescription", "Armagetron Advanced\0" - VALUE "FileVersion", VERSION + VALUE "FileVersion", TRUE_ARMAGETRONAD_VERSION VALUE "InternalName", "ArmagetronAd\0" VALUE "LegalCopyright", "GNU Public License\0" VALUE "License", "GPL\0" VALUE "Homepage", "http://www.armagetronad.net\0" VALUE "OriginalFilename", "ArmagetronAd.exe\0" VALUE "ProductName", "Armagetron Advanced\0" - VALUE "ProductVersion", VERSION + VALUE "ProductVersion", TRUE_ARMAGETRONAD_VERSION END END BLOCK "VarFileInfo" Modified: armagetronad/trunk/armagetronad/win32/code_blocks/Dedicated.cbp =================================================================== --- armagetronad/trunk/armagetronad/win32/code_blocks/Dedicated.cbp 2009-01-12 11:22:46 UTC (rev 8803) +++ armagetronad/trunk/armagetronad/win32/code_blocks/Dedicated.cbp 2009-01-12 11:52:10 UTC (rev 8804) @@ -107,20 +107,6 @@ <Option target="Win32 Debug"/> <Option target="Win32 Profile"/> </Unit> - <Unit filename="..\..\src\engine\eAuthentification.cpp"> - <Option compilerVar="CPP"/> - <Option target="Win32 Release"/> - <Option target="Win32 Debug"/> - <Option target="Win32 Profile"/> - </Unit> - <Unit filename="..\..\src\engine\eAuthentification.h"> - <Option compilerVar=""/> - <Option compile="0"/> - <Option link="0"/> - <Option target="Win32 Release"/> - <Option target="Win32 Debug"/> - <Option target="Win32 Profile"/> - </Unit> <Unit filename="..\..\src\engine\eAxis.cpp"> <Option compilerVar="CPP"/> <Option target="Win32 Release"/> Modified: armagetronad/trunk/armagetronad/win32/update_version.bat =================================================================== --- armagetronad/trunk/armagetronad/win32/update_version.bat 2009-01-12 11:22:46 UTC (rev 8803) +++ armagetronad/trunk/armagetronad/win32/update_version.bat 2009-01-12 11:52:10 UTC (rev 8804) @@ -81,7 +81,7 @@ echo *%DATESTAMP%* echo *%DATESTAMP:~4%* echo *%HELP_FILE%* -echo *** generating version.h... +echo *** generating tTrueVersion.h... echo #define MAJOR_VERSION 1,%MAJOR_VERSION:.=%,0,%REV% > %HELP_FILE% echo #define MINOR_VERSION %MINOR_VERSION% >> %HELP_FILE% This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-12 19:55:41
|
Revision: 8806 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8806&view=rev Author: bazaarmagetron Date: 2009-01-12 19:55:30 +0000 (Mon, 12 Jan 2009) Log Message: ----------- Daniel Lee Harple: Added bzr_count_revisions(), and made it work with bsd tool chains. Modified Paths: -------------- armagetronad/trunk/armagetronad/batch/make/version Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-12 12:59:26.983999968 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: armagetronad + timestamp: 2009-01-12 14:26:34.364000082 -0500 committer: Daniel Lee Harple <lee...@gm...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 Modified: armagetronad/trunk/armagetronad/batch/make/version =================================================================== --- armagetronad/trunk/armagetronad/batch/make/version 2009-01-12 12:04:42 UTC (rev 8805) +++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-12 19:55:30 UTC (rev 8806) @@ -118,6 +118,16 @@ fi fi +bzr_count_revisions() +{ + srcdir="$1" + limit="$2" + + test -z "$limit" || limit="-l $limit" + + bzr log $limit "${srcdir}" 2>/dev/null | egrep -c '^ *revno: [0-9\.]+$' +} + # *TODO* once we get our superproject up on launchpad (and thus get saner branch nicks), use branch nicks for $major_version # Check if bzr is installed, and if the path is versionned bzr >/dev/null 2>&1 @@ -130,7 +140,7 @@ # So we count revisions, including merged ones, also including fools which have empty # lines with only "revno: 15" in their commit messages revno=$( bzr revno ${srcdir} 2>/dev/null) - revcount=$( bzr log ${srcdir} 2>/dev/null | sed -ne 's/^ *revno: [0-9\.]\+$/\0/p' | wc -l ) + revcount=$( bzr_count_revisions ${srcdir} ) lca=$revno lcaz=$revcount versioned=# This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-12 19:56:25
|
Revision: 8807 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8807&view=rev Author: bazaarmagetron Date: 2009-01-12 19:56:18 +0000 (Mon, 12 Jan 2009) Log Message: ----------- Daniel Lee Harple: Simplified sed expression to work with bsd sed Modified Paths: -------------- armagetronad/trunk/armagetronad/batch/make/version Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-12 14:26:34.364000082 -0500 committer: Daniel Lee Harple <lee...@gm...> properties: branch-nick: armagetronad + timestamp: 2009-01-12 14:43:38.836999893 -0500 committer: Daniel Lee Harple <lee...@gm...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 Modified: armagetronad/trunk/armagetronad/batch/make/version =================================================================== --- armagetronad/trunk/armagetronad/batch/make/version 2009-01-12 19:55:30 UTC (rev 8806) +++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-12 19:56:18 UTC (rev 8807) @@ -158,7 +158,7 @@ # if it diverged: then # Count the revisions we added locally - localrevisions=$( echo "${bzrmissingcout}" | sed -ne '2,1s/^You have \([0-9]\+\) extra revision(s):$/\1/p' ) + localrevisions=$( echo "${bzrmissingcout}" | sed -ne '2,1s/[^0-9]//gp' ) # See how many steps it is, with the fool's number stepsbackwards=$( bzr log ${srcdir} -l ${localrevisions} | sed -ne 's/^ *revno: [0-9\.]\+$/\0/p' | wc -l ) # And start dancing. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-12 19:57:14
|
Revision: 8808 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8808&view=rev Author: bazaarmagetron Date: 2009-01-12 19:57:04 +0000 (Mon, 12 Jan 2009) Log Message: ----------- Daniel Lee Harple: Use bzr_count_revisions(). Working on bug #314784 Modified Paths: -------------- armagetronad/trunk/armagetronad/batch/make/version Property Changed: ---------------- armagetronad/trunk/armagetronad/ Property changes on: armagetronad/trunk/armagetronad ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-12 14:43:38.836999893 -0500 committer: Daniel Lee Harple <lee...@gm...> properties: branch-nick: armagetronad + timestamp: 2009-01-12 14:47:29.551000118 -0500 committer: Daniel Lee Harple <lee...@gm...> properties: branch-nick: armagetronad Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 + 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr 626 z-...@us...-20080214170110-rhfpd874zuogr3cm 627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b 657 z-...@us...-20080301093905-0jwh1zg9srukp8fn 678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a 679 z-...@us...-20080324202056-eybvkm0gjomywbcq 680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd 681 epsy-20080327213346-setzm7umdzzuk2dm 683 wrt...@us...-20080402122117-54nak33inuca02o9 684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd 685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn 686 ep...@fr...-20080418200503-q16s8az3yewn4x7a 687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3 688 wrt...@us...-20080419185850-ksm1feadrrhqigjb 689 wrt...@us...-20080423170738-zb8v72r0asm7cp52 691 ep...@fr...-20080427145818-212ave5ohdhth4ph 692 epsy46-20080428164518-07b9wsj90rf82c3y 693 epsy46-20080429194430-hq3fd6i1mnz1vrnz 694 ep...@fr...-20080518131839-uik8hj18c55boh3m 696 z-...@us...-20080618212520-e6ov1rb9b9edwt30 697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf 698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl 699 da...@da...-20080824021014-8aacq5gfp7ktxlxz 700 da...@da...-20080824055426-l5dwhb216uteu7ca 701 da...@da...-20080824172432-lvagd99j28hq8uc1 702 da...@da...-20080824225545-ply97boo9jkqtysn 704 ep...@fr...-20081027173216-nh6d92edtwe35j2g 705 ep...@fr...-20081027203505-42bpegw0fyywzyou 706 ep...@fr...-20081027204727-jcx89jukht9ay72r 707 ep...@fr...-20081028180734-62o6e90rf020xzv8 708 ep...@fr...-20081028224044-f3myemuy87v52ilp 709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq 710 ep...@fr...-20081114212232-i1q12n375bdpl0sp 712 z-...@us...-20081211141049-wbjceadupsfss5ib 713 da...@da...-20081216223143-1hso83uxyagaubg8 716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7 717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl 718 lee...@gm...-20081220085502-gpad43pu99t1e6po 719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb 720 lee...@gm...-20081220094339-k3zb139qp87r4b2w 721 lee...@gm...-20081220100858-uap7k5s22tbipzkt 722 lee...@gm...-20081220111203-rhp5p15agx73xi1k 723 lee...@gm...-20081220112757-mjp2yffddjy5s74e 724 lee...@gm...-20081220114653-k2dqt4wiizipbwas 725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6 726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw 734 lee...@gm...-20081230173103-fmzio9fanap2rybf 735 lee...@gm...-20081230174204-cppkz4sumguhysa9 736 lee...@gm...-20081230174738-mecjttlpyp1i859c 737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3 738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr 739 lee...@gm...-20081231202038-odzabc3wmlqzvskt 740 lee...@gm...-20081231203835-nn2kezh1el82dn1q 741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz 743 da...@da...-20090103170253-cdtppjz8nzwhngst 744 da...@da...-20090103183413-r1852m22og3lh2uc 745 lee...@gm...-20090103212852-mvsergjd4ao1la77 746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8 748 da...@da...-20090105115751-x3y9oui4xvt43crj 749 da...@da...-20090105131244-nljbq3qp4hp7lg07 750 da...@da...-20090105192648-inoxhljmqqe3dgw7 751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0 752 da...@da...-20090106194428-nwwwyljr8wn3pwq1 753 da...@da...-20090106194753-82zu5xfqfzbnk9k9 754 da...@da...-20090106202104-5z9836ych2di2jlo 755 da...@da...-20090106234335-aolp3kr0gasjmbri 756 da...@da...-20090106234811-p3el5s40j0upvyql 757 da...@da...-20090107021107-5kbemotp1sco4ncp 758 da...@da...-20090107051447-8ncvyikf3aadgz3a 759 da...@da...-20090107071255-jhqi9p9212levb60 760 z-...@us...-20090107105902-l6x07af4hr2py066 761 z-...@us...-20090107111842-2o0fqp72oxz55jri 762 z-...@us...-20090107113141-mo1g3b0jgzhyj001 763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e 764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1 770 z-...@us...-20090111232523-lnab7ymhxk94pdh1 771 z-...@us...-20090111232619-ukmmx5gfarcoiipi 772 z-...@us...-20090111233014-dazt93cibmg56v3i 774 z-...@us...-20090112103858-psygqhxdmdaer8iz 775 z-...@us...-20090112104018-jik2mqnc14fg5bdk 776 z-...@us...-20090112104123-hvkx0sxhs9wz706b 777 z-...@us...-20090112114514-v1u04w5v83ai75lz 778 z-...@us...-20090112115926-ltqy35euxny3n7zc 779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5 780 lee...@gm...-20090112194338-2zfak9nrxm961yh5 781 lee...@gm...-20090112194729-dlonazcnq20npwqk Modified: armagetronad/trunk/armagetronad/batch/make/version =================================================================== --- armagetronad/trunk/armagetronad/batch/make/version 2009-01-12 19:56:18 UTC (rev 8807) +++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-12 19:57:04 UTC (rev 8808) @@ -160,7 +160,7 @@ # Count the revisions we added locally localrevisions=$( echo "${bzrmissingcout}" | sed -ne '2,1s/[^0-9]//gp' ) # See how many steps it is, with the fool's number - stepsbackwards=$( bzr log ${srcdir} -l ${localrevisions} | sed -ne 's/^ *revno: [0-9\.]\+$/\0/p' | wc -l ) + stepsbackwards=$( bzr_count_revisions ${srcdir} ${localrevisions} ) # And start dancing. minor_version=_alpha_z$(( ${revcount} - ${stepsbackwards} ))_${DATE} # Set last common ancestors This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |