Menu
▾
▴
armagetronad-commits
|
From: <baz...@us...> - 2008-12-21 18:34:45
|
Revision: 8680
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8680&view=rev
Author: bazaarmagetron
Date: 2008-12-21 18:34:32 +0000 (Sun, 21 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: print what bison the rule is using
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-21 13:16:37.010999918 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-21 13:26:03.523000002 -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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-21 18:23:13 UTC (rev 8679)
+++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-21 18:34:32 UTC (rev 8680)
@@ -401,7 +401,7 @@
outputFiles = (
"$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).tab.cpp",
);
- script = "test -n \"${BISON}\" || BISON=bison\n$BISON -o \"${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.tab.cpp\" \"${INPUT_FILE_PATH}\"";
+ script = "test -n \"${BISON}\" || BISON=bison\necho $BISON\n$BISON -o \"${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.tab.cpp\" \"${INPUT_FILE_PATH}\"";
};
9BB5B8560D845C2500BF5F1C /* PBXBuildRule */ = {
isa = PBXBuildRule;
@@ -412,7 +412,7 @@
outputFiles = (
"$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).tab.cpp",
);
- script = "test -n \"${BISON}\" || BISON=bison\n$BISON -o \"${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.tab.cpp\" \"${INPUT_FILE_PATH}\"";
+ script = "test -n \"${BISON}\" || BISON=bison\necho $BISON\n$BISON -o \"${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.tab.cpp\" \"${INPUT_FILE_PATH}\"";
};
9BC0F61A0B517A8B0041120B /* PBXBuildRule */ = {
isa = PBXBuildRule;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2008-12-29 17:15:37
|
Revision: 8692
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8692&view=rev
Author: z-man
Date: 2008-12-29 17:15:32 +0000 (Mon, 29 Dec 2008)
Log Message:
-----------
Merging branch 0.2.8 from revision 8438 to 8691:
------------------------------------------------------------------------
r8686 | bazaarmagetron | 2008-12-27 01:12:35 +0100 (Sat, 27 Dec 2008) | 2 lines
epsy: reverted to old behaviour for now and added TODO
------------------------------------------------------------------------
r8685 | bazaarmagetron | 2008-12-27 00:11:27 +0100 (Sat, 27 Dec 2008) | 2 lines
epsy: have batch/make/version make use of bzr if path is versionned, putting in version, when appliable, revno, tag, and build date(when working tree is modified)
------------------------------------------------------------------------
r8684 | bazaarmagetron | 2008-12-26 22:54:06 +0100 (Fri, 26 Dec 2008) | 2 lines
Manuel Moos: Adaptions to last changes; some setting changes still caused assertion failures.
------------------------------------------------------------------------
r8683 | bazaarmagetron | 2008-12-26 22:52:53 +0100 (Fri, 26 Dec 2008) | 4 lines
author: Manuel Moos
Map settings are now executed with the access level of the user setting MAP_FILE.
/console chat commands now work in all operation modes of the client.
------------------------------------------------------------------------
r8669 | bazaarmagetron | 2008-12-19 00:54:46 +0100 (Fri, 19 Dec 2008) | 2 lines
Daniel Lee Harple: Actually use server_args from rc.config
------------------------------------------------------------------------
r8665 | bazaarmagetron | 2008-12-17 14:59:42 +0100 (Wed, 17 Dec 2008) | 2 lines
Manuel Moos: Added one top level call of AX_CXXFLAGS_GCC_OPTION() to fix bug 307790.
------------------------------------------------------------------------
r8664 | bazaarmagetron | 2008-12-17 14:37:32 +0100 (Wed, 17 Dec 2008) | 2 lines
Manuel Moos: Disabling -Wno-strict-overflow for now.
------------------------------------------------------------------------
r8662 | bazaarmagetron | 2008-12-16 21:46:10 +0100 (Tue, 16 Dec 2008) | 1 line
Daniel Lee Harple: Ignore all .DS_Store files
------------------------------------------------------------------------
r8661 | bazaarmagetron | 2008-12-16 18:09:30 +0100 (Tue, 16 Dec 2008) | 2 lines
Daniel Lee Harple: Fixed Custom Connect connect action text.
------------------------------------------------------------------------
r8660 | bazaarmagetron | 2008-12-13 00:16:45 +0100 (Sat, 13 Dec 2008) | 2 lines
epsy: Don't wait for silenced players at start.
------------------------------------------------------------------------
r8659 | bazaarmagetron | 2008-12-12 13:53:09 +0100 (Fri, 12 Dec 2008) | 4 lines
author: epsy
* Fix subdirectory handling for shorthand authorities
* Have PLAYER_MESSAGE retrieve the message to be sent using operator >> instead of tString::ReadLine, allowing use of newlines but forcing the use of quotes
------------------------------------------------------------------------
r8657 | bazaarmagetron | 2008-12-11 13:26:56 +0100 (Thu, 11 Dec 2008) | 2 lines
Manuel Moos: Avoiding unwanted negative boosts.
------------------------------------------------------------------------
r8656 | bazaarmagetron | 2008-12-11 13:18:27 +0100 (Thu, 11 Dec 2008) | 2 lines
Manuel Moos: Avoiding division by zero when breaking from a wall and CYCLE_WALL_NEAR is 0.
------------------------------------------------------------------------
r8655 | bazaarmagetron | 2008-12-11 10:25:12 +0100 (Thu, 11 Dec 2008) | 2 lines
Manuel Moos: Only add -Wno-strict-overflow if the compiler supports it.
------------------------------------------------------------------------
r8654 | bazaarmagetron | 2008-12-11 09:20:36 +0100 (Thu, 11 Dec 2008) | 2 lines
Manuel Moos: Removed old debug code.
------------------------------------------------------------------------
r8653 | bazaarmagetron | 2008-12-10 11:40:21 +0100 (Wed, 10 Dec 2008) | 2 lines
Manuel Moos: Moved MAXCLIENTS from CXXFLAGS to config.h.
------------------------------------------------------------------------
r8652 | bazaarmagetron | 2008-12-10 09:13:25 +0100 (Wed, 10 Dec 2008) | 2 lines
Manuel Moos: Respect display list blacklist even in debug mode.
------------------------------------------------------------------------
r8651 | bazaarmagetron | 2008-12-10 09:12:43 +0100 (Wed, 10 Dec 2008) | 2 lines
Manuel Moos: Extended display list blacklist to Mesa 7.1.
------------------------------------------------------------------------
r8650 | bazaarmagetron | 2008-12-10 01:06:36 +0100 (Wed, 10 Dec 2008) | 4 lines
author: Manuel Moos
Display list blacklist cut down to Mesa 7.0.x. All other versions tested
seemed to behave fine.
------------------------------------------------------------------------
r8649 | bazaarmagetron | 2008-12-09 18:21:24 +0100 (Tue, 09 Dec 2008) | 5 lines
author: Manuel Moos
Reduced per-netobject/per-client memory cost.
Upped dedicated server client limit to 32.
Added --with-maxclients configure argument.
------------------------------------------------------------------------
r8648 | bazaarmagetron | 2008-12-09 17:36:59 +0100 (Tue, 09 Dec 2008) | 2 lines
Daniel Lee Harple: More files to ignore
------------------------------------------------------------------------
r8647 | bazaarmagetron | 2008-12-09 17:35:44 +0100 (Tue, 09 Dec 2008) | 2 lines
Daniel Lee Harple: Fixed touch typo
------------------------------------------------------------------------
r8646 | bazaarmagetron | 2008-12-09 16:32:44 +0100 (Tue, 09 Dec 2008) | 2 lines
Daniel Lee Harple: use const
------------------------------------------------------------------------
r8645 | bazaarmagetron | 2008-12-09 12:29:28 +0100 (Tue, 09 Dec 2008) | 2 lines
Manuel Moos: Less noisy OpenGL error reporting.
------------------------------------------------------------------------
r8644 | bazaarmagetron | 2008-12-09 07:37:58 +0100 (Tue, 09 Dec 2008) | 2 lines
Daniel Lee Harple: Corrected conditional
------------------------------------------------------------------------
r8643 | bazaarmagetron | 2008-12-09 07:37:14 +0100 (Tue, 09 Dec 2008) | 7 lines
author: Daniel Lee Harple
?\226?\128?\162 Added option for a validate function on setting items (ShouldChangeFuncT) that determines whether or not a value should be changed.
?\226?\128?\162 Added validate function to restrict MAX_CLIENTS.
?\226?\128?\162 Added $max_clients_limit language string.
TODO: update constructors for rest of configuration types.
------------------------------------------------------------------------
r8642 | nemostultae | 2008-12-09 00:42:14 +0100 (Tue, 09 Dec 2008) | 4 lines
?\226?\128?\162 Use batch/make/version to determine version on Mac OS X.
?\226?\128?\162 Generate dated version on bzr releases on Mac OS X.
?\226?\128?\162 Set batch/make/version executable.
------------------------------------------------------------------------
r8641 | nemostultae | 2008-12-09 00:40:06 +0100 (Tue, 09 Dec 2008) | 2 lines
Silence warning on Mac OS X about s_topSourceDir
------------------------------------------------------------------------
r8639 | nemostultae | 2008-12-08 04:27:09 +0100 (Mon, 08 Dec 2008) | 2 lines
Remove Info.plist from Copy build phase.
------------------------------------------------------------------------
r8638 | bazaarmagetron | 2008-12-07 01:26:37 +0100 (Sun, 07 Dec 2008) | 2 lines
Manuel Moos: More adaptions to GCC 4.3.
------------------------------------------------------------------------
r8637 | bazaarmagetron | 2008-12-07 01:25:40 +0100 (Sun, 07 Dec 2008) | 2 lines
Manuel Moos: Disabling signed overflow warnings. They happen easily with templates.
------------------------------------------------------------------------
r8636 | bazaarmagetron | 2008-12-07 01:24:59 +0100 (Sun, 07 Dec 2008) | 2 lines
Manuel Moos: Added detection for newer versions of Mesa Software rendering.
------------------------------------------------------------------------
r8635 | bazaarmagetron | 2008-12-07 01:24:05 +0100 (Sun, 07 Dec 2008) | 2 lines
Manuel Moos: Oops, corrected memset (had value and len parameters swapped).
------------------------------------------------------------------------
r8634 | bazaarmagetron | 2008-12-07 00:55:32 +0100 (Sun, 07 Dec 2008) | 2 lines
Manuel Moos: First batch of adaptions to new warnings of GCC 4.3.
------------------------------------------------------------------------
r8633 | bazaarmagetron | 2008-12-07 00:15:50 +0100 (Sun, 07 Dec 2008) | 2 lines
Manuel Moos: -Wconversion got a lot more pedantic and annoying in GCC 4.3, so moving it up one code level.
------------------------------------------------------------------------
r8632 | bazaarmagetron | 2008-12-06 21:43:47 +0100 (Sat, 06 Dec 2008) | 2 lines
Manuel Moos: Model rendering uses display lists even if they're blacklisted (but not if they're deselected in the menu.)
------------------------------------------------------------------------
r8630 | bazaarmagetron | 2008-12-06 00:32:30 +0100 (Sat, 06 Dec 2008) | 7 lines
author: Manuel Moos
Teams that haven't played a single round are now potentially given a new color at round start.
Hopefully, this is the really final good way to fix bug 261469.
Also, the recoloring if colorIndex >= maxTeams only happens in the
elimination mode where the highest colored team gets eliminated first
to avoid confusion by too many recolorings.
------------------------------------------------------------------------
r8629 | bazaarmagetron | 2008-12-05 18:46:46 +0100 (Fri, 05 Dec 2008) | 2 lines
Manuel Moos: Redder default red.
------------------------------------------------------------------------
r8628 | bazaarmagetron | 2008-12-05 18:37:48 +0100 (Fri, 05 Dec 2008) | 4 lines
author: Manuel Moos
Team color index is now guaranteed to be < (SP_)TEAMS_MAX.
Fixes bug 261469.
------------------------------------------------------------------------
r8627 | bazaarmagetron | 2008-12-05 18:23:11 +0100 (Fri, 05 Dec 2008) | 2 lines
Manuel Moos: Fixed playback errros when browsing the master list; duplicate server entries were not taken care of on playback, only while recording, causing a mismatch of network message IDs later.
------------------------------------------------------------------------
r8626 | bazaarmagetron | 2008-12-05 15:06:40 +0100 (Fri, 05 Dec 2008) | 4 lines
author: Manuel Moos
No more client state changes in display lists or list deletions in glBegin/glEnd blocks (both should have been harmless, but the list deletions definitely were outside of the GL specs.
Added python script checking bugle trace logs for stuff like that.
------------------------------------------------------------------------
r8625 | bazaarmagetron | 2008-12-05 12:05:41 +0100 (Fri, 05 Dec 2008) | 2 lines
Manuel Moos: Only logging address if it changed.
------------------------------------------------------------------------
r8624 | bazaarmagetron | 2008-12-04 13:02:32 +0100 (Thu, 04 Dec 2008) | 2 lines
Manuel Moos: Also closing all glBegin() blocks before calling glEndList().
------------------------------------------------------------------------
r8623 | bazaarmagetron | 2008-12-04 13:01:36 +0100 (Thu, 04 Dec 2008) | 5 lines
author: Manuel Moos
Fixed OpenGL errors:
- avoiding nested glBegin()s with model rendering
- avoiding to call display lists when a glBegin() block is open
------------------------------------------------------------------------
r8622 | bazaarmagetron | 2008-12-03 23:51:09 +0100 (Wed, 03 Dec 2008) | 2 lines
Manuel Moos: Fixed invalid setting.
------------------------------------------------------------------------
r8621 | bazaarmagetron | 2008-12-03 23:16:08 +0100 (Wed, 03 Dec 2008) | 2 lines
Manuel Moos: Removed default debug grid again.
------------------------------------------------------------------------
r8620 | bazaarmagetron | 2008-12-03 23:15:22 +0100 (Wed, 03 Dec 2008) | 4 lines
author: Manuel Moos
Removed limits on ports in server bookmark and custom connect menus.
Fixes #253978.
------------------------------------------------------------------------
r8619 | bazaarmagetron | 2008-12-03 19:48:00 +0100 (Wed, 03 Dec 2008) | 2 lines
Manuel Moos: Added removal of some created directories on uninstall via script.
------------------------------------------------------------------------
r8618 | bazaarmagetron | 2008-12-03 19:47:06 +0100 (Wed, 03 Dec 2008) | 2 lines
Manuel Moos: Urgh. Left some disorienting experimental code in the last commit.
------------------------------------------------------------------------
r8617 | bazaarmagetron | 2008-12-03 19:46:23 +0100 (Wed, 03 Dec 2008) | 2 lines
Manuel Moos: small refactoring of glance reset.
------------------------------------------------------------------------
r8616 | bazaarmagetron | 2008-12-02 23:46:42 +0100 (Tue, 02 Dec 2008) | 5 lines
author: Manuel Moos
Replaced checks whether a player is in game with ->CurrentTeam(), they
were using IsSpectating(), which doesn't work with AUTO_TEAM 0.
Fixes 241593.
------------------------------------------------------------------------
r8615 | bazaarmagetron | 2008-12-02 21:29:54 +0100 (Tue, 02 Dec 2008) | 2 lines
epsy: fixed bug 303239
------------------------------------------------------------------------
r8614 | bazaarmagetron | 2008-12-02 21:28:39 +0100 (Tue, 02 Dec 2008) | 2 lines
epsy: fixed compilation errors with zthread on
------------------------------------------------------------------------
r8613 | bazaarmagetron | 2008-12-02 14:50:38 +0100 (Tue, 02 Dec 2008) | 2 lines
Manuel Moos: Better distinction between green and gold.
------------------------------------------------------------------------
r8612 | bazaarmagetron | 2008-12-02 14:49:33 +0100 (Tue, 02 Dec 2008) | 2 lines
Manuel Moos: Fixed crash in string search (triggered, for example, with friend search in the server browser).
------------------------------------------------------------------------
r8611 | bazaarmagetron | 2008-11-30 15:34:59 +0100 (Sun, 30 Nov 2008) | 2 lines
epsy: fix non-zthread builds, add a message whenever getting an IP address from masters
------------------------------------------------------------------------
r8603 | bazaarmagetron | 2008-11-28 22:44:18 +0100 (Fri, 28 Nov 2008) | 52 lines
author: Bazaarmagetron
Automatic merging of commits that would change history order:
------------------------------------------------------------
revno: 905.1.7
committer: Manuel Moos <z-...@us...>
branch nick: armagetronad
timestamp: Mon 2008-11-24 23:32:33 +0100
message:
Clarified vote_redunant a bit.
------------------------------------------------------------
revno: 905.1.6
committer: epsy <ep...@fr...>
branch nick: 0.2.8-armagetronad-work
timestamp: Sun 2008-11-23 18:59:27 +0100
message:
disable pthread
------------------------------------------------------------
revno: 905.1.5
committer: epsy <ep...@fr...>
branch nick: 0.2.8
timestamp: Mon 2008-10-27 12:41:42 +0100
message:
Fix Durka's issue
------------------------------------------------------------
revno: 905.1.4
committer: epsy <ep...@fr...>
branch nick: 0.2.8
timestamp: Sat 2008-10-25 14:39:52 +0200
message:
Fixed bug #287683.
------------------------------------------------------------
revno: 905.1.3
committer: epsy <ep...@fr...>
branch nick: 0.2.8
timestamp: Fri 2008-10-24 18:59:30 +0200
message:
feedback for /listadmins and /listplayers
------------------------------------------------------------
revno: 905.1.2
committer: epsy <ep...@fr...>
branch nick: 0.2.8
timestamp: Fri 2008-10-24 18:20:20 +0200
message:
KRAWALL -> KRAWALL_SERVER X_x
------------------------------------------------------------
revno: 905.1.1
committer: epsy <ep...@fr...>
branch nick: 0.2.8
timestamp: Fri 2008-10-24 18:12:10 +0200
message:
Default LEGACY_LOG_NAMES to true on non-authentication builds.
------------------------------------------------------------------------
r8599 | luke-jr | 2008-10-22 22:01:45 +0200 (Wed, 22 Oct 2008) | 2 lines
http://sourceware.org/ml/libc-help/2008-05/msg00072.html
it is necessary to either pthread_mutexattr_init or not specify a mutexattr
------------------------------------------------------------------------
r8597 | luke-jr | 2008-10-19 01:38:56 +0200 (Sun, 19 Oct 2008) | 1 line
todo in trunk
------------------------------------------------------------------------
r8594 | luke-jr | 2008-10-18 22:49:59 +0200 (Sat, 18 Oct 2008) | 1 line
this seems to fix pthreads-- please test!
------------------------------------------------------------------------
r8593 | bazaarmagetron | 2008-10-18 21:35:14 +0200 (Sat, 18 Oct 2008) | 1 line
Bazaarmagetron: Empty merge to keep the peace between svn and bzr.
------------------------------------------------------------------------
r8592 | luke-jr | 2008-10-18 19:50:23 +0200 (Sat, 18 Oct 2008) | 1 line
epsys patch for pthreads
------------------------------------------------------------------------
r8591 | luke-jr | 2008-10-18 19:36:16 +0200 (Sat, 18 Oct 2008) | 1 line
epsy or bzr messed up; this disables pthread again
------------------------------------------------------------------------
r8590 | bazaarmagetron | 2008-10-18 16:55:48 +0200 (Sat, 18 Oct 2008) | 1 line
epsy: Disable /listadmins in authentication-disabled builds, too
------------------------------------------------------------------------
r8589 | luke-jr | 2008-10-12 00:27:36 +0200 (Sun, 12 Oct 2008) | 3 lines
disable pthread support for now
REVERT THIS WHEN FIXED
------------------------------------------------------------------------
r8588 | luke-jr | 2008-10-12 00:24:34 +0200 (Sun, 12 Oct 2008) | 8 lines
Reverted epsy's revert
Will follow up with configure-disabling
------------------------------------------------------------------------
r8587 | bazaarmagetron | 2008-10-11 12:54:01 -0500 (Sat, 11 Oct 2008) | 2 lines
epsy: Removed luke's breaking changes, as they are breaking and have been given no attention in weeks.
------------------------------------------------------------------------
r8587 | bazaarmagetron | 2008-10-11 19:54:01 +0200 (Sat, 11 Oct 2008) | 2 lines
epsy: Removed luke's breaking changes, as they are breaking and have been given no attention in weeks.
------------------------------------------------------------------------
r8585 | bazaarmagetron | 2008-09-30 19:15:57 +0200 (Tue, 30 Sep 2008) | 2 lines
epsy: remove references to the /admins command from non-dedicated builds
------------------------------------------------------------------------
r8584 | bazaarmagetron | 2008-09-30 19:10:29 +0200 (Tue, 30 Sep 2008) | 2 lines
epsy: /admins now shows access levels made with AUTHORITY_LEVEL, too
------------------------------------------------------------------------
r8583 | bazaarmagetron | 2008-09-30 17:39:24 +0200 (Tue, 30 Sep 2008) | 1 line
epsy: Show number of results when using the search function of /players
------------------------------------------------------------------------
r8582 | bazaarmagetron | 2008-09-30 00:43:47 +0200 (Tue, 30 Sep 2008) | 2 lines
epsy: Whoops, forgot that
------------------------------------------------------------------------
r8581 | bazaarmagetron | 2008-09-29 23:53:35 +0200 (Mon, 29 Sep 2008) | 2 lines
epsy: Made UNSILENCE alias of VOICE
------------------------------------------------------------------------
r8580 | bazaarmagetron | 2008-09-29 23:51:36 +0200 (Mon, 29 Sep 2008) | 2 lines
epsy: Revamped the /admins command
------------------------------------------------------------------------
r8569 | bazaarmagetron | 2008-09-28 23:20:59 +0200 (Sun, 28 Sep 2008) | 2 lines
epsy: allow an authority to claim one to be from another authority, as long as the two authorities share the same base domain
------------------------------------------------------------------------
r8568 | bazaarmagetron | 2008-09-25 23:20:24 +0200 (Thu, 25 Sep 2008) | 2 lines
epsy: fix some confusion with VOTES_SUSPEND and VOTING_SUSPEND
------------------------------------------------------------------------
r8567 | bazaarmagetron | 2008-09-18 02:13:20 +0200 (Thu, 18 Sep 2008) | 2 lines
epsy: winzone min rount/last death times are now REALs, allowing moar than 21797296784 years of waiting for winzone
------------------------------------------------------------------------
r8566 | bazaarmagetron | 2008-09-16 19:27:52 +0200 (Tue, 16 Sep 2008) | 1 line
epsy: Whoops, forgot to remove that
------------------------------------------------------------------------
r8565 | luke-jr | 2008-09-16 18:51:15 +0200 (Tue, 16 Sep 2008) | 1 line
duh, missing file
------------------------------------------------------------------------
r8564 | luke-jr | 2008-09-15 21:25:12 +0200 (Mon, 15 Sep 2008) | 1 line
pthread support for armathentication; someone please test
------------------------------------------------------------------------
r8563 | bazaarmagetron | 2008-09-13 22:14:16 +0200 (Sat, 13 Sep 2008) | 2 lines
epsy46: AUTHORITY_LEVEL, finally :)
------------------------------------------------------------------------
r8561 | bazaarmagetron | 2008-09-10 16:39:26 +0200 (Wed, 10 Sep 2008) | 2 lines
epsy46: fixed some of the missing command help texts
------------------------------------------------------------------------
r8560 | bazaarmagetron | 2008-09-10 15:17:19 +0200 (Wed, 10 Sep 2008) | 2 lines
epsy46: give admins a message when a name-locked buddy "tries" to rename
------------------------------------------------------------------------
r8550 | bazaarmagetron | 2008-09-08 12:23:26 +0200 (Mon, 08 Sep 2008) | 2 lines
Manuel Moos: Removed includes.
------------------------------------------------------------------------
r8549 | bazaarmagetron | 2008-09-08 11:52:52 +0200 (Mon, 08 Sep 2008) | 2 lines
Manuel Moos: Of course, pure touch does not clear the files, as the purpose of the echo command was.
------------------------------------------------------------------------
r8548 | luke-jr | 2008-09-06 22:17:22 +0200 (Sat, 06 Sep 2008) | 1 line
echo is not portable, so use touch and printf
------------------------------------------------------------------------
r8547 | bazaarmagetron | 2008-09-06 11:44:31 +0200 (Sat, 06 Sep 2008) | 5 lines
author: Manuel Moos
Made copy constuctor of tList<> private.
Added swap function to compensate.
Fixed some fallout in the memory manager and menus.
------------------------------------------------------------------------
r8546 | bazaarmagetron | 2008-09-02 16:19:48 +0200 (Tue, 02 Sep 2008) | 2 lines
epsy46: /login and /logout are now spam-tested
------------------------------------------------------------------------
r8544 | bazaarmagetron | 2008-09-01 18:58:39 +0200 (Mon, 01 Sep 2008) | 2 lines
epsy46: Spectators didn't get a message saying they couldn't vote when using the chat interface
------------------------------------------------------------------------
r8528 | bazaarmagetron | 2008-08-31 22:26:50 +0200 (Sun, 31 Aug 2008) | 2 lines
Manuel Moos: Added clearing of textures/display lists after the app gets reactivated.
------------------------------------------------------------------------
r8527 | bazaarmagetron | 2008-08-25 21:05:30 +0200 (Mon, 25 Aug 2008) | 1 line
epsy46: enough with it, backported /console
------------------------------------------------------------------------
r8521 | bazaarmagetron | 2008-08-23 21:19:21 +0200 (Sat, 23 Aug 2008) | 2 lines
epsy46: replaced the ctxt is NULL error with something more useful
------------------------------------------------------------------------
r8520 | bazaarmagetron | 2008-08-19 21:55:06 +0200 (Tue, 19 Aug 2008) | 2 lines
Manuel Moos: Fixed crash where missing normals/texture coordinates caused model rendering crash.
------------------------------------------------------------------------
r8514 | bazaarmagetron | 2008-08-13 14:57:25 +0200 (Wed, 13 Aug 2008) | 2 lines
Manuel Moos: Fixed various instant win condition time problems.
------------------------------------------------------------------------
r8513 | bazaarmagetron | 2008-08-05 22:55:34 +0200 (Tue, 05 Aug 2008) | 2 lines
Manuel Moos: Added display list usage blacklist, only member so far: Mesa.
------------------------------------------------------------------------
r8511 | bazaarmagetron | 2008-08-02 10:43:07 +0200 (Sat, 02 Aug 2008) | 2 lines
Manuel Moos: Some display list assertions and safety measures added.
------------------------------------------------------------------------
r8508 | bazaarmagetron | 2008-07-29 01:00:57 +0200 (Tue, 29 Jul 2008) | 3 lines
Fixed ADMINS command, output formatting leaves a lot to be desired
still.
------------------------------------------------------------------------
r8506 | bazaarmagetron | 2008-07-24 13:42:07 +0200 (Thu, 24 Jul 2008) | 2 lines
Fixed some warnings.
------------------------------------------------------------------------
r8505 | bazaarmagetron | 2008-07-21 19:01:06 +0200 (Mon, 21 Jul 2008) | 1 line
er, disable that
------------------------------------------------------------------------
r8504 | bazaarmagetron | 2008-07-21 18:59:57 +0200 (Mon, 21 Jul 2008) | 1 line
/admin catches tAbortLoadings, preventing the game from ending as soon as someone would say /admin casacl without arguments
------------------------------------------------------------------------
r8501 | nemostultae | 2008-07-07 20:24:41 +0200 (Mon, 07 Jul 2008) | 2 lines
Added Polish translation by Rafal Cieslak http://forums.armagetronad.net/viewtopic.php?t=18480&start=15
------------------------------------------------------------------------
r8500 | bazaarmagetron | 2008-07-04 22:53:39 +0200 (Fri, 04 Jul 2008) | 2 lines
epsy46: /players now shows your own IP and network version
------------------------------------------------------------------------
r8499 | bazaarmagetron | 2008-07-04 22:13:20 +0200 (Fri, 04 Jul 2008) | 2 lines
epsy46: Add myself as dev in AUTHORS
------------------------------------------------------------------------
r8498 | bazaarmagetron | 2008-07-04 21:42:02 +0200 (Fri, 04 Jul 2008) | 2 lines
epsy46: /players tells you your search query and tells you if your search didn't return anything
------------------------------------------------------------------------
r8497 | bazaarmagetron | 2008-07-04 02:27:08 +0200 (Fri, 04 Jul 2008) | 1 line
epsy46: CLIENT! Stop eating your own name! :@
------------------------------------------------------------------------
r8496 | bazaarmagetron | 2008-07-04 01:53:55 +0200 (Fri, 04 Jul 2008) | 1 line
epsy46: Typo.
------------------------------------------------------------------------
r8495 | bazaarmagetron | 2008-07-04 01:23:37 +0200 (Fri, 04 Jul 2008) | 2 lines
epsy46: No, it's really not that i love this line, really not
------------------------------------------------------------------------
r8494 | bazaarmagetron | 2008-07-04 01:01:04 +0200 (Fri, 04 Jul 2008) | 2 lines
epsy46: /op would complain that the admin's "victim is already at maximal rights" when /op'ping an auth'd player without an access level as argument, trough the player could be still promoted
------------------------------------------------------------------------
r8493 | bazaarmagetron | 2008-06-20 22:20:06 +0200 (Fri, 20 Jun 2008) | 2 lines
epsy46: UNLOCK_ALL_TEAMS
------------------------------------------------------------------------
r8492 | bazaarmagetron | 2008-06-20 21:58:44 +0200 (Fri, 20 Jun 2008) | 2 lines
epsy46: TEAM_ELIMINATION_MODE defines the way ArmagetronAd should eliminate teams when there's more teams than TEAMS_MAX: Set to 0 it will try to keep as many players as possible, kicking teams that have the lowest score if teams are balanced; Set to 1 it will try to keep the best team colors (Team blue, then Team gold, then Team red, etc); Set to 2 it will kick out the teams that have the lowest score, regardless of balance. Copy-paste ftw.
------------------------------------------------------------------------
r8491 | bazaarmagetron | 2008-06-20 12:44:44 +0200 (Fri, 20 Jun 2008) | 2 lines
epsy46: fixed redundant " is not allowed to rename to <name>" messages on the client
------------------------------------------------------------------------
r8490 | bazaarmagetron | 2008-06-19 19:09:18 +0200 (Thu, 19 Jun 2008) | 2 lines
epsy46: fixed more stuff with /team messages upon invite
------------------------------------------------------------------------
r8488 | bazaarmagetron | 2008-06-15 01:09:23 +0200 (Sun, 15 Jun 2008) | 2 lines
Manuel Moos: Moved sn_supportRemoteLogins to a place where it is always available.
------------------------------------------------------------------------
r8487 | bazaarmagetron | 2008-06-12 22:39:41 +0200 (Thu, 12 Jun 2008) | 2 lines
epsy46: That was the most confusing message ver made.
------------------------------------------------------------------------
r8486 | bazaarmagetron | 2008-06-08 23:22:08 +0200 (Sun, 08 Jun 2008) | 2 lines
epsy46: Set most ACCESS_LEVEL_ settings only avaliable to owners
------------------------------------------------------------------------
r8485 | bazaarmagetron | 2008-06-08 21:00:45 +0200 (Sun, 08 Jun 2008) | 2 lines
epsy46: NEVER try ?\195?\130?\194?\171 generic socks ?\195?\130?\194?\187 when GLOBAL_ID is on if connection to a master server fails, otherwise it can generate weird mismatches when authing. This fixes bug #220195
------------------------------------------------------------------------
r8484 | bazaarmagetron | 2008-06-07 23:44:34 +0200 (Sat, 07 Jun 2008) | 2 lines
epsy46: fixed stuff with invites, spectators and /team messages
------------------------------------------------------------------------
r8482 | bazaarmagetron | 2008-05-26 11:25:14 +0200 (Mon, 26 May 2008) | 2 lines
Manuel Moos: Safeguard against deadlocks: play time can never be negative.
------------------------------------------------------------------------
r8468 | bazaarmagetron | 2008-05-18 17:32:59 +0200 (Sun, 18 May 2008) | 2 lines
epsy46: use colored team names here and there
------------------------------------------------------------------------
r8466 | bazaarmagetron | 2008-05-17 18:08:51 +0200 (Sat, 17 May 2008) | 2 lines
epsy46: VOTING_SUSPEND -> VOTES_SUSPEND
------------------------------------------------------------------------
r8465 | bazaarmagetron | 2008-05-15 18:34:31 +0200 (Thu, 15 May 2008) | 2 lines
epsy46: team name wasn't appearing properly in /teams
------------------------------------------------------------------------
r8464 | bazaarmagetron | 2008-05-14 14:31:12 +0200 (Wed, 14 May 2008) | 2 lines
epsy46: SP_TEAM_MAX_PLAYERS 0 no longer crashes the server
------------------------------------------------------------------------
r8463 | bazaarmagetron | 2008-05-12 23:26:25 +0200 (Mon, 12 May 2008) | 2 lines
epsy46: fixed stuff i didn't notice on first shot
------------------------------------------------------------------------
r8462 | bazaarmagetron | 2008-05-12 20:20:59 +0200 (Mon, 12 May 2008) | 2 lines
epsy46: moved things around, groupped --enable-krawall, --enable-armathentication and --enable-authentication, and slowly killing --disable-glout
------------------------------------------------------------------------
r8461 | bazaarmagetron | 2008-05-12 19:26:48 +0200 (Mon, 12 May 2008) | 2 lines
epsy46: woops :)
------------------------------------------------------------------------
r8460 | bazaarmagetron | 2008-05-12 18:51:27 +0200 (Mon, 12 May 2008) | 2 lines
epsy46: Fixed the color in "--> Teammates"; allow <<'ing and eTeam into a colorstring; also added eTeam::GetColoredName()
------------------------------------------------------------------------
r8459 | bazaarmagetron | 2008-05-12 14:29:54 +0200 (Mon, 12 May 2008) | 2 lines
epsy46: i got no clue what i did, but it works
------------------------------------------------------------------------
r8458 | bazaarmagetron | 2008-05-12 13:19:51 +0200 (Mon, 12 May 2008) | 2 lines
epsy46: fixed accidental commit ;)
------------------------------------------------------------------------
r8457 | bazaarmagetron | 2008-05-12 13:18:18 +0200 (Mon, 12 May 2008) | 2 lines
epsy46: include nNetwork.h in ePlayer.cpp (hoax try this)
------------------------------------------------------------------------
r8456 | bazaarmagetron | 2008-05-11 12:18:57 +0200 (Sun, 11 May 2008) | 7 lines
author: epsy46
Serval changes:
* se_SecretConsoleOut is now _way_ more polyvalent
* Forcing an UpdateName() upon auth
* Admin commands are now logged with username(or (G)?ID, if the user is logged in), and are showed to everyone in the server who have an access level better than ACCESS_LEVEL_SPY_CONSOLE
* (very minor) ./bootstrap.sh is now less intrusive regarding +x flagging
------------------------------------------------------------------------
r8455 | bazaarmagetron | 2008-05-07 13:30:41 +0200 (Wed, 07 May 2008) | 2 lines
wrtlprnft: Put the code to log score differences and the code to update the suspend count into separate functions. Needed for the sty+ct branch and I guess it's a good idea to minimize confusing function names :-)
------------------------------------------------------------------------
r8453 | bazaarmagetron | 2008-05-05 17:21:11 +0200 (Mon, 05 May 2008) | 7 lines
author: wrtlprnft
- fixed output of --doc: even if a command is exactly 30 characters long it gets a space before its description
- documentation for all ladderlog messages (useful for things like SACRIFICE)
- optional logging of chat to chatlog.txt
- optional logging of chat to ladderlog
- optional timestamps for console and ladderlog messages
------------------------------------------------------------------------
r8448 | bazaarmagetron | 2008-04-30 16:02:01 +0200 (Wed, 30 Apr 2008) | 2 lines
wrtlprnft: Output negative GAME_TIMEs, too, as a START_IN replacement
------------------------------------------------------------------------
r8446 | bazaarmagetron | 2008-04-28 17:49:35 +0200 (Mon, 28 Apr 2008) | 2 lines
epsy46: Do not read the diff :)
------------------------------------------------------------------------
r8444 | bazaarmagetron | 2008-04-28 16:03:46 +0200 (Mon, 28 Apr 2008) | 2 lines
epsy46: fixed mysterious nickname reverts
------------------------------------------------------------------------
r8443 | bazaarmagetron | 2008-04-28 15:22:06 +0200 (Mon, 28 Apr 2008) | 2 lines
epsy46: forcing name update when DeAuthenticating, fixing the /deop bug
------------------------------------------------------------------------
r8440 | bazaarmagetron | 2008-04-25 18:45:31 +0200 (Fri, 25 Apr 2008) | 2 lines
wrtlprnft: fixed warning when compiling the dedicated server
------------------------------------------------------------------------
r8439 | bazaarmagetron | 2008-04-25 18:44:06 +0200 (Fri, 25 Apr 2008) | 2 lines
wrtlprnft: New member function to eLadderLogWriter to avoid doing expensive calculation just to have them discarded because the output isn't enabled
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8438&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/.bzrignore
armagetronad/trunk/armagetronad/AUTHORS
armagetronad/trunk/armagetronad/Makefile.am
armagetronad/trunk/armagetronad/Makefile.manual
armagetronad/trunk/armagetronad/NEWS
armagetronad/trunk/armagetronad/acinclude.m4
armagetronad/trunk/armagetronad/batch/make/uninstall
armagetronad/trunk/armagetronad/batch/make/version
armagetronad/trunk/armagetronad/batch/serverstarter.in
armagetronad/trunk/armagetronad/batch/sysinstall.in
armagetronad/trunk/armagetronad/bootstrap.sh
armagetronad/trunk/armagetronad/config/default.cfg
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/languages.txt.in
armagetronad/trunk/armagetronad/src/defs.h
armagetronad/trunk/armagetronad/src/engine/eDisplay.cpp
armagetronad/trunk/armagetronad/src/engine/eGrid.cpp
armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
armagetronad/trunk/armagetronad/src/engine/ePlayer.h
armagetronad/trunk/armagetronad/src/engine/eSensor.cpp
armagetronad/trunk/armagetronad/src/engine/eTeam.cpp
armagetronad/trunk/armagetronad/src/engine/eTeam.h
armagetronad/trunk/armagetronad/src/engine/eVoter.cpp
armagetronad/trunk/armagetronad/src/network/nAuthentication.cpp
armagetronad/trunk/armagetronad/src/network/nConfig.h
armagetronad/trunk/armagetronad/src/network/nKrawall.cpp
armagetronad/trunk/armagetronad/src/network/nKrawall.h
armagetronad/trunk/armagetronad/src/network/nKrawallPrivate.cpp
armagetronad/trunk/armagetronad/src/network/nNetObject.cpp
armagetronad/trunk/armagetronad/src/network/nNetObject.h
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/render/rConsoleCout.cpp
armagetronad/trunk/armagetronad/src/render/rDisplayList.cpp
armagetronad/trunk/armagetronad/src/render/rDisplayList.h
armagetronad/trunk/armagetronad/src/render/rFont.cpp
armagetronad/trunk/armagetronad/src/render/rGL.cpp
armagetronad/trunk/armagetronad/src/render/rModel.cpp
armagetronad/trunk/armagetronad/src/render/rRender.cpp
armagetronad/trunk/armagetronad/src/render/rScreen.cpp
armagetronad/trunk/armagetronad/src/render/rScreen.h
armagetronad/trunk/armagetronad/src/render/rSysdep.cpp
armagetronad/trunk/armagetronad/src/tools/tArray.cpp
armagetronad/trunk/armagetronad/src/tools/tArray.h
armagetronad/trunk/armagetronad/src/tools/tCommandLine.cpp
armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp
armagetronad/trunk/armagetronad/src/tools/tConfiguration.h
armagetronad/trunk/armagetronad/src/tools/tHeap.cpp
armagetronad/trunk/armagetronad/src/tools/tList.h
armagetronad/trunk/armagetronad/src/tools/tMemManager.cpp
armagetronad/trunk/armagetronad/src/tools/tMemManager.h
armagetronad/trunk/armagetronad/src/tools/tString.cpp
armagetronad/trunk/armagetronad/src/tools/tString.h
armagetronad/trunk/armagetronad/src/tools/tToDo.cpp
armagetronad/trunk/armagetronad/src/tron/gAIBase.cpp
armagetronad/trunk/armagetronad/src/tron/gArmagetron.cpp
armagetronad/trunk/armagetronad/src/tron/gCycle.cpp
armagetronad/trunk/armagetronad/src/tron/gCycleMovement.cpp
armagetronad/trunk/armagetronad/src/tron/gGame.cpp
armagetronad/trunk/armagetronad/src/tron/gGame.h
armagetronad/trunk/armagetronad/src/tron/gMenus.cpp
armagetronad/trunk/armagetronad/src/tron/gParser.cpp
armagetronad/trunk/armagetronad/src/tron/gServerFavorites.cpp
armagetronad/trunk/armagetronad/src/tron/gWall.cpp
armagetronad/trunk/armagetronad/src/ui/uMenu.cpp
armagetronad/trunk/armagetronad/src/ui/uMenu.h
Added Paths:
-----------
armagetronad/trunk/armagetronad/batch/checkbugle.py
armagetronad/trunk/armagetronad/language/polish.txt
armagetronad/trunk/armagetronad/language/polish_transliterated.txt
armagetronad/trunk/armagetronad/src/tools/pthread-binding.h
Removed Paths:
-------------
armagetronad/trunk/armagetronad/todo-luke-jr.txt
Modified: armagetronad/trunk/armagetronad/.bzrignore
===================================================================
--- armagetronad/trunk/armagetronad/.bzrignore 2008-12-28 22:58:01 UTC (rev 8691)
+++ armagetronad/trunk/armagetronad/.bzrignore 2008-12-29 17:15:32 UTC (rev 8692)
@@ -1,3 +1,16 @@
+src/macosx/config_common.h
+src/macosx/English.lproj/InfoPlist.strings
+MacOS/Armagetron Advanced.xcodeproj/*.mode1v3
+MacOS/Armagetron Advanced.xcodeproj/*.pbxuser
+MacOS/build/
+macosx_build_information.yml
+*.DS_Store
+.gdbinit
+batch/rcd_config
+batch/rcd_server
+batch/rcd_startstop
+batch/serverstarter
+./armagetronad-dedicated
COPYING
ChangeLog
EclipseBuild
@@ -31,6 +44,7 @@
desktop/armagetronad.desktop
language/languages.txt
resource/included/
+resource/automatic/
.deps
src/armagetronad_main
src/nTrueVersion.h
Modified: armagetronad/trunk/armagetronad/AUTHORS
===================================================================
--- armagetronad/trunk/armagetronad/AUTHORS 2008-12-28 22:58:01 UTC (rev 8691)
+++ armagetronad/trunk/armagetronad/AUTHORS 2008-12-29 17:15:32 UTC (rev 8692)
@@ -81,10 +81,12 @@
pavelo
extension to the tab completion code
+Rafal Cieslak
+ Polish translation
+
Tomas Birraux
french accents in font
-
External code merged in from
============================
Modified: armagetronad/trunk/armagetronad/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/Makefile.am 2008-12-28 22:58:01 UTC (rev 8691)
+++ armagetronad/trunk/armagetronad/Makefile.am 2008-12-29 17:15:32 UTC (rev 8692)
@@ -33,7 +33,7 @@
endif
languagedata=language/english_base.txt language/english_base_notranslate.txt language/american.txt language/british.txt\
- language/deutsch.txt language/french.txt language/spanish.txt
+ language/deutsch.txt language/french.txt language/spanish.txt language/polish_transliterated.txt language/polish.txt
nobase_dist_language_DATA=language/languages.txt.in $(languagedata) language/update.py
@@ -105,7 +105,7 @@
install-uninstall: @srcdir@/batch/make/uninstall Makefile
$(install_sh_PROGRAM) $< $(uninstall_location)
rm $(uninstall_location)
- ROOTDIR=$(ROOTDIR) DESTDIR=$(DESTDIR) MAKE="$(MAKE)" PREFIX="${prefix}" PROGTITLE="${progtitle}" SCRIPTDIR="${scriptdir}" sh $< $(uninstall_location) "$(external_uninstall_cmd)"
+ ROOTDIR=$(ROOTDIR) DESTDIR=$(DESTDIR) MAKE="$(MAKE)" PREFIX="${prefix}" PROGTITLE="${progtitle}" PROGNAME="${progname}" SCRIPTDIR="${scriptdir}" sh $< $(uninstall_location) "$(external_uninstall_cmd)"
else
install-uninstall:
endif
Modified: armagetronad/trunk/armagetronad/Makefile.manual
===================================================================
--- armagetronad/trunk/armagetronad/Makefile.manual 2008-12-28 22:58:01 UTC (rev 8691)
+++ armagetronad/trunk/armagetronad/Makefile.manual 2008-12-29 17:15:32 UTC (rev 8692)
@@ -106,9 +106,11 @@
installcheck_douninstall.inst2:
./._inst2/$(bindir)/${uninstaller}
+ find ._inst2 -mindepth 1 -type d -name ${progname} -exec echo leftover directory \{\} >> .leftover.inst2 \;
installcheck_douninstall.inst3:
./._inst3/$(bindir)/${uninstaller}
+ find ._inst3 -mindepth 1 -type d -name ${progname} -exec echo leftover directory \{\} >> .leftover.inst3 \;
installcheck_uninstall.inst: installcheck_test.inst
installcheck_uninstall.%: installcheck_install.%
Modified: armagetronad/trunk/armagetronad/NEWS
===================================================================
--- armagetronad/trunk/armagetronad/NEWS 2008-12-28 22:58:01 UTC (rev 8691)
+++ armagetronad/trunk/armagetronad/NEWS 2008-12-29 17:15:32 UTC (rev 8692)
@@ -167,6 +167,10 @@
- All ladderlog outputs can be enabled or disabled separately by using
LADDERLOG_WRITE_*. LADDERLOG_WRITE_ALL enables or disables all ladderlog
output alltogether.
+- CHAT_LOG controls whether to write a machine-readable chatlog to
+ var/chatlog.txt
+- CONSOLE_DECORATE_TIMESTAMP write a timestamp for every console message?
+- LADDERLOG_DECORATE_TIMESTAMP prefix every ladderlog message with a timestamp?
- SLAP <player> [points] sends a message to everyone and subtracts a number
of points (default: 1) from <player>'s score. Negative points are
supported.
@@ -197,6 +201,7 @@
-----------
- /teams chat command that rougly prints team layout.
+- Added Polish language file
- clientside play time tracking and server controlled minimal required experience
to be allowed to play.
- color codes in chat increase the spam level logarithmically.
@@ -266,6 +271,7 @@
HELP_INTRODUCTORY_BLURB and ADD_HELP_TOPIC to control its contents
- /rtfm command that allows moderators to send help messages to newbies
- /players now shows the players' color and allows searching
+- TEAM_ELIMINATION_MODE sets the way ArmagetronAd removes teams when there's too much teams.
Bugfixes
--------
Modified: armagetronad/trunk/armagetronad/acinclude.m4
===================================================================
--- armagetronad/trunk/armagetronad/acinclude.m4 2008-12-28 22:58:01 UTC (rev 8691)
+++ armagetronad/trunk/armagetronad/acinclude.m4 2008-12-29 17:15:32 UTC (rev 8692)
@@ -63,7 +63,8 @@
AC_CONFIG_COMMANDS(universal_variables,[
# clear files
for f in src/tUniversalVariables.h.in.new universal_variables universal_variable_substitutions universal_variable_values.in universal_variable_values_makefile.new universal_variable_values_makefile_sed.new; do
- echo -n "" > $f
+ rm -f $f
+ touch $f
done
# prepare value inserting makefile:
@@ -98,7 +99,7 @@
# add C macro to prototype file (later modified by the makefile
# to contain the possibly modified variable values)
- echo -e "#ifndef ${variable_u}\n #define ${variable_u} \"@${variable}@\"\n#endif" >> src/tUniversalVariables.h.in.new
+ printf "#ifndef %s\n #define %s \"@%s@\"\n#endif\n" "${variable_u}" "${variable_u}" "${variable}" >> src/tUniversalVariables.h.in.new
# generate prototype for file containing the actual values of the variables
# echo ${variable}=@${variable}@ >> universal_variable_values.in
@@ -209,7 +210,9 @@
#echo ap=${ac_aa_pathvars}
# put the path names into a file
AC_CONFIG_COMMANDS(pathsubstitution,[
-echo -n "" > batch/relocate.in
+#clear the file
+rm -f batch/relocate.in
+touch batch/relocate.in
# generate path relocation sed script: replaces @foo_reloc@ with the
# output of `relocate @foo@`, where @foo@ itself is replaced during
@@ -898,3 +901,356 @@
rm -f conf.zthreadtest
])
+
+dnl Copyright \xA9 2008 Steven G. Johnson <st...@al...>
+dnl 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 3 of the License, or (at your option) any later version.
+dnl 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.
+dnl You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+dnl As a special exception, the respective Autoconf Macro's copyright owner gives unlimited permission to copy, distribute and modify the configure scripts that are the output of Autoconf when processing the Macro. You need not follow the terms of the GNU General Public License when using or distributing such scripts, even though portions of the text of the Macro appear in them. The GNU General Public License (GPL) does govern all other use of the material that constitutes the Autoconf Macro.
+dnl This special exception to the GPL applies to versions of the Autoconf Macro released by the Autoconf Macro Archive. When you make and distribute a modified version of the Autoconf Macro, you may extend this special exception to the GPL to apply to your modified version as well.
+
+AC_DEFUN([ACX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_SAVE
+AC_LANG_C
+acx_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+ AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
+ AC_MSG_RESULT($acx_pthread_ok)
+ if test x"$acx_pthread_ok" = xno; then
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+ fi
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try. Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important. Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+# other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+# doesn't hurt to check since this sometimes defines pthreads too;
+# also defines -D_REENTRANT)
+# ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case "${host_cpu}-${host_os}" in
+ *solaris*)
+
+ # On Solaris (at least, for some versions), libc contains stubbed
+ # (non-functional) versions of the pthreads routines, so link-based
+ # tests will erroneously succeed. (We need to link with -pthreads/-mt/
+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
+ # a function called by this macro, so we could check for that, but
+ # who knows whether they'll stub that too in a future libc.) So,
+ # we'll just look for -pthreads and -lpthread first:
+
+ acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
+ ;;
+esac
+
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+
+ case $flag in
+ none)
+ AC_MSG_CHECKING([whether pthreads work without any flags])
+ ;;
+
+ -*)
+ AC_MSG_CHECKING([whether pthreads work with $flag])
+ PTHREAD_CFLAGS="$flag"
+ ;;
+
+ pthread-config)
+ AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
+ if test x"$acx_pthread_config" = xno; then continue; fi
+ PTHREAD_CFLAGS="`pthread-config --cflags`"
+ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+ ;;
+
+ *)
+ AC_MSG_CHECKING([for the pthreads library -l$flag])
+ PTHREAD_LIBS="-l$flag"
+ ;;
+ esac
+
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Check for various functions. We must include pthread.h,
+ # since some functions may be macros. (On the Sequent, we
+ # need a special flag -Kthread to make this header compile.)
+ # We check for pthread_join because it is in -lpthread on IRIX
+ # while pthread_create is in libc. We check for pthread_attr_init
+ # due to DEC craziness with -lpthreads. We check for
+ # pthread_cleanup_push because it is one of the few pthread
+ # functions on Solaris that doesn't have a non-functional libc stub.
+ # We try pthread_create on general principles.
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_t th; pthread_join(th, 0);
+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+ [acx_pthread_ok=yes])
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ AC_MSG_RESULT($acx_pthread_ok)
+ if test "x$acx_pthread_ok" = xyes; then
+ break;
+ fi
+
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+ AC_MSG_CHECKING([for joinable pthread attribute])
+ attr_name=unknown
+ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+ AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
+ [attr_name=$attr; break])
+ done
+ AC_MSG_RESULT($attr_name)
+ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+ AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+ [Define to necessary symbol if this constant
+ uses a non-standard name on your system.])
+ fi
+
+ AC_MSG_CHECKING([if more special flags are required for pthreads])
+ flag=no
+ case "${host_cpu}-${host_os}" in
+ *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+ *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+ esac
+ AC_MSG_RESULT(${flag})
+ if test "x$flag" != xno; then
+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+ fi
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ # More AIX lossage: must compile with xlc_r or cc_r
+ if test x"$GCC" != xyes; then
+ AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
+ else
+ PTHREAD_CC=$CC
+ fi
+else
+ PTHREAD_CC="$CC"
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+ ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+ :
+else
+ acx_pthread_ok=no
+ $2
+fi
+AC_LANG_RESTORE
+])dnl ACX_PTHREAD
+
+
+dnl GPLed checks whether the current version of GCC supports a certain flag
+dnl source: http://autoconf-archive.cryp.to/ax_cflags_gcc_option.html
+dnl Copyright \xA9 2008 Guido U. Draheim <gu...@gm...>
+
+AC_DEFUN([AX_CFLAGS_GCC_OPTION_OLD], [dnl
+AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$2])dnl
+AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_C
+ ac_save_[]FLAGS="$[]FLAGS"
+for ac_arg dnl
+in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC
+ "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC
+ #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+ AC_TRY_COMPILE([],[return 0;],
+ [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+ .ok|.ok,*) m4_ifvaln($3,$3) ;;
+ .|.no|.no,*) m4_ifvaln($4,$4) ;;
+ *) m4_ifvaln($3,$3,[
+ if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
+ else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
+ fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+
+dnl the only difference - the LANG selection... and the default FLAGS
+
+AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_OLD], [dnl
+AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$2])dnl
+AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ ac_save_[]FLAGS="$[]FLAGS"
+for ac_arg dnl
+in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC
+ "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC
+ #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+ AC_TRY_COMPILE([],[return 0;],
+ [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+ .ok|.ok,*) m4_ifvaln($3,$3) ;;
+ .|.no|.no,*) m4_ifvaln($4,$4) ;;
+ *) m4_ifvaln($3,$3,[
+ if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
+ else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
+ fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+dnl -------------------------------------------------------------------------
+
+AC_DEFUN([AX_CFLAGS_GCC_OPTION_NEW], [dnl
+AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_option_$1])dnl
+AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_C
+ ac_save_[]FLAGS="$[]FLAGS"
+for ac_arg dnl
+in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC
+ "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC
+ #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+ AC_TRY_COMPILE([],[return 0;],
+ [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+ .ok|.ok,*) m4_ifvaln($3,$3) ;;
+ .|.no|.no,*) m4_ifvaln($4,$4) ;;
+ *) m4_ifvaln($3,$3,[
+ if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
+ else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
+ m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
+ fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+
+dnl the only difference - the LANG selection... and the default FLAGS
+
+AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_NEW], [dnl
+AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$1])dnl
+AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
+VAR,[VAR="no, unknown"
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ ac_save_[]FLAGS="$[]FLAGS"
+for ac_arg dnl
+in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC
+ "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC
+ #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+ AC_TRY_COMPILE([],[return 0;],
+ [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+ FLAGS="$ac_save_[]FLAGS"
+ AC_LANG_RESTORE
+])
+case ".$VAR" in
+ .ok|.ok,*) m4_ifvaln($3,$3) ;;
+ .|.no|.no,*) m4_ifvaln($4,$4) ;;
+ *) m4_ifvaln($3,$3,[
+ if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
+ else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
+ m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
+ fi ]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+AS_VAR_POPDEF([FLAGS])dnl
+])
+
+AC_DEFUN([AX_CFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
+[AX_CFLAGS_GCC_OPTION_NEW($@)],[AX_CFLAGS_GCC_OPTION_OLD($@)])])
+
+AC_DEFUN([AX_CXXFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
+[AX_CXXFLAGS_GCC_OPTION_NEW($@)],[AX_CXXFLAGS_GCC_OPTION_OLD($@)])])
Copied: armagetronad/trunk/armagetronad/batch/checkbugle.py (from rev 8691, armagetronad/branches/0.2.8/armagetronad/batch/checkbugle.py)
====================================================...
[truncated message content] |
|
From: <baz...@us...> - 2008-12-30 19:50:04
|
Revision: 8701
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8701&view=rev
Author: bazaarmagetron
Date: 2008-12-30 19:49:57 +0000 (Tue, 30 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Put generated files in build/Generated
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/rakefile.rb
armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake
armagetronad/trunk/armagetronad/MacOS/shared.xcconfig
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-21 13:26:03.523000002 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-30 12:31:03.480000019 -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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/rakefile.rb
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-30 19:38:44 UTC (rev 8700)
+++ armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-30 19:49:57 UTC (rev 8701)
@@ -23,6 +23,11 @@
combine_path_components(BUILD_DIR, *components)
end
+ # A path to a file in MacOS/build/Generated/
+ def self.generated_path(*components)
+ combine_path_components(build_path("Generated"), *components)
+ end
+
# A path to a file in MacOS/build/{Debug, etc}
def self.configuration_build_path(*components)
combine_path_components(CONFIGURATION_BUILD_DIR, *components)
@@ -91,7 +96,7 @@
end
task "remove-version" do
- rm_rf(AA::Config.build_path("src", "macosx"))
+ rm_rf(AA::Config.generated_path("src", "macosx"))
end
desc "Update version"
Modified: armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake 2008-12-30 19:38:44 UTC (rev 8700)
+++ armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake 2008-12-30 19:49:57 UTC (rev 8701)
@@ -1,6 +1,8 @@
module AA::Xcode
+ GENERATED_RESOURCE_DIR = AA::Config.generated_path("resource")
+
def self.process_file(orig, package_dir=nil)
- result_file = AA::Config.build_path(orig.ext)
+ result_file = AA::Config.generated_path(orig.ext)
orig = AA::Config.src_path(orig)
# Process the file (copy to build dir, replace tags)
@@ -27,6 +29,20 @@
task "package-files" => package_dest
end
end
+
+ def self.sort_resources
+ resource_included = AA::Config.combine_path_components(GENERATED_RESOURCE_DIR, "included")
+
+ if AA::Config::BUILD_TYPE == :development
+ sh %{"#{AA::Config::SRC_DIR}/batch/make/sortresources" \\
+ "#{AA::Config::SRC_DIR}/resource/proto" \\
+ #{AA::Config.escape_sh resource_included} \\
+ "#{AA::Config::SRC_DIR}/batch/make/sortresources.py"}
+ else
+ cp_r(AA::Config.src_path("resource"), AA::Config.generated_path)
+ end
+ end
+
end
namespace "xcode" do
@@ -35,21 +51,14 @@
task "cleanup" => ["package-files", "package-resouces"]
task "sort-resources" do
- if !File.exists?(AA::Config.build_path("resource"))
- if AA::Config::BUILD_TYPE == :development
- sh %{"#{AA::Config::SRC_DIR}/batch/make/sortresources" \\
- "#{AA::Config::SRC_DIR}/resource/proto" \\
- "#{AA::Config::BUILD_DIR}/resource/included" \\
- "#{AA::Config::SRC_DIR}/batch/make/sortresources.py"}
- else
- cp_r(AA::Config.src_path("resource"), AA::Config::BUILD_DIR)
- end
+ if !File.exists?(AA::Xcode::GENERATED_RESOURCE_DIR)
+ AA::Xcode.sort_resources
end
end
task "package-resouces" do
if !File.exists?(AA::Config.package_path("resource"))
- cp_r(AA::Config.build_path("resource"), AA::Config::PACKGAGE_RESOURCE_DIR)
+ cp_r(AA::Xcode::GENERATED_RESOURCE_DIR, AA::Config::PACKGAGE_RESOURCE_DIR)
end
end
Modified: armagetronad/trunk/armagetronad/MacOS/shared.xcconfig
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/shared.xcconfig 2008-12-30 19:38:44 UTC (rev 8700)
+++ armagetronad/trunk/armagetronad/MacOS/shared.xcconfig 2008-12-30 19:49:57 UTC (rev 8701)
@@ -1,6 +1,6 @@
SHARED_OTHER_LDFLAGS = -lxml2 -lz -lpthread -liconv -lm
SHARED_LIBRARY_SEARCH_PATHS = /Library/Frameworks/ArmagetronAdvanced/current
-SHARED_HEADER_SEARCH_PATHS = $(SYMROOT)/src/macosx ../src/tron ../src/tools ../src/engine/sound /usr/include/libxml2 /Library/Frameworks/ArmagetronAdvanced/current/include
+SHARED_HEADER_SEARCH_PATHS = $(SYMROOT)/Generated/src/macosx ../src/tron ../src/tools ../src/engine/sound /usr/include/libxml2 /Library/Frameworks/ArmagetronAdvanced/current/include
GCC_C_LANGUAGE_STANDARD = c99
SHARED_OTHER_CPLUSPLUSFLAGS = -Wno-long-double
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-30 19:50:56
|
Revision: 8702
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8702&view=rev
Author: bazaarmagetron
Date: 2008-12-30 19:50:50 +0000 (Tue, 30 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Top-level dir relative to PROJECT_DIR env variable, not the current file
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/rakefile.rb
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-30 12:31:03.480000019 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-30 12:42:04.417000055 -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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/rakefile.rb
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-30 19:49:57 UTC (rev 8701)
+++ armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-30 19:50:50 UTC (rev 8702)
@@ -61,8 +61,8 @@
str.to_s.gsub(/(?=[^a-zA-Z0-9_.\/\-\x7F-\xFF\n])/, '\\').gsub(/\n/, "'\n'").sub(/^$/, "''")
end
- # Paths are relative the Rakefile
- SRC_DIR = File.expand_path(File.dirname(__FILE__) + "/..")
+ # The top-level project directory
+ SRC_DIR = (ENV["PROJECT_DIR"] || File.dirname(__FILE__) + "/..") + "/.."
BUILD_DIR = ENV["SYMROOT"] || "build"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-30 19:51:40
|
Revision: 8703
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8703&view=rev
Author: bazaarmagetron
Date: 2008-12-30 19:51:33 +0000 (Tue, 30 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Moved AA::Config to config.rake
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/rakefile.rb
Added Paths:
-----------
armagetronad/trunk/armagetronad/MacOS/rakelib/config.rake
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-30 12:42:04.417000055 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-30 12:47:38.269999981 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
Modified: bzr:file-ids
-
+ MacOS/rakelib/config.rake config.rake-20081230174258-v5v2qhtfiz2bzs8g-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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/rakefile.rb
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-30 19:50:50 UTC (rev 8702)
+++ armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-30 19:51:33 UTC (rev 8703)
@@ -8,93 +8,6 @@
module AA
end
-module AA::Config
- def self.combine_path_components(base, *components)
- File.join(*([base] + components))
- end
-
- # A path to a file in src/
- def self.src_path(*components)
- combine_path_components(SRC_DIR, *components)
- end
-
- # A path to a file in MacOS/build/
- def self.build_path(*components)
- combine_path_components(BUILD_DIR, *components)
- end
-
- # A path to a file in MacOS/build/Generated/
- def self.generated_path(*components)
- combine_path_components(build_path("Generated"), *components)
- end
-
- # A path to a file in MacOS/build/{Debug, etc}
- def self.configuration_build_path(*components)
- combine_path_components(CONFIGURATION_BUILD_DIR, *components)
- end
-
- # A path to a file in the resource directory of the game.
- def self.package_path(*components)
- combine_path_components(PACKGAGE_RESOURCE_DIR, *components)
- end
-
- # The arch of the build
- def self.arch
- archs = (ENV["ARCHS"] || "i386").split
- if archs.length > 1
- "universal"
- else
- archs.first
- end
- end
-
- def self.version
- if BUILD_TYPE == :development
- %x("#{SRC_DIR}/batch/make/version" "#{SRC_DIR}").chomp
- else
- File.read("#{SRC_DIR}/src/macosx/version.h.in").scan(/#define VERSION "(.*)"/)[0][0]
- end
- end
-
- # escape text to make it useable in a shell script as one “word” (string)
- def self.escape_sh(str)
- str.to_s.gsub(/(?=[^a-zA-Z0-9_.\/\-\x7F-\xFF\n])/, '\\').gsub(/\n/, "'\n'").sub(/^$/, "''")
- end
-
- # The top-level project directory
- SRC_DIR = (ENV["PROJECT_DIR"] || File.dirname(__FILE__) + "/..") + "/.."
-
- BUILD_DIR = ENV["SYMROOT"] || "build"
-
- CONFIGURATION_BUILD_DIR = ENV["CONFIGURATION_BUILD_DIR"] || (BUILD_DIR + "/Debug")
-
- PRODUCT_NAME = ENV["PRODUCT_NAME"] || "Armagetron Advanced"
-
- DEDICATED = !!PRODUCT_NAME[/dedicated/i]
-
- # The Armagetron Advanced.app, or the Armagetron Advanced Dedicated directory
- PACKGAGE_RESOURCE_DIR_BASE = [
- CONFIGURATION_BUILD_DIR,
- DEDICATED ? nil : PRODUCT_NAME + (ENV["WRAPPER_SUFFIX"] || ".app")
- ].compact.join("/")
-
- # Where all the game data should go
- PACKGAGE_RESOURCE_DIR = [
- PACKGAGE_RESOURCE_DIR_BASE,
- DEDICATED ? nil : "Contents/Resources"
- ].compact.join("/")
-
- BUILD_TYPE = [src_path(".svn"), src_path(".bzr")].any? { |f| File.exists?(f) } ? :development : :release
-
- TAG_MAPPINGS = {
- "version" => version(),
- "year" => Time.now.strftime("%Y"),
- "progtitle" => PRODUCT_NAME,
- }
-
- PROGRAM_SHORT_NAME = DEDICATED ? "armagetronad-dedicated" : "armagetronad"
-end
-
task "remove-version" do
rm_rf(AA::Config.generated_path("src", "macosx"))
end
Added: armagetronad/trunk/armagetronad/MacOS/rakelib/config.rake
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakelib/config.rake (rev 0)
+++ armagetronad/trunk/armagetronad/MacOS/rakelib/config.rake 2008-12-30 19:51:33 UTC (rev 8703)
@@ -0,0 +1,86 @@
+module AA::Config
+ def self.combine_path_components(base, *components)
+ File.join(*([base] + components))
+ end
+
+ # A path to a file in src/
+ def self.src_path(*components)
+ combine_path_components(SRC_DIR, *components)
+ end
+
+ # A path to a file in MacOS/build/
+ def self.build_path(*components)
+ combine_path_components(BUILD_DIR, *components)
+ end
+
+ # A path to a file in MacOS/build/Generated/
+ def self.generated_path(*components)
+ combine_path_components(build_path("Generated"), *components)
+ end
+
+ # A path to a file in MacOS/build/{Debug, etc}
+ def self.configuration_build_path(*components)
+ combine_path_components(CONFIGURATION_BUILD_DIR, *components)
+ end
+
+ # A path to a file in the resource directory of the game.
+ def self.package_path(*components)
+ combine_path_components(PACKGAGE_RESOURCE_DIR, *components)
+ end
+
+ # The arch of the build
+ def self.arch
+ archs = (ENV["ARCHS"] || "i386").split
+ if archs.length > 1
+ "universal"
+ else
+ archs.first
+ end
+ end
+
+ def self.version
+ if BUILD_TYPE == :development
+ %x("#{SRC_DIR}/batch/make/version" "#{SRC_DIR}").chomp
+ else
+ File.read("#{SRC_DIR}/src/macosx/version.h.in").scan(/#define VERSION "(.*)"/)[0][0]
+ end
+ end
+
+ # escape text to make it useable in a shell script as one “word” (string)
+ def self.escape_sh(str)
+ str.to_s.gsub(/(?=[^a-zA-Z0-9_.\/\-\x7F-\xFF\n])/, '\\').gsub(/\n/, "'\n'").sub(/^$/, "''")
+ end
+
+ # The top-level project directory
+ SRC_DIR = (ENV["PROJECT_DIR"] || File.dirname(__FILE__) + "/..") + "/.."
+
+ BUILD_DIR = ENV["SYMROOT"] || "build"
+
+ CONFIGURATION_BUILD_DIR = ENV["CONFIGURATION_BUILD_DIR"] || (BUILD_DIR + "/Debug")
+
+ PRODUCT_NAME = ENV["PRODUCT_NAME"] || "Armagetron Advanced"
+
+ DEDICATED = !!PRODUCT_NAME[/dedicated/i]
+
+ # The Armagetron Advanced.app, or the Armagetron Advanced Dedicated directory
+ PACKGAGE_RESOURCE_DIR_BASE = [
+ CONFIGURATION_BUILD_DIR,
+ DEDICATED ? nil : PRODUCT_NAME + (ENV["WRAPPER_SUFFIX"] || ".app")
+ ].compact.join("/")
+
+ # Where all the game data should go
+ PACKGAGE_RESOURCE_DIR = [
+ PACKGAGE_RESOURCE_DIR_BASE,
+ DEDICATED ? nil : "Contents/Resources"
+ ].compact.join("/")
+
+ BUILD_TYPE = [src_path(".svn"), src_path(".bzr")].any? { |f| File.exists?(f) } ? :development : :release
+
+ TAG_MAPPINGS = {
+ "version" => version(),
+ "year" => Time.now.strftime("%Y"),
+ "progtitle" => PRODUCT_NAME,
+ }
+
+ PROGRAM_SHORT_NAME = DEDICATED ? "armagetronad-dedicated" : "armagetronad"
+end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-30 19:52:59
|
Revision: 8704
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8704&view=rev
Author: bazaarmagetron
Date: 2008-12-30 19:52:52 +0000 (Tue, 30 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Removed scripts dir from project.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-30 12:47:38.269999981 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-30 12:48:16.496999979 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
Modified: bzr:file-ids
- MacOS/rakelib/config.rake config.rake-20081230174258-v5v2qhtfiz2bzs8g-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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-30 19:51:33 UTC (rev 8703)
+++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-30 19:52:52 UTC (rev 8704)
@@ -61,7 +61,6 @@
/* 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 */; };
- 9B61EBC30B5FEF010018DEA7 /* scripts in Resources */ = {isa = PBXBuildFile; fileRef = 9B61EBBC0B5FEF010018DEA7 /* scripts */; };
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 */; };
@@ -77,7 +76,6 @@
9B83FE950B12161600878E8A /* Growl-WithInstaller.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B83FE940B12161600878E8A /* Growl-WithInstaller.framework */; };
9B83FF0F0B121B3100878E8A /* Growl-WithInstaller.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 9B83FE940B12161600878E8A /* Growl-WithInstaller.framework */; };
9BB5B9280D84605700BF5F1C /* InfoPlist.strings.in in Resources */ = {isa = PBXBuildFile; fileRef = 9BB5B9260D84605700BF5F1C /* InfoPlist.strings.in */; };
- 9BB7B3FF0D8246A2004FE8C3 /* scripts in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9B61EBBC0B5FEF010018DEA7 /* scripts */; };
9BB7B4000D8246A2004FE8C3 /* config in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BD7DAE20A2CAE0700D7033C /* config */; };
9BB7B4010D8246A2004FE8C3 /* language in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BD7DAFE0A2CAE1D00D7033C /* language */; };
9BB7B5E10D8302FA004FE8C3 /* eAdvWall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B5A60D8302FA004FE8C3 /* eAdvWall.cpp */; };
@@ -494,7 +492,6 @@
dstPath = .;
dstSubfolderSpec = 16;
files = (
- 9BB7B3FF0D8246A2004FE8C3 /* scripts in CopyFiles */,
9BB7B4000D8246A2004FE8C3 /* config in CopyFiles */,
9BB7B4010D8246A2004FE8C3 /* language in CopyFiles */,
);
@@ -509,7 +506,6 @@
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; };
- 9B61EBBC0B5FEF010018DEA7 /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = scripts; path = ../scripts; sourceTree = SOURCE_ROOT; };
9B77E6C80D8618B90022FDF2 /* xcode.rake */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = xcode.rake; sourceTree = "<group>"; };
9B77E6C90D8618B90022FDF2 /* rakefile.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = rakefile.rb; sourceTree = "<group>"; };
9B7CFE130EFCE74700126634 /* tResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tResource.cpp; sourceTree = "<group>"; };
@@ -1452,7 +1448,6 @@
children = (
9BB5B9240D84604400BF5F1C /* Info.plist */,
9BB7B6860D830352004FE8C3 /* English.lproj */,
- 9B61EBBC0B5FEF010018DEA7 /* scripts */,
9BD7DB7D0A2CE35600D7033C /* Armagetron Advanced.icns */,
9BD7DAE20A2CAE0700D7033C /* config */,
9BD7DAFE0A2CAE1D00D7033C /* language */,
@@ -1574,7 +1569,6 @@
9BD7DB3E0A2CAE4600D7033C /* textures in Resources */,
9BD7DB770A2CE28500D7033C /* SDLMain.nib in Resources */,
9BD7DB7E0A2CE35600D7033C /* Armagetron Advanced.icns in Resources */,
- 9B61EBC30B5FEF010018DEA7 /* scripts in Resources */,
9BB7B6730D830322004FE8C3 /* version.h.in in Resources */,
9BB5B9280D84605700BF5F1C /* InfoPlist.strings.in in Resources */,
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2008-12-30 19:54:00
|
Revision: 8705
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8705&view=rev
Author: bazaarmagetron
Date: 2008-12-30 19:53:57 +0000 (Tue, 30 Dec 2008)
Log Message:
-----------
Daniel Lee Harple: Added task to add a release to aabeta.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
armagetronad/trunk/armagetronad/MacOS/rakefile.rb
armagetronad/trunk/armagetronad/MacOS/rakelib/release.rake
Added Paths:
-----------
armagetronad/trunk/armagetronad/MacOS/rakelib/aabeta.rake
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-30 12:48:16.496999979 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-30 14:42:47.671000004 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
Modified: bzr:file-ids
-
+ MacOS/rakelib/aabeta.rake aabeta.rake-20081230194045-1bmf2dvvi1yifcad-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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-30 19:52:52 UTC (rev 8704)
+++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2008-12-30 19:53:57 UTC (rev 8705)
@@ -56,6 +56,18 @@
name = "Update Version";
productName = "Update Version";
};
+ 9B6377420F0AACC2009F661F /* Create AABeta Client Release */ = {
+ isa = PBXAggregateTarget;
+ buildConfigurationList = 9B63774C0F0AACF7009F661F /* Build configuration list for PBXAggregateTarget "Create AABeta Client Release" */;
+ buildPhases = (
+ 9B6377410F0AACC2009F661F /* ShellScript */,
+ );
+ dependencies = (
+ 9B6377510F0AAD60009F661F /* PBXTargetDependency */,
+ );
+ name = "Create AABeta Client Release";
+ productName = "Create AABeta Release";
+ };
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
@@ -469,6 +481,13 @@
remoteGlobalIDString = 9B3139EC0EFD0963009690D0;
remoteInfo = "Update Version";
};
+ 9B6377500F0AAD60009F661F /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 9B31399E0EFD0560009690D0 /* Create Client Release */;
+ remoteInfo = "Create Client Release";
+ };
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -1551,6 +1570,7 @@
9B31399E0EFD0560009690D0 /* Create Client Release */,
9B3139BD0EFD073A009690D0 /* Create Dedicated Release */,
9B3139D00EFD0773009690D0 /* Create Full Release */,
+ 9B6377420F0AACC2009F661F /* Create AABeta Client Release */,
9B3139EC0EFD0963009690D0 /* Update Version */,
);
};
@@ -1658,6 +1678,19 @@
shellPath = "/bin/bash -l";
shellScript = "rake update-version";
};
+ 9B6377410F0AACC2009F661F /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = "/bin/bash -l";
+ shellScript = "PRODUCT_NAME=\"Armagetron Advanced\" rake aabeta:release";
+ };
9BD7DB490A2CBA7A00D7033C /* Run script: Prepare */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -2014,6 +2047,11 @@
target = 9B3139EC0EFD0963009690D0 /* Update Version */;
targetProxy = 9B3139F10EFD0987009690D0 /* PBXContainerItemProxy */;
};
+ 9B6377510F0AAD60009F661F /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 9B31399E0EFD0560009690D0 /* Create Client Release */;
+ targetProxy = 9B6377500F0AAD60009F661F /* PBXContainerItemProxy */;
+ };
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
@@ -2244,6 +2282,27 @@
};
name = Release;
};
+ 9B6377430F0AACC2009F661F /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ PRODUCT_NAME = "Create AABeta Release";
+ };
+ name = Debug;
+ };
+ 9B6377440F0AACC2009F661F /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ PRODUCT_NAME = "Create AABeta Release";
+ ZERO_LINK = NO;
+ };
+ name = Release;
+ };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -2310,6 +2369,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
+ 9B63774C0F0AACF7009F661F /* Build configuration list for PBXAggregateTarget "Create AABeta Client Release" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 9B6377430F0AACC2009F661F /* Debug */,
+ 9B6377440F0AACC2009F661F /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
/* End XCConfigurationList section */
};
rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
Modified: armagetronad/trunk/armagetronad/MacOS/rakefile.rb
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-30 19:52:52 UTC (rev 8704)
+++ armagetronad/trunk/armagetronad/MacOS/rakefile.rb 2008-12-30 19:53:57 UTC (rev 8705)
@@ -8,6 +8,11 @@
module AA
end
+import "rakelib/config.rake"
+import "rakelib/xcode.rake"
+import "rakelib/release.rake"
+import "rakelib/aabeta.rake"
+
task "remove-version" do
rm_rf(AA::Config.generated_path("src", "macosx"))
end
Added: armagetronad/trunk/armagetronad/MacOS/rakelib/aabeta.rake
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakelib/aabeta.rake (rev 0)
+++ armagetronad/trunk/armagetronad/MacOS/rakelib/aabeta.rake 2008-12-30 19:53:57 UTC (rev 8705)
@@ -0,0 +1,125 @@
+# For this to work correctly, you must have an entry like the following in your ~/.ssh/config:
+#
+# Host aabeta
+# HostName beta.armagetronad.net
+# User ...
+#
+
+module AA::AABeta
+
+ def self.version_branch
+ File.read(AA::Config.src_path("major_version")).chomp
+ end
+
+ RELEASES_LIST_DIR = AA::Config.generated_path("www-aabeta")
+ RELEASES_LIST = AA::Config.generated_path("www-aabeta/releases.php")
+
+ DMG_NAME = AA::Release.dmg_name + ".dmg"
+ DMG_FILE = AA::Release.dmg_path + ".dmg"
+ BETA_DIR_SHORT = "#{version_branch()}/#{AA::Config.version}"
+ BETA_DIR = "/var/www/armagetron/distfiles/#{BETA_DIR_SHORT}"
+
+ SORT_BY = %w[file source branch date tag os arch format packager server]
+
+ def self.upload(file, beta_dir)
+ beta_file = AA::Config.combine_path_components(beta_dir, file.pathmap("%f"))
+
+ sh("ssh aabeta mkdir -m 2775 -p #{beta_dir}")
+ sh("scp #{AA::Config.escape_sh file} aabeta:#{beta_dir}")
+ sh("ssh aabeta chmod 664 #{beta_file}")
+ end
+
+ def self.add_to_releases_list(params)
+ assoc = make_php_assoc(params)
+
+ releases = File.readlines(RELEASES_LIST)
+ insert_at = releases.index("/* === INSERT NEW RELEASES AFTER THIS LINE === */\n")
+
+ releases.insert(insert_at + 1, assoc)
+
+ File.open(RELEASES_LIST, "w") do |f|
+ f.write(releases.join)
+ end
+ end
+
+ # Returns a php assoc suitable to be put into releases.php
+ def self.make_php_assoc(params)
+ # Make the release in the same order as others
+ php_params = params.to_a.sort_by { |(key, _)| SORT_BY.index(key) }.map { |(k, v)| " '#{k}' => '#{v}'" }
+
+ "array(\n" + php_params.join(",\n") + "\n),\n"
+ end
+
+
+ def self.checkout_releases_list
+ sh("svn co -N \\
+ https://armagetronad.svn.sourceforge.net/svnroot/armagetronad/www/beta/trunk/www-aabeta \\
+ #{AA::Config.escape_sh RELEASES_LIST_DIR}")
+ end
+
+ def self.update_releases_list
+ sh("svn up #{AA::Config.escape_sh RELEASES_LIST}")
+ end
+
+ def self.commit_releases_list(file_name)
+ msg = AA::Config.escape_sh("Added #{file_name}")
+ sh("svn ci -m #{msg} #{AA::Config.escape_sh RELEASES_LIST}")
+ end
+
+ def self.arch
+ archs = (ENV["ARCHS"] || "i386").split
+ if archs.length > 1
+ "ppc_32 & x86_32"
+ else
+ archs[0]
+ end
+ end
+
+ def self.packager
+ ENV["AABETA_PACKAGER"] || "dlh"
+ end
+
+end
+
+namespace "aabeta" do
+
+ task "checkout" do
+ if !File.exist?(AA::AABeta::RELEASES_LIST_DIR)
+ AA::AABeta.checkout_releases_list
+ end
+ end
+
+ task "update" do
+ AA::AABeta.update_releases_list
+ end
+
+ task "upload" do
+ AA::AABeta.upload(AA::AABeta::DMG_FILE, AA::AABeta::BETA_DIR)
+ end
+
+ task "add-to-releases" do
+ dmg = AA::Release.dmg_name + ".dmg"
+
+ params = {
+ "file" => "#{AA::AABeta::BETA_DIR_SHORT}/#{AA::AABeta::DMG_NAME}",
+ "branch" => AA::AABeta.version_branch,
+ "date" => Time.now.strftime("%Y-%m-%d"),
+ "os" => "Mac OS X 10.3+",
+ "arch" => AA::AABeta.arch,
+ "format" => ".dmg",
+ "packager" => AA::AABeta.packager,
+ }
+
+ if AA::Config::DEDICATED
+ params["server"] = true
+ end
+
+ AA::AABeta.add_to_releases_list(params)
+ end
+
+ task "commit-releases" do
+ AA::AABeta.commit_releases_list(AA::AABeta::DMG_NAME)
+ end
+
+ task("release" => ["checkout", "update", "upload", "add-to-releases", "commit-releases"])
+end
Modified: armagetronad/trunk/armagetronad/MacOS/rakelib/release.rake
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakelib/release.rake 2008-12-30 19:52:52 UTC (rev 8704)
+++ armagetronad/trunk/armagetronad/MacOS/rakelib/release.rake 2008-12-30 19:53:57 UTC (rev 8705)
@@ -16,9 +16,13 @@
end
def self.dmg_name
- AA::Config.configuration_build_path("#{AA::Config::PROGRAM_SHORT_NAME}-#{AA::Config.version}.macosx-#{AA::Config.arch}")
+ "#{AA::Config::PROGRAM_SHORT_NAME}-#{AA::Config.version}.macosx-#{AA::Config.arch}"
end
+ def self.dmg_path
+ AA::Config.configuration_build_path(dmg_name())
+ end
+
def self.temp_file
%x{mktemp -t armagetronad}.chomp
end
@@ -32,7 +36,7 @@
task "dmg" do
release_directory = AA::Release.temp_directory
- final_dmg = AA::Release.dmg_name
+ final_dmg = AA::Release.dmg_path
final_dmg_plus_ext = final_dmg + ".dmg"
if File.exists?(final_dmg_plus_ext)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2009-01-01 02:37:37
|
Revision: 8718
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8718&view=rev
Author: bazaarmagetron
Date: 2009-01-01 02:37:29 +0000 (Thu, 01 Jan 2009)
Log Message:
-----------
Daniel Lee Harple: Moved TAG_MAPPINGS to AA::Xcode
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/rakelib/config.rake
armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-31 15:20:38.187000036 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-31 15:38:35.301000118 -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
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/rakelib/config.rake
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakelib/config.rake 2009-01-01 02:36:37 UTC (rev 8717)
+++ armagetronad/trunk/armagetronad/MacOS/rakelib/config.rake 2009-01-01 02:37:29 UTC (rev 8718)
@@ -76,11 +76,5 @@
BUILD_TYPE = [top_path(".svn"), top_path(".bzr")].any? { |f| File.exists?(f) } ? :development : :release
- TAG_MAPPINGS = {
- "version" => version(),
- "year" => Time.now.strftime("%Y"),
- "progtitle" => PRODUCT_NAME,
- }
-
PROGRAM_SHORT_NAME = DEDICATED ? "armagetronad-dedicated" : "armagetronad"
end
Modified: armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake 2009-01-01 02:36:37 UTC (rev 8717)
+++ armagetronad/trunk/armagetronad/MacOS/rakelib/xcode.rake 2009-01-01 02:37:29 UTC (rev 8718)
@@ -1,6 +1,12 @@
module AA::Xcode
GENERATED_RESOURCE_DIR = AA::Config.generated_path("resource")
+ TAG_MAPPINGS = {
+ "version" => AA::Config.version(),
+ "year" => Time.now.strftime("%Y"),
+ "progtitle" => AA::Config::PRODUCT_NAME,
+ }
+
def self.process_file(orig, package_dir=nil)
result_file = AA::Config.generated_path(orig.ext)
orig = AA::Config.top_path(orig)
@@ -12,7 +18,7 @@
# replace the tags
open(result_file, "r+") do |f|
data = f.read
- AA::Config::TAG_MAPPINGS.each { |tag, value| data.gsub!("@#{tag}@", value) }
+ TAG_MAPPINGS.each { |tag, value| data.gsub!("@#{tag}@", value) }
f.rewind
f.print(data)
f.truncate(f.pos)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2009-01-01 02:38:49
|
Revision: 8719
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8719&view=rev
Author: bazaarmagetron
Date: 2009-01-01 02:38:46 +0000 (Thu, 01 Jan 2009)
Log Message:
-----------
Daniel Lee Harple: Merge because rebase was throwing exceptions.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
armagetronad/trunk/armagetronad/MacOS/rakelib/aabeta.rake
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-31 15:38:35.301000118 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2008-12-31 21:27:27.914999962 -0500
committer: Daniel Lee Harple <lee...@gm...>
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:8394
svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715
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
+ 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
Modified: svk:merge
- 02982148-85d2-4202-9ec6-589ac3039d34:/local/armagetronad:107d95bf1e-0414-0410-9756-b78462a59f44:/armagetronad/trunk/armagetronad:8394
+ 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
Modified: armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2009-01-01 02:37:29 UTC (rev 8718)
+++ armagetronad/trunk/armagetronad/MacOS/Armagetron Advanced.xcodeproj/project.pbxproj 2009-01-01 02:38:46 UTC (rev 8719)
@@ -485,7 +485,7 @@
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
- remoteGlobalIDString = 9B31399E0EFD0560009690D0 /* Create Client Release */;
+ remoteGlobalIDString = 9B31399E0EFD0560009690D0;
remoteInfo = "Create Client Release";
};
/* End PBXContainerItemProxy section */
@@ -525,8 +525,11 @@
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; };
- 9B77E6C80D8618B90022FDF2 /* xcode.rake */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = xcode.rake; sourceTree = "<group>"; };
- 9B77E6C90D8618B90022FDF2 /* rakefile.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = rakefile.rb; 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; };
+ 9B77E6C80D8618B90022FDF2 /* xcode.rake */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; indentWidth = 2; path = xcode.rake; sourceTree = "<group>"; tabWidth = 2; };
+ 9B77E6C90D8618B90022FDF2 /* rakefile.rb */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text.script.ruby; path = rakefile.rb; sourceTree = "<group>"; tabWidth = 2; };
9B7CFE130EFCE74700126634 /* tResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tResource.cpp; sourceTree = "<group>"; };
9B7CFE140EFCE74700126634 /* tResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tResource.h; sourceTree = "<group>"; };
9B7CFE150EFCE74700126634 /* tResourceManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tResourceManager.cpp; sourceTree = "<group>"; };
@@ -938,6 +941,9 @@
9B77E6C70D8618B90022FDF2 /* rakelib */ = {
isa = PBXGroup;
children = (
+ 9B715F4E0F0BD95100034EBF /* aabeta.rake */,
+ 9B715F4D0F0BD95100034EBF /* config.rake */,
+ 9B715F4C0F0BD95100034EBF /* release.rake */,
9B77E6C80D8618B90022FDF2 /* xcode.rake */,
);
path = rakelib;
Modified: armagetronad/trunk/armagetronad/MacOS/rakelib/aabeta.rake
===================================================================
--- armagetronad/trunk/armagetronad/MacOS/rakelib/aabeta.rake 2009-01-01 02:37:29 UTC (rev 8718)
+++ armagetronad/trunk/armagetronad/MacOS/rakelib/aabeta.rake 2009-01-01 02:38:46 UTC (rev 8719)
@@ -43,10 +43,11 @@
end
# Returns a php assoc suitable to be put into releases.php
- def self.make_php_assoc(params)
+ def self.make_php_assoc(params)
# Make the release in the same order as others
- php_params = params.to_a.sort_by { |(key, _)| SORT_BY.index(key) }.map { |(k, v)| " '#{k}' => '#{v}'" }
-
+ params = params.to_a.sort_by { |(key, _)| SORT_BY.index(key) }
+ php_params = params.map { |(k, v)| " #{k.inspect} => #{v.inspect}" }
+
"array(\n" + php_params.join(",\n") + "\n),\n"
end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2009-01-02 14:48:37
|
Revision: 8722
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8722&view=rev
Author: z-man
Date: 2009-01-02 14:48:33 +0000 (Fri, 02 Jan 2009)
Log Message:
-----------
Merging branch 0.2.8 from revision 8691 to 8719:
------------------------------------------------------------------------
r8712 | bazaarmagetron | 2008-12-31 18:15:36 +0100 (Wed, 31 Dec 2008) | 2 lines
Manuel Moos: Oops, fixed non-krawall compilation.
------------------------------------------------------------------------
r8711 | bazaarmagetron | 2008-12-31 17:40:49 +0100 (Wed, 31 Dec 2008) | 2 lines
Manuel Moos: Disabling CASACL during RINCLUDE.
(during merge: have RINCLUDE use st_Include.)
------------------------------------------------------------------------
r8710 | bazaarmagetron | 2008-12-31 16:36:19 +0100 (Wed, 31 Dec 2008) | 10 lines
author: Bazaarmagetron
Automatic merging of commits that would change history order:
------------------------------------------------------------
revno: 964.1.1
committer: Manuel Moos <z-...@us...>
branch nick: armagetronad
timestamp: Wed 2008-12-31 16:26:49 +0100
message:
Fixed odd segmentation fault on version generation.
------------------------------------------------------------------------
r8709 | bazaarmagetron | 2008-12-31 13:10:28 +0100 (Wed, 31 Dec 2008) | 1 line
Manuel Moos: Merging own work.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8691&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/batch/make/version
armagetronad/trunk/armagetronad/bootstrap.sh
armagetronad/trunk/armagetronad/language/english_base.txt
armagetronad/trunk/armagetronad/src/engine/eVoter.cpp
armagetronad/trunk/armagetronad/src/render/rConsoleCout.cpp
armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp
armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp
armagetronad/trunk/armagetronad/src/tools/tConfiguration.h
armagetronad/trunk/armagetronad/src/tron/gParser.cpp
Modified: armagetronad/trunk/armagetronad/batch/make/version
===================================================================
--- armagetronad/trunk/armagetronad/batch/make/version 2009-01-02 05:25:23 UTC (rev 8721)
+++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-02 14:48:33 UTC (rev 8722)
@@ -2,6 +2,8 @@
# determines the version of the sources
# usage: version <source directory>
+#set -x
+
srcdir="$1"
# set version parts to defaults for CVS snapshot
@@ -111,7 +113,7 @@
fi
fi
-if test ! $minor_version
+if test -z "$minor_version"
then
test -z "$DATE" || minor_version=`cat ${srcdir}/minor_version | sed -e "s,DATE,$DATE," -e "s,YYYYMMDD,$DATE,"`
fi
Modified: armagetronad/trunk/armagetronad/bootstrap.sh
===================================================================
--- armagetronad/trunk/armagetronad/bootstrap.sh 2009-01-02 05:25:23 UTC (rev 8721)
+++ armagetronad/trunk/armagetronad/bootstrap.sh 2009-01-02 14:48:33 UTC (rev 8722)
@@ -5,6 +5,8 @@
test $AUTOCONF || AUTOCONF=autoconf
test $AUTOMAKE || AUTOMAKE=automake
+# set -x
+
test -r ChangeLog || touch -t 198001010000 ChangeLog
MYDIR=`dirname $0`
Modified: armagetronad/trunk/armagetronad/language/english_base.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/english_base.txt 2009-01-02 05:25:23 UTC (rev 8721)
+++ armagetronad/trunk/armagetronad/language/english_base.txt 2009-01-02 14:48:33 UTC (rev 8722)
@@ -2764,6 +2764,7 @@
casacl_help For the duratioon of the rest of the configuration file thiss directive appears in, elevate the access level.
casacl_usage Usage: CASACL <required access level> <elevated access level>\n
+casacl_not_allowed CASACL usage not allowed in this context.\n
abort_loading_name Loading Abort
abort_loading_description Current config file/stream loading was aborted by command \1.
Modified: armagetronad/trunk/armagetronad/src/engine/eVoter.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/eVoter.cpp 2009-01-02 05:25:23 UTC (rev 8721)
+++ armagetronad/trunk/armagetronad/src/engine/eVoter.cpp 2009-01-02 14:48:33 UTC (rev 8722)
@@ -1466,8 +1466,13 @@
{
// check whether enough harmful votes were collected already
ePlayerNetID * p = GetPlayer();
- if ( fromMenu_ && p && p->GetVoter()->HarmCount() < se_kickMinHarm )
+ if ( p && !p->GetVoter() )
{
+ p->CreateVoter();
+ }
+
+ if ( fromMenu_ && p && p->GetVoter() && p->GetVoter()->HarmCount() < se_kickMinHarm )
+ {
// try to transfor the vote to a suspension
eVoteItem * item = tNEW ( eVoteItemSuspend )( p );
@@ -1501,6 +1506,10 @@
static void se_HandleKickVote( nMessage& m )
{
+ // set high default access level for menu issued kick votes, the true access level
+ // is taken from the highest level player from the sending client later
+ tCurrentAccessLevel level( tAccessLevel_Owner, true );
+
// accept message
if ( eVoteItem::AcceptNewVote( m ) )
{
Modified: armagetronad/trunk/armagetronad/src/render/rConsoleCout.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/render/rConsoleCout.cpp 2009-01-02 05:25:23 UTC (rev 8721)
+++ armagetronad/trunk/armagetronad/src/render/rConsoleCout.cpp 2009-01-02 14:48:33 UTC (rev 8722)
@@ -88,6 +88,9 @@
static int currentIn=0;
void sr_Read_stdin(){
+ // stdin commands are executed at owner level
+ tCurrentAccessLevel level( tAccessLevel_Owner, true );
+
tConfItemBase::LoadPlayback( true );
if ( !unblocked )
@@ -141,9 +144,6 @@
while ( read(stdin_descriptor,&line_in[currentIn],1)>0){
if (line_in[currentIn]=='\n' || currentIn>=MAXLINE-1)
{
- // stdin commands are executed at owner level
- tCurrentAccessLevel level( tAccessLevel_Owner, true );
-
line_in[currentIn+1]='\0';
std::istringstream s(line_in);
tConfItemBase::LoadAll(s, true);
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp 2009-01-02 05:25:23 UTC (rev 8721)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceManager.cpp 2009-01-02 14:48:33 UTC (rev 8722)
@@ -294,17 +294,22 @@
static void RInclude(std::istream& s)
{
- tString file;
- s >> file;
+ // prevent CASACL
+ tCasaclPreventer preventer;
- tString rclcl = tResourceManager::locateResource(NULL, file);
- if ( rclcl ) {
- std::ifstream rc(rclcl);
- tConfItemBase::LoadAll(rc, false );
+ tString resourceID;
+ s >> resourceID;
+
+ tString filename = tResourceManager::locateResource(NULL, resourceID);
+
+ if ( filename )
+ {
+ st_Include( filename, true );
+
return;
}
- con << tOutput( "$config_rinclude_not_found", file );
+ con << tOutput( "$config_rinclude_not_found", resourceID );
}
static tConfItemFunc s_RInclude("RINCLUDE", &RInclude);
Modified: armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp 2009-01-02 05:25:23 UTC (rev 8721)
+++ armagetronad/trunk/armagetronad/src/tools/tConfiguration.cpp 2009-01-02 14:48:33 UTC (rev 8722)
@@ -112,6 +112,19 @@
return *st_confMap;
}
+static bool st_preventCasacl = false;
+
+tCasaclPreventer::tCasaclPreventer( bool prevent )
+{
+ previous_ = st_preventCasacl;
+ st_preventCasacl = prevent;
+}
+
+tCasaclPreventer::~tCasaclPreventer()
+{
+ st_preventCasacl = previous_;
+}
+
#ifdef KRAWALL_SERVER
// changes the access level of a configuration item
@@ -221,6 +234,11 @@
);
throw tAbortLoading( st_casacl );
}
+ else if ( st_preventCasacl )
+ {
+ con << tOutput( "$casacl_not_allowed" );
+ throw tAbortLoading( st_casacl );
+ }
else
{
tString().ReadLine(s); // prevent commands following this one without a newline
@@ -998,6 +1016,9 @@
static void Include(std::istream& s, bool error )
{
+ // allow CASACL
+ tCasaclPreventer allower(false);
+
tString file;
s >> file;
Modified: armagetronad/trunk/armagetronad/src/tools/tConfiguration.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tConfiguration.h 2009-01-02 05:25:23 UTC (rev 8721)
+++ armagetronad/trunk/armagetronad/src/tools/tConfiguration.h 2009-01-02 14:48:33 UTC (rev 8722)
@@ -75,6 +75,16 @@
tAccessLevel_Default = 20
};
+//! class to temporarily allow/forbid the use of casacl
+class tCasaclPreventer
+{
+public:
+ tCasaclPreventer( bool prevent = true );
+ ~tCasaclPreventer();
+private:
+ bool previous_; //!< previous value of prevention flag
+};
+
//! class managing the current access level
class tCurrentAccessLevel
{
Modified: armagetronad/trunk/armagetronad/src/tron/gParser.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/gParser.cpp 2009-01-02 05:25:23 UTC (rev 8721)
+++ armagetronad/trunk/armagetronad/src/tron/gParser.cpp 2009-01-02 14:48:33 UTC (rev 8722)
@@ -2105,7 +2105,7 @@
std::stringstream ss;
/* Yes it is ackward to generate a string that will be decifered on the other end*/
ss << myxmlGetProp(cur, "name") << " " << myxmlGetProp(cur, "value");
- tConfItemBase::LoadAll(ss, false );
+ tConfItemBase::LoadLine(ss);
}
/* Verify if any sub elements are included, and if they contain any Alt
Sub elements of Point arent defined in the current version*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2009-01-03 18:41:35
|
Revision: 8725
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8725&view=rev
Author: bazaarmagetron
Date: 2009-01-03 18:41:27 +0000 (Sat, 03 Jan 2009)
Log Message:
-----------
da...@da...: Enable armathentication by default
Modified Paths:
--------------
armagetronad/trunk/armagetronad/configure.ac
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2008-12-31 21:27:27.914999962 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2009-01-03 11:02:53.015000105 -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
+ 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
Modified: armagetronad/trunk/armagetronad/configure.ac
===================================================================
--- armagetronad/trunk/armagetronad/configure.ac 2009-01-02 20:08:17 UTC (rev 8724)
+++ armagetronad/trunk/armagetronad/configure.ac 2009-01-03 18:41:27 UTC (rev 8725)
@@ -188,7 +188,7 @@
no) enable_armathentication=no
;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-armathentication) ;;
- esac],enable_armathentication=no
+ esac],enable_armathentication=yes
)
AC_ARG_ENABLE(zonesv2,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2009-01-03 18:42:19
|
Revision: 8726
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8726&view=rev
Author: bazaarmagetron
Date: 2009-01-03 18:42:16 +0000 (Sat, 03 Jan 2009)
Log Message:
-----------
da...@da...: Can make dist, but still failing make distcheck
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/Makefile.am
armagetronad/trunk/armagetronad/src/swig/Makefile.am
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2009-01-03 11:02:53.015000105 -0600
committer: da...@da...
properties:
branch-nick: armagetronad
+ timestamp: 2009-01-03 12:34:13.568000078 -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
+ 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
Modified: armagetronad/trunk/armagetronad/src/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-03 18:41:27 UTC (rev 8725)
+++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-03 18:42:16 UTC (rev 8726)
@@ -1,9 +1,6 @@
include $(top_srcdir)/Makefile.paths
-SUBDIRS = first thirdparty
-if ENABLE_RUBY
-SUBDIRS += swig
-endif
+SUBDIRS = first thirdparty swig
# target directory
gamesdir=${bindir}
@@ -207,12 +204,13 @@
games_PROGRAMS = $(buildmain) $(buildthemaster)
#EXTRA_PROGRAMS = armagetronad_main_master
-if ENABLE_RUBY
-librubywrap_a_SOURCES = ${top_builddir}/src/swig/ext/armagetronad_wrap.cxx
-librubywrap_a_CXXFLAGS = $(libtron_a_CXXFLAGS) -w
-else
-librubywrap_a_SOURCES =
-endif
+#if ENABLE_RUBY
+#rubysources = ${top_builddir}/src/swig/ext/armagetronad_wrap.cxx
+#librubywrap_a_SOURCES = $(rubysources)
+#librubywrap_a_CXXFLAGS = $(libtron_a_CXXFLAGS) -w
+#else
+#librubywrap_a_SOURCES =
+#endif
if BUILDFAKERELEASE
BUILDFAKE=echo -e "\#!/bin/sh\necho Running FAKE \"\$$0\" \"\$$@\"\ntest \"\$$1\" = "--doc" || test \"\$$1\" = "--help" || sleep 5" > $@; chmod 755 $@
@@ -223,7 +221,8 @@
${BUILDFAKE}
else
if BUILDMAIN
-noinst_LIBRARIES = libenginecore.a libengine.a librender.a libtron.a libui.a libnetwork.a libtools.a librubywrap.a
+noinst_LIBRARIES = libenginecore.a libengine.a librender.a libtron.a libui.a libnetwork.a libtools.a
+# librubywrap.a
else
noinst_LIBRARIES = libnetwork.a libtools.a
endif
Modified: armagetronad/trunk/armagetronad/src/swig/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/src/swig/Makefile.am 2009-01-03 18:41:27 UTC (rev 8725)
+++ armagetronad/trunk/armagetronad/src/swig/Makefile.am 2009-01-03 18:42:16 UTC (rev 8726)
@@ -1,4 +1,3 @@
-if ENABLE_RUBY
# all the SWIG interface files
INTERFACEFILES = ext/armagetronad.i ext/std/sstream.i ext/tools/tConfiguration.i \
ext/tools/tDirectories.i ext/tools/tLocale.i ext/tools/tString.i \
@@ -8,8 +7,10 @@
ext/engine/eNetGameObject.i ext/network/nNetObject.i
# although they should not be needed for a plain build, the interfaces are the true sources.
-EXTRA_DIST = ${INTERFACEFILES} ext/armagetronad_wrap.cxx ext/armagetronad_wrap.h
+EXTRA_DIST = ${INTERFACEFILES}
+#ext/armagetronad_wrap.cxx ext/armagetronad_wrap.h
+if ENABLE_RUBY
swig_all = ${top_builddir}/src/swig/ext/armagetronad_wrap.cxx
swig_all_include = -I${srcdir}/.. -I${srcdir}/../tools -I${srcdir}/../network -I${srcdir}/../render -I${srcdir}/../ui -I${srcdir}/../tron -I${srcdir}/../engine
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2009-01-03 22:55:25
|
Revision: 8727
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8727&view=rev
Author: bazaarmagetron
Date: 2009-01-03 21:36:33 +0000 (Sat, 03 Jan 2009)
Log Message:
-----------
Daniel Lee Harple: Initialize shouldChangeFunc_ instance variable. This change was lost when z-man merged 0.2.8.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/tools/tConfiguration.h
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2009-01-03 12:34:13.568000078 -0600
committer: da...@da...
properties:
branch-nick: armagetronad
+ timestamp: 2009-01-03 16:28:52.592000008 -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
+ 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
Modified: armagetronad/trunk/armagetronad/src/tools/tConfiguration.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tConfiguration.h 2009-01-03 18:42:16 UTC (rev 8726)
+++ armagetronad/trunk/armagetronad/src/tools/tConfiguration.h 2009-01-03 21:36:33 UTC (rev 8727)
@@ -255,12 +255,12 @@
tConfItem(T &t):tConfItemBase(""),target(&t), shouldChangeFunc_(NULL) {};
public:
tConfItem(const char *title,const tOutput& help,T& t, callbackFunc *cb)
- :tConfItemBase(title,help,cb),target(&t){}
+ :tConfItemBase(title,help,cb),target(&t), shouldChangeFunc_(NULL) {}
tConfItem(const char *title,const tOutput& help,T& t)
:tConfItemBase(title,help),target(&t), shouldChangeFunc_(NULL) {}
tConfItem(const char *title,T& t, callbackFunc *cb)
- :tConfItemBase(title,cb),target(&t){}
+ :tConfItemBase(title,cb),target(&t), shouldChangeFunc_(NULL) {}
tConfItem(const char *title,T& t)
:tConfItemBase(title),target(&t), shouldChangeFunc_(NULL) {}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2009-01-03 23:26:00
|
Revision: 8728
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8728&view=rev
Author: bazaarmagetron
Date: 2009-01-03 23:25:49 +0000 (Sat, 03 Jan 2009)
Log Message:
-----------
da...@da...: Miscellaneous fixes to get it building again, and to get an autopackage to build out of it.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/Makefile.am
armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
armagetronad/trunk/armagetronad/src/resource/tResourceManager.h
armagetronad/trunk/armagetronad/src/resource/tResourceType.h
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2009-01-03 16:28:52.592000008 -0500
committer: Daniel Lee Harple <lee...@gm...>
properties:
branch-nick: armagetronad
+ timestamp: 2009-01-03 17:15:50.917999983 -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
+ 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
Modified: armagetronad/trunk/armagetronad/src/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-03 21:36:33 UTC (rev 8727)
+++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-03 23:25:49 UTC (rev 8728)
@@ -86,6 +86,7 @@
tools/tFunction.h tools/tFunction.cpp\
tools/tPolynomial.h tools/tPolynomialMarshaler.h tools/tPolynomialWithBase.h \
tools/tRuby.h tools/tRuby.cpp \
+ tools/tDict.h \
resource/tResource.h resource/tResource.cpp resource/tResourceType.h resource/tResourceType.cpp
#tools/tCommandLine.cpp tools/tCommandLine.h
@@ -235,7 +236,8 @@
armagetronad_main_SOURCES = tron/gFloor.cpp tron/cockpit/cCockpit.cpp tron/cockpit/cMap.cpp
armagetronad_main_CXXFLAGS =$(libtron_a_CXXFLAGS)
-armagetronad_main_LDADD= libtron.a libenginecore.a libengine.a libnetwork.a libui.a librender.a libtools.a librubywrap.a thirdparty/mathexpr/libmathexpr.a ${extralibs}
+armagetronad_main_LDADD= libtron.a libenginecore.a libengine.a libnetwork.a libui.a librender.a libtools.a thirdparty/mathexpr/libmathexpr.a ${extralibs}
+# librubywrap.a
# armagetronad_main_LDFLAGS=
armagetronad_main_master_SOURCES = network/master.cpp
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2009-01-03 21:36:33 UTC (rev 8727)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2009-01-03 23:25:49 UTC (rev 8728)
@@ -4929,7 +4929,7 @@
lowerUser = user;
tToLower( lowerUser );
user = tOutput ( "$admin_list_authoritylevel", user );
- lowerUser = tString( "AAA" ) << lowerUser;
+ lowerUser = tColoredString((tString&)"AAA" + lowerUser);
theRightSet[ lowerUser ] = user;
authorityCount++;
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceManager.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceManager.h 2009-01-03 21:36:33 UTC (rev 8727)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceManager.h 2009-01-03 23:25:49 UTC (rev 8728)
@@ -32,7 +32,7 @@
#include <boost/shared_ptr.hpp>
-#include "tDict.h"
+//#include "tDict.h"
#include "tString.h"
#include "tResourceType.h"
Modified: armagetronad/trunk/armagetronad/src/resource/tResourceType.h
===================================================================
--- armagetronad/trunk/armagetronad/src/resource/tResourceType.h 2009-01-03 21:36:33 UTC (rev 8727)
+++ armagetronad/trunk/armagetronad/src/resource/tResourceType.h 2009-01-03 23:25:49 UTC (rev 8728)
@@ -30,6 +30,7 @@
#define ArmageTron_RESOURCETYPE_H
#include <boost/shared_ptr.hpp>
+#include <map>
#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-04 22:14:17
|
Revision: 8741
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8741&view=rev
Author: bazaarmagetron
Date: 2009-01-04 22:00:08 +0000 (Sun, 04 Jan 2009)
Log Message:
-----------
epsy: missed to add this file(comes along with r748)
Added Paths:
-----------
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-04 21:20:20.818000078 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
rebase-of: ep...@fr...-20090104202020-2fya7jtgdvs26iao
+ timestamp: 2009-01-04 22:49:50.466000080 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
Modified: bzr:file-ids
-
+ src/tools/tVersion.h tversion.h-20090104214947-id6ltdjkfel7qw2l-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 ep...@fr...-20090104202020-0lqda0kmftjpeows
+ 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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
Added: armagetronad/trunk/armagetronad/src/tools/tVersion.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tVersion.h (rev 0)
+++ armagetronad/trunk/armagetronad/src/tools/tVersion.h 2009-01-04 22:00:08 UTC (rev 8741)
@@ -0,0 +1,46 @@
+/*
+
+*************************************************************************
+
+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.
+
+***************************************************************************
+
+*/
+
+#ifndef TRUE_ARMAGETRONAD_VERION
+#include "tTrueVersion.h"
+
+
+static tString st_programName ("Armagetron Advanced"); //!< The name of this game (\g)
+static tString st_programVersion (TRUE_ARMAGETRONAD_VERSION); //!< The build label, or version (\v)
+static tString st_programRevId (TRUE_ARMAGETRONAD_REVID); //!< The revision ID this build is based from, if any. (\i)
+static int st_programRevNo (TRUE_ARMAGETRONAD_REVNO); //!< The revision number this build is based from (\o)
+static tString st_programBranchNick(TRUE_ARMAGETRONAD_BRANCHNICK); //!< The branch's nick (\p)
+static int st_programRevZNr (TRUE_ARMAGETRONAD_ZNR); //!< The revisions's z-number, fool's number or whatever shows up right after the z (\z)
+static tString st_programRevTag (TRUE_ARMAGETRONAD_REVTAG); //!< This revision's tag, if any (\t)
+static bool st_programChanged (TRUE_ARMAGETRONAD_CHANGED); //!< True if working tree contained changes, or if the branch diverged (\c)
+static tString st_programBuildDate (TRUE_ARMAGETRONAD_BUILDDATE); //!< The date this build was compiled on (\d)
+static int st_programBranchLca (TRUE_ARMAGETRONAD_BRANCHLCA); //!< The branch's last common ancestor with it's parent branch (\l)
+static int st_programBranchLcaZ(TRUE_ARMAGETRONAD_BRANCHLCAZ); //!< The branch's last common ancestor with it's parent branch, z-number edition (\m)
+static tString st_programBranchUrl (TRUE_ARMAGETRONAD_BRANCHURL); //!< The branch's URL, or whatever leads to it (\b)
+
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2009-01-04 22:22:38
|
Revision: 8739
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8739&view=rev
Author: bazaarmagetron
Date: 2009-01-04 21:33:22 +0000 (Sun, 04 Jan 2009)
Log Message:
-----------
epsy: New version labelling script, also includes --versioninfo and /help version
Modified Paths:
--------------
armagetronad/trunk/armagetronad/.bzrignore
armagetronad/trunk/armagetronad/Makefile.am
armagetronad/trunk/armagetronad/batch/make/version
armagetronad/trunk/armagetronad/language/english_base.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
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2009-01-03 17:15:50.917999983 -0600
committer: da...@da...
properties:
branch-nick: armagetronad
+ timestamp: 2009-01-04 21:20:20.818000078 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
rebase-of: ep...@fr...-20090104202020-2fya7jtgdvs26iao
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
+ 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 ep...@fr...-20090104202020-0lqda0kmftjpeows
Modified: armagetronad/trunk/armagetronad/.bzrignore
===================================================================
--- armagetronad/trunk/armagetronad/.bzrignore 2009-01-04 21:06:08 UTC (rev 8738)
+++ armagetronad/trunk/armagetronad/.bzrignore 2009-01-04 21:33:22 UTC (rev 8739)
@@ -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/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/Makefile.am 2009-01-04 21:06:08 UTC (rev 8738)
+++ armagetronad/trunk/armagetronad/Makefile.am 2009-01-04 21:33:22 UTC (rev 8739)
@@ -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/batch/make/version
===================================================================
--- armagetronad/trunk/armagetronad/batch/make/version 2009-01-04 21:06:08 UTC (rev 8738)
+++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-04 21:33:22 UTC (rev 8739)
@@ -4,11 +4,36 @@
#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 $1 == "--verbose" || test $1 == "-v" ) && test $# -eq 2
+then
+ verbose=#
+ srcdir=$2
+elif ( test $1 == "--verbose" || test $1 == "-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`
#echo $major_version
#echo $minor_version
@@ -86,30 +111,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
+#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 | grep -P '^ *revno: [0-9\.]+$' | wc -l)
+ lca=$revno
+ lcaz=$revcount
+ versioned=#
+ branchurl=$(bzr info ${srcdir} 2>/dev/null | grep -P '^ parent branch: .*$' | awk '-F: ' '{ print $2 }' )
+
+
+ # 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 -n '2,1p' | awk '{print $3}' )
+ # See how many steps it is, with the fool's number
+ stepsbackwards=$( bzr log ${srcdir} -l ${localrevisions} | grep -P '^ *revno: [0-9\.]+$' | 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} | grep -P "^(.*?) +${revno}$" | awk '{ print $1 }')
+ 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 log --show-ids -l1 ${srcdir} | grep -P "^revision-id: (.*)$" | head -n 1 | awk '{print $2}' )
fi
fi
@@ -118,4 +185,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/language/english_base.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/english_base.txt 2009-01-04 21:06:08 UTC (rev 8738)
+++ armagetronad/trunk/armagetronad/language/english_base.txt 2009-01-04 21:33:22 UTC (rev 8739)
@@ -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/src/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-04 21:06:08 UTC (rev 8738)
+++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-04 21:33:22 UTC (rev 8739)
@@ -28,15 +28,16 @@
done
# keep track of true version
-nTrueVersion.h: $(wildcard $(top_srcdir)/*_version) $(wildcard $(top_srcdir)/.svn) $(wildcard $(top_srcdir)/CVS) $(wildcard $(top_srcdir)/batch/make/version) Makefile
+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 \
- echo \#define TRUE_ARMAGETRONAD_VERSION \"`sh $(top_srcdir)/batch/make/version $(top_srcdir)`\" > $@; \
+ 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
-${srcdir}/network/nNetwork.cpp: nTrueVersion.h
+${srcdir}/tools/tLocale.cpp: ${srcdir}/tools/tVersion.h
+${srcdir}/tools/tVersion.h: tTrueVersion.h
# library file listings
Modified: armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2009-01-04 21:06:08 UTC (rev 8738)
+++ armagetronad/trunk/armagetronad/src/engine/ePlayer.cpp 2009-01-04 21:33:22 UTC (rev 8739)
@@ -3354,7 +3354,7 @@
}
void write(tColoredString &s) const {
- s << tColoredString::ColorString(.5,.5,1.) << tOutput(m_shortdesc) << ":\n" << tOutput(m_text) << '\n';
+ s << tColoredString::ColorString(.5,.5,1.) << tOutput((const char *)m_shortdesc) << ":\n" << tOutput((const char *)m_text) << '\n';
}
static void addHelpTopic(std::istream &s) {
@@ -3404,7 +3404,7 @@
printed_start = true;
s << tOutput("$help_topics_list_start");
}
- s << tColoredString::ColorString(.5,.5,1.) << begin->first << tColoredString::ColorString(1.,1.,.5) << ": " << tOutput(begin->second.m_shortdesc) << "\n";
+ s << tColoredString::ColorString(.5,.5,1.) << begin->first << tColoredString::ColorString(1.,1.,.5) << ": " << tOutput((const char *)begin->second.m_shortdesc) << "\n";
}
}
@@ -3449,6 +3449,8 @@
se_makeDefaultHelpTopic(helpTopics, "commands_misc");
se_makeDefaultHelpTopic(helpTopics, "commands_pp");
+ se_makeDefaultHelpTopic(helpTopics, "version");
+
return helpTopics;
}
Modified: armagetronad/trunk/armagetronad/src/network/nNetwork.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2009-01-04 21:06:08 UTC (rev 8738)
+++ armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2009-01-04 21:33:22 UTC (rev 8739)
@@ -100,11 +100,6 @@
tString sn_bigBrotherString;
// tString sn_greeting[5]; //made 4 = 5 (lol i broke the laws of maths. subby), k's bug fix
-
-#ifdef TOP_SOURCE_DIR
-#include "nTrueVersion.h"
-#endif
-
#ifndef TRUE_ARMAGETRONAD_VERSION
#define TRUE_ARMAGETRONAD_VERSION VERSION
#endif
Modified: armagetronad/trunk/armagetronad/src/tools/tCommandLine.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tCommandLine.cpp 2009-01-04 21:06:08 UTC (rev 8738)
+++ armagetronad/trunk/armagetronad/src/tools/tCommandLine.cpp 2009-01-04 21:33:22 UTC (rev 8739)
@@ -140,7 +140,8 @@
#ifdef HELPAVAIL
s << "--doc : print documentation for all console commands\n";
#endif
- s << "-v, --version : print version number\n\n";
+ s << "-v, --version : print version number\n";
+ s << "--versioninfo : print build source information\n\n";
// ask third party analyzers
tCommandLineAnalyzer * commandLineAnalyzer = s_commandLineAnalyzerAnchor;
@@ -170,6 +171,23 @@
{
QUIT( "This is " << name_ << " version " << *programVersion_ << ".\n" );
}
+ else if ( parser.GetSwitch( "--versioninfo") )
+ {
+ std::ostringstream s;
+ s << "Program Name : " << st_programName << "\n";
+ s << "Version : " << st_programVersion << "\n";
+ s << "Parent branch : " << st_programBranchNick << "\n";
+ s << "Parent branch's URL : " << st_programBranchUrl << "\n";
+ s << "Tag : " << st_programRevTag << "\n";
+ s << "Revision number : r" << st_programRevNo << "(z" << st_programRevZNr << ")\n";
+ s << "Revision ID : " << st_programRevId << "\n";
+ s << "Ancestor : r" << st_programBranchLca << "(z" << st_programBranchLcaZ << ")\n";
+ s << "Source changed : " << (st_programChanged? "Yes" : "No") << "\n";
+ s << "Build date : " << st_programBuildDate << "\n";
+
+ quitWithMessagePrepare( s.str().c_str() );
+ return false;
+ }
else
{
// let the registered command line anelyzers have a go
Modified: armagetronad/trunk/armagetronad/src/tools/tLocale.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tLocale.cpp 2009-01-04 21:06:08 UTC (rev 8738)
+++ armagetronad/trunk/armagetronad/src/tools/tLocale.cpp 2009-01-04 21:33:22 UTC (rev 8739)
@@ -39,8 +39,6 @@
static tArray<tString> st_TemplateParameters;
-static tString s_gameName("Armagetron"); // the official name of this game
-
class tLocaleItem: public tReferencable< tLocaleItem > // idendifies a string in all languages
{
friend class tLocaleSubItem;
@@ -254,10 +252,47 @@
else if (i < temp.Len() - 1)
{
c = temp(i+1);
- if (c == 'g')
- replaced << s_gameName;
- else
+ switch ( c )
{
+ case 'b':
+ replaced << st_programBranchUrl;
+ break;
+ case 'c':
+ replaced << tOutput(
+ ( st_programChanged )? "$yes" : "$no"
+ );
+ break;
+ case 'd':
+ replaced << st_programBuildDate;
+ break;
+ case 'g':
+ replaced << st_programName;
+ break;
+ case 'i':
+ replaced << st_programRevId;
+ break;
+ case 'l':
+ replaced << st_programBranchLca;
+ break;
+ case 'm':
+ replaced << st_programBranchLcaZ;
+ break;
+ case 'o':
+ replaced << st_programRevNo;
+ break;
+ case 'p':
+ replaced << st_programBranchNick;
+ break;
+ case 't':
+ replaced << st_programRevTag;
+ break;
+ case 'v':
+ replaced << st_programVersion;
+ break;
+ case 'z':
+ replaced << st_programRevZNr;
+ break;
+ default:
int index = c-'0';
if (index > 0 && index < 10)
replaced << st_TemplateParameters[index];
@@ -783,8 +818,8 @@
tLocaleItem::Load(filename, false);
// determine the name of the game
- s_gameName.Clear();
- s_gameName << tOutput("$game_name");
+ st_programName.Clear();
+ st_programName << tOutput("$game_name");
}
void tLocale::Clear()
Modified: armagetronad/trunk/armagetronad/src/tools/tLocale.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tLocale.h 2009-01-04 21:06:08 UTC (rev 8738)
+++ armagetronad/trunk/armagetronad/src/tools/tLocale.h 2009-01-04 21:33:22 UTC (rev 8739)
@@ -31,6 +31,7 @@
#include "tString.h"
#include "tLinkedList.h"
#include "tError.h"
+#include "tVersion.h"
class tLocaleItem;
class tOutputItemBase;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2009-01-05 12:22:11
|
Revision: 8744
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8744&view=rev
Author: z-man
Date: 2009-01-05 11:56:22 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
Merging branch 0.2.8 from revision 8719 to 8743:
------------------------------------------------------------------------
r8742 | bazaarmagetron | 2009-01-04 23:13:49 +0100 (Sun, 04 Jan 2009) | 2 lines
Manuel Moos: Added check for silly GCC flag to avoid creation of file named "ption".
------------------------------------------------------------------------
r8740 | bazaarmagetron | 2009-01-04 22:47:41 +0100 (Sun, 04 Jan 2009) | 2 lines
Manuel Moos: ChangeLog and fingerprint are now generated from bzr, too.
------------------------------------------------------------------------
r8732 | bazaarmagetron | 2009-01-04 01:10:16 +0100 (Sun, 04 Jan 2009) | 4 lines
author: Bazaarmagetron
Merging conflict from bzr, eliminating epsy's huge reformat:
epsy 2009-01-02 1/ move "made by xxx" headers from language files to AUTHORS
------------------------------------------------------------------------
r8724 | luke-jr | 2009-01-02 21:08:17 +0100 (Fri, 02 Jan 2009) | 1 line
missing newlines
------------------------------------------------------------------------
r8723 | luke-jr | 2009-01-02 19:20:14 +0100 (Fri, 02 Jan 2009) | 1 line
new polish files; polish.txt is UTF-8 -> Latin-1 translit
------------------------------------------------------------------------
r8721 | luke-jr | 2009-01-02 06:25:23 +0100 (Fri, 02 Jan 2009) | 1 line
fix include spelling
------------------------------------------------------------------------
r8720 | luke-jr | 2009-01-02 06:15:15 +0100 (Fri, 02 Jan 2009) | 1 line
new Polish translation files from rafal ciesiak
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8719&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/AUTHORS
armagetronad/trunk/armagetronad/Makefile.manual
armagetronad/trunk/armagetronad/configure.ac
armagetronad/trunk/armagetronad/language/deutsch.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
Modified: armagetronad/trunk/armagetronad/AUTHORS
===================================================================
--- armagetronad/trunk/armagetronad/AUTHORS 2009-01-04 22:49:47 UTC (rev 8743)
+++ armagetronad/trunk/armagetronad/AUTHORS 2009-01-05 11:56:22 UTC (rev 8744)
@@ -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.manual
===================================================================
--- armagetronad/trunk/armagetronad/Makefile.manual 2009-01-04 22:49:47 UTC (rev 8743)
+++ armagetronad/trunk/armagetronad/Makefile.manual 2009-01-05 11:56:22 UTC (rev 8744)
@@ -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/configure.ac
===================================================================
--- armagetronad/trunk/armagetronad/configure.ac 2009-01-04 22:49:47 UTC (rev 8743)
+++ armagetronad/trunk/armagetronad/configure.ac 2009-01-05 11:56:22 UTC (rev 8744)
@@ -339,7 +339,7 @@
dnl oddly, this macro needs to be called once unconditionally, or automake
dnl borks up.
-AX_CXXFLAGS_GCC_OPTION()
+AX_CXXFLAGS_GCC_OPTION(-nobodyreadsconfigureoutputanyway)
if test $CODELEVEL -ge 1; then
CXXFLAGS="$CXXFLAGS -Wall"
Modified: armagetronad/trunk/armagetronad/language/deutsch.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/deutsch.txt 2009-01-04 22:49:47 UTC (rev 8743)
+++ armagetronad/trunk/armagetronad/language/deutsch.txt 2009-01-05 11:56:22 UTC (rev 8744)
@@ -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/french.txt
===================================================================
--- armagetronad/trunk/armagetronad/language/french.txt 2009-01-04 22:49:47 UTC (rev 8743)
+++ armagetronad/trunk/armagetronad/language/french.txt 2009-01-05 11:56:22 UTC (rev 8744)
@@ -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-04 22:49:47 UTC (rev 8743)
+++ armagetronad/trunk/armagetronad/language/polish.txt 2009-01-05 11:56:22 UTC (rev 8744)
@@ -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 zawieszone przez administartora..\n
-
-#********************************************
-#********************************************
-#
-# Name Display
-#
-#********************************************
-#********************************************
-
-fadeout_name_delay_help Czas, w jakim wy\x9Cwietlane s\xB9 nazwy graczy. 0 je\x9Cli maj\xB9 w og\xF3le nie by\xE6 wy\x9Cwietlane lub -1 je\x9Cli maj\xB9 by\xE6 pokazane zawsze.
-show_own_name_help Czy Twoje imi\xEA powinno by\xE6 wy\x9Cwietlane powy\xBFej Twojego cyklu?
-display_colored_names_over_cycles_help Czy imiona nad cyklami powinny by\xE6 wy\x9Cwietlane w kolorze cyklu?
-dead_console_decoration *MARTWY*
-#********************************************
-#********************************************
-#
-# Recording and playback
-#
-#********************************************
-#********************************************
-
-recording_debuglevel_help Poziom dodatkowych informacji, jakie s\xB9 nagrywane.
-fast_forward_maxstep_help Maksymalny czas nagrania pomi\xEAdzy poszczeg\xF3lnymi wy\x9Cwietlanymi klatkami przy przewijaniu.
-fast_forward_maxstep_real_help Maksymalny rzeczywisty czas pomi\xEAdzy poszczeg\xF3lnymi wy\x9Cwietlanymi klatkami przy przewijaniu.
-fast_forward_maxstep_rel_help Maksymalny po\x9Clizg czasu, jaki zosta\xB3 do ko\xF1ca trybu przewijania pomi\xEAdzy wy\x9Cwietlanymi klatkami.
-
-#********************************************
-#********************************************
-#
-# Camera Configuration items
-#
-#********************************************
-#********************************************
-
-camera_forbid_smart_help Zabrania klientom u\xBFycia kamery Sprytnej
-camera_forbid_in_help Zabrania klientom u\xBFycia kamery Wewn\xEAtrznej
-camera_forbid_free_help Zabrania klientom u\xBFycia kamery Wolnej
-camera_forbid_follow_help Zabrania klientom u\xBFycia kamery Zewn\xEAtrznej
-camera_forbid_custom_help Zabrania klientom u\xBFycia kamery W\xB3asnej
-camera_forbid_server_custom_help Zabrania klientom u\xBFycia kamery W\xB3asnej Serwera
-camera_forbid_mer_help Zabrania u\xBFycia kamery Meritona
-
-camera_forbid_custom_glance_help Zabrania ustawie\xF1 spojrze\xF1 kamery w\xB3asnej
-camera_override_custom_glance_help Nadpisz ustawienia spojrze\xF1 kamery w\xB3asnej ustawieniami serwera.
-camera_override_custom_glance_server_custom_help Nadpisz ustawienia spojrze\xF1 kamery w\xB3asnej serwera ustawieniami serwera.
-
-camera_follow_start_x_help Pozycja pocz\xB9tkowa kamery Zewn\xEAtrznej
-camera_follow_start_y_help Pozycja pocz\xB9tkowa kamery Zewn\xEAtrznej
-camera_follow_start_z_help Pozycja pocz\xB9tkowa kamery Zewn\xEAtrznej
-
-camera_smart_start_x_help Pozycja pocz\xB9tkowa Sprytnej kamery
-camera_smart_start_y_help Pozycja pocz\xB9tkowa Sprytnej kamery
-camera_smart_start_z_help Pozycja pocz\xB9tkowa Sprytnej kamery
-camera_smart_glance_custom_help U\xBFyj ustawie\xF1 kamery W\xB3asnej do spogl\xB9dania w boki przy pomocy kamery Sprytnej
-camera_smart_glance_custom_text W\xB3asne spogl\xB9danie
-
-camera_free_start_x_help Pozycja pocz\xB9tkowa Wolnej kamery
-camera_free_start_y_help Pozycja pocz\xB9tkowa Wolnej kamery
-camera_free_start_z_help Pozycja pocz\xB9tkowa Wolnej kamery
-
-camera_custom_back_help Pozycja kamery W\xB3asnej: jak daleko za cyklem si\xEA znajduje?
-camera_custom_rise_help Pozycja kamery W\xB3asnej: jak wysoko nad cyklem si\xEA znajduje?
-camera_custom_back_fromspeed_help Ta warto\x9C\xE6 jest mno\xBFona przez aktualn\xB9 pr\xEAdko\x9C\xE6 cyklu i dodawana do CAMERA_CUSTOM_BACK.
-camera_custom_rise_fromspeed_help Ta warto\x9C\xE6 jest mno\xBFona przez aktualn\xB9 pr\xEAdko\x9C\xE6 cyklu i dodawana do CAMERA_CUSTOM_RISE.
-camera_custom_pitch_help Pozycja kamery W\xB3asnej: jak bardzo patrzy w g\xF3r\xEA/d\xF3\xB3?
-camera_custom_zoom_help Pozycja kamery W\xB3asnej: jak bardzo przybli\xBFona jest do Twojego cyklu na pocz\xB9tku rundy (aby pokaza\xE6 formacj\xEA dru\xBFyny)?
-camera_custom_turn_speed_help Pr\xEAdko\x9C\xE6, z jak\xB9 obraca si\xEA kamera W\xB3asna.
-camera_custom_turn_speed_180_help Dodatkowy mno\xBFnik do CAMERA_CUSTOM_TURN_SPEED po nawrocie.
-camera_in_turn_speed_help Pr\xEAdko\x9C\xE6, z jak\xB9 obraca si\xEA kamera wewn\xEAtrzna.
-
-camera_server_custom_back_help Pozycja kamery W\xB3asnej: jak daleko za cyklem si\xEA znajduje?
-camera_server_custom_rise_help Pozycja kamery W\xB3asnej: jak wysoko nad cyklem si\xEA znajduje?
-camera_server_custom_back_fromspeed_help Ta warto\x9C\xE6 jest mno\xBFona przez aktualn\xB9 pr\xEAdko\x9C\xE6 cyklu i dodawana do CAMERA_SERVER_CUSTOM_BACK.
-camera_server_custom_rise_fromspeed_help Ta warto\x9C\xE6 jest mno\xBFona przez aktualn\xB9 pr\xEAdko\x9C\xE6 cyklu i dodawana do CAMERA_SERVER_CUSTOM_RISE.
-camera_server_custom_pitch_help Pozycja kamery W\xB3asnej: jak bardzo patrzy w g\xF3r\xEA/d\xF3\xB3?
-camera_server_custom_turn_speed_help Pr\xEAdko\x9C\xE6, z jak\xB9 obraca si\xEA kamera W\xB3asna Serwera. Je\x9Cli mniejsze ni\xBF zero, to ustawienia obrotu zostan\xB9 wzi\xEAte od klienta.
-camera_server_custom_turn_speed_180_help Dodatkowy mno\xBFnik do CAMERA_SERVER_CUSTOM_TURN_SPEED po nawrocie.
-
-#red/green 3D rendering settings
-camera_eye_distance_help Dystans pomi\xEAdzy oczami tr\xF3jwymiarowej kamery. Ustaw na 0, aby wy\xB3\xB9czy\xE6
-camera_eye_1_color_help Kolor pierwszego oka. 1 to czerwony, 2 to zielony, 4 to niebieski, suma tych warto\x9Cci oznacza miesznin\xEA tych kolor\xF3w
-camera_eye_2_color_help Kolor drugiego oka. 1 to czerwony, 2 to zielony, 4 to niebieski, suma tych warto\x9Cci oznacza miesznin\xEA tych kolor\xF3w
-camera_in_max_focus_distance_help To, pomno\xBFone przez aktualn\xB9 pr\xEAdko\x9C\xE6, okre\x9Cla maksymaln\xB9 odleg\xB3o\x9C\xE6 obiektu ostro\x9Cci, chyba, \xBFe \x9Cciana jest bli\xBFej.
-
-#********************************************
-#********************************************
-#
-# Network Configuration items
-#
-#********************************************
-#********************************************
-
-custom_server_name_help Nazwa serwera, do kt\xF3rego pod\xB3\xB9czy\xE6
-dedicated_idle_help Po uruchomieniu na ten czas (w godz.), serwer dedykowany si\xEA wy\xB3\xB9czy.
-dedicated_fps_help Maksymalna ilo\x9C\xE6 krok\xF3w symulacji, jak\xB9 b\xEAdzie przeprowadza\xB3 serwer dedykowany
-talk_to_master_help Czy wys\xB3a\xE6 informacje o tym serwerze do Internetu?
-max_out_rate_help Maksymalna wyj\x9Cciowa ilo\x9C\xE6 kb/s.
-max_in_rate_help Maksymalna wej\x9Cciowa ilo\x9C\xE6 kb/s.
-ping_charity_help Dopuszczalna przez Ciebie r\xF3\xBFnica pomi\xEAdzy Twoim pingiem, a pingiem innych graczy.
-ping_charity_max_help Opcja serwera: maksymalna warto\x9C\xE6 zr\xF3wnania pinga. Ustaw 0 aby unikn\xB9\xE6 b\xB3yskawicznych \x9Cmierci. Aktywne tylko, gdy klienci s\xB9 w wersji 0.2.8.3lub nowszej.
-ping_charity_min_help Opcja serwera: minimalna warto\x9C\xE6 zr\xF3wnania pinga. U\xBFyj, aby wymusi\xE6 gr\xEA fair. Aktywne tylko, gdy klienci s\xB9 w wersji 0.2.8.3lub nowszej.
-ping_charity_server_help Nie zmieniaj: maksymalna kompensacja pingu dla serwera.
-big_brother_help Czy ju\xBF wys\xB3ali\x9Cmy informacje wielkiemu bratu?
-server_name_help Nazwa tego serwaera
-server_options_help Kr\xF3tki opis opcji tego serwera
-server_ip_help IP, na kt\xF3rym nas\xB3uchuje ten serwer
-server_port_help Port, na kt\xF3rym nas\xB3uchuje serwer
-client_port_help Port, na kt\xF3rym pr\xF3bujemy si\xEA po\xB3\xB9czny\xE6
-max_clients_help Maksymalna ilo\x9C\xE6 klient\xF3w
-max_clients_same_ip_soft_help Maksymalna dozwolona ilo\x9C\xE6 graczy z tego samego IP; nast\xEApni b\xEAd\xB9 wykopani, gdy serwer b\xEAdzie pe\xB3ny
-max_clients_same_ip_hard_help Maksymalna dozwolona ilo\x9C\xE6 graczy z tego samego IP; nast\xEApni b\xEAd\xB9 ignorowani.
-max_players_same_ip_help Maksymalna ilo\x9C\xE6 graczy z tego samego IP (ka\xBFdy klient mo\xBFe obs\xB3u\xBFy\xE6 a\xBF 4 graczy!)
-url_help Adres internetowy powi\xB9zany z tym serwerem.
-
-#********************************************
-#********************************************
-#
-# Graphics Configuration items
-#
-#********************************************
-#********************************************
-
-png_screenshot_help Zapisuj zdj\xEAcia jako pliki PNG, a nie BMP.
-white_sparks_help Rysuj iskry na bia\xB3o (zamiast w kolorze cyklu).
-keep_window_active_help Nadal wy\x9Cwietlaj gr\xEA, gdy okno gry straci kursor (trzymaj zawsze na wierzchu).
-
-# hud
-show_brake_help Pokazywa\xE6 w HUD miernik hamulc\xF3w?
-show_alive_help Pokazywa\xE6 w HUD ilo\x9C\xE6 pozosta\xB3ych przeciwnik\xF3w i przyjaci\xF3\xB3?
-show_fastest_help Pokazywa\xE6 w HUD najszybszego gracza?
-show_hud_help Pokazywa\xE6 HUD?
-show_ping_help Pokazywa\xE6 w HUD Tw\xF3j ping?
-show_rubber_help Pokazywa\xE6 w HUD miernik Rubber'a?
-show_score_help Pokazywa\xE6 w HUD Tw\xF3j wynik?
-show_speed_help Pokazywa\xE6 Pr\xEAdko\x9Cciomierz w HUD?
-show_time_help Pokazywa\xE6 w HUD aktualny czas?
-show_time_24_help Pokazywa\xE6 w HUD czas w 24-godzinnym formacie?
-speed_gauge_locx_help Po\xB3o\xBFenie poziome Pr\xEAdko\x9Cciomierza
-speed_gauge_locy_help Po\xB3o\xBFenie pionowe Pr\xEAdko\x9Cciomierza
-speed_gauge_size_help Rozmiar Pr\xEAdko\x9Cciomierza
-rubber_gauge_locx_help Po\xB3o\xBFenie poziome miernika Rubber'a
-rubber_gauge_locy_help Po\xB3o\xBFenie pionowe miernika Rubber'a
-rubber_gauge_size_help Rozmiar miernika Rubber'a
-brake_gauge_locx_help Po\xB3o\xBFenie poziome miernika hamulc\xF3w
-brake_gauge_locy_help Po\xB3o\xBFenie pionowe miernika hamulc\xF3w
-brake_gauge_size_help Rozmiar miernika hamulc\xF3w
-alive_locx_help Po\xB3o\xBFenie poziome informacji o pozosta\xB3ych \xBFywych graczach
-alive_locy_help Po\xB3o\xBFenie pionowe informacji o pozosta\xB3ych \xBFywych graczach
-alive_size_help Rozmiar informacji o pozosta\xB3ych \xBFywych graczach
-fastest_locx_help Po\xB3o\xBFenie poziome informacji o najszybszym graczu
-fastest_locy_help Po\xB3o\xBFenie pionowe informacji o najszybszym graczu
-fastest_size_help Rozmiar informacji o najszybszym graczu
-ping_locx_help Po\xB3o\xBFenie poziome wy\x9Cwietlacza Ping'a
-ping_locy_help Po\xB3o\xBFenie pionowe wy\x9Cwietlacza Ping'a
-ping_size_help Rozmiar wy\x9Cwietlacza Ping'a
-score_locx_help Po\xB3o\xBFenie poziome wy\x9Cwietlacza wyniku
-score_locy_help Po\xB3o\xBFenie pionowe wy\x9Cwietlacza wyniku
-score_size_help Rozmiar wy\x9Cwietlacza wyniku
-cm_locy_help Po\xB3o\xBFenie pionowe wy\x9Crodkowanych wiadomo\x9Cci.
-
-cockpit_file_help Plik z informacjami o kokpicie
-forbid_hud_map Zabroni\xE6 klientom u\xBFycia minimapy?
-forbid_cockpit_data_help Lista zabronionych kokpit\xF3w
-
-
-#floor
-grid_size_help Odst\xEAp pomi\xEAdzy liniami siatki.
-grid_size_moviepack_help Odst\xEAp pomi\xEAdzy liniami siatki, kiedy paczka filmowa jest w\xB3\xB9czona.
-floor_red_help Kolor pod\xB3ogi
-floor_green_help Kolor pod\xB3ogi
-floor_blue_help Kolor pod\xB3ogi
-
-rim_wall_stretch_x_help Poziome rozci\xB9gni\xEAcie tekstur \x9Ccian kraw\xEAdziowych.
-rim_wall_stretch_y_help Pionowe rozci\xB9gni\xEAcie tekstur \x9Ccian kraw\xEAdziowych.
-rim_wall_wrap_y_help Ustaw na 1, je\xBFeli tekstura \x9Ccian kraw\xEAdziowych ma si\xEA powtarza\xE6 w pionie.
-
-#moviepack settings
-moviepack_floor_red_help Kolor pod\xB3ogi
-moviepack_floor_green_help Kolor pod\xB3ogi
-moviepack_floor_blue_help Kolor pod\xB3ogi
-moviepack_wall_stretch_help Odleg\xB3o\x9C\xE6 pomi\xEAdzy pionowymi liniami paczki filmowej.
-moviepack_rim_wall_stretch_x_help Poziome rozci\xB9gni\xEAcie tekstur \x9Ccian kraw\xEAdziowych paczki filmowej.
-moviepack_rim_wall_stretch_y_help Pionowe rozci\xB9gni\xEAcie tekstur \x9Ccian kraw\xEAdziowych paczki filmowej.
-
-#detail settings
-swapmode_text Tryb synchronizacji grafiki:
-swapmode_help Okre\x9Cla funkcj\xEA wywo\xB3ywan\xB9 do synchronizacji grafiki.
-swapmode_fastest_text Najszybsza
-swapmode_fastest_help Bez takiej funkcji. Najszybsze, i zu\xBFywa najmniej CPU, ale mo\xBFe spowodowa\xE6 b\xB3\xEAdy grafiki. U\xBFywaj na w\xB3asne ryzyko.
-swapmode_glflush_text Flush
-swapmode_glflush_help Wywo\xB3uje funkcj\xEA glFlush() do synchronizacji grafiki. Ma\xB3e zu\xBFycie CPU i zapobiega b\xB3\xEAdom grafiki. To jest domy\x9Clna warto\x9C\xE6.
-swapmode_glfinish_text Finish
-swapmode_glfinish_help Wywo\xB3uje funkcj\xEA glFinish() do synchronizacji grafiki. Gwarantuje brak op\xF3\x9Fnienia grafiki,ale mo\xBFe spowodowa\xE6 utrat\xEA klatek lub du\xBFe obci\xB9\xBFeniu CPU na niekt\xF3rych systemach. Lepiej u\xBFywa\xE6 Flush, je\x9Cli nie dzia\xB3a prawid\xB3owo.
-swap_mode_help Okre\x9Cla komend\xEA u\xBFywan\xB9 do synchronizacji grafiki. 0: brak, 1: glFlush(), 2: glFinish().
-
-ztrick_help Dotyczy ulepsze\xF1 efektywno\x9Cci grafiki. Nie dzia\xB3a na systemie Windows.
-texture_mode_0_help Tekstura pod\xB3ogi:
-texture_mode_1_help Tekstury \x9Ccian:
-texture_mode_2_help Tekstury obiekt\xF3w:
-texture_mode_3_help Czcionka:
-
-gl_extensions_help Informacje systemowe OpenGL
-gl_version_help Informacje systemowe OpenGL
-gl_renderer_help Informacje systemowe OpenGL
-gl_vendor_help Informacje systemowe OpenGL
-line_antialias_help Aktywuj antyaliasing linii
-poly_antialias_help Aktywuj antyaliasing obiekt\xF3w
-persp_correct_help Aktywuj korekcj\xEA perspektywy
-alpha_blend_help Aktywuj p\xF3\xB3przezroczysto\x9C\xE6
-smooth_shading_help Aktywuj cieniowanie
-text_out_help Aktywuj wy\x9Cwietlanie wyj\x9Ccia tekstowego/konsoli
-console_columns_help Ilo\x9C\xE6 znak\xF3w w ka\xBFdej linii konsoli
-console_rows_help Domy\x9Clna ilo\x9C\xE6 linii konsoli
-console_rows_max_help Ilo\x9C\xE6 linii konsoli przy przewijaniu wstecz.
-console_decorate_id_help Umieszcza ID gracza w ka\xBFdej linii konsoli
-console_decorate_ip_help Umieszcza IP klienta w ka\xBFdej linii konsoli
-console_ladder_log_help Wy\x9Cwietla w konsoli informacje o rankingu
-ladderlog_game_time_interval Je\x9Cli dodatnie, wypisz czas gry co n sekund.
-ladderlog_write_all_help Ustwa wszystkie ustawienia LADDER_LOG_WRITE_* na t\xEA sam\xB9 warto\x9C\xE6.
-ladderlog_write_all_usage U\xBFycie: LADDER_LOG_WRITE_ALL 1|0
-ladderlog_write_all_enabled Aktywuj pe\xB3ny widok rankingu.
-ladderlog_write_all_disabled Wy\xB3\xB9cz widok rankingu.
-show_fps_help Wy\x9Cwietlaj fps
-floor_mirror_help Tryb lustra pod\xB3ogi
-floor_detail_help Tryb detali pod\xB3ogi
-high_rim_help Rysuj wysokie \x9Cciany kraw\xEAdzi
-dither_help Dithering
-upper_sky_help Rysuj wy\xBFsz\xB9 p\xB3aszczyzn\xEA nieba
-lower_sky_help Rysuj ni\xBFsz\xB9 p\xB3aszczyzn\xEA nieba
-sky_wobble_help Animacja nieba
-infinity_plane_help U\xBFywaj niesko\xF1czonych p\xB3aszczyzn (Nie dzia\xB3a pod systemem Windows)
-lag_o_meter_help Rysuj Lag-O-Mierz
-lag_o_meter_scale_help Skala Lag-O-Mierza. 1.0 to \x84poprawna\x94 warto\x9C\xE6, starsi klienci maj\xB9 zawsze 0.5 ze wzgl\xEAdu na b\xB3\xB9d w grze.
-lag_o_meter_threshold_help Lag-O-Mierz b\xEAdzie rysowany tylko wtedy, gry pr\xEAdko\x9C\xE6 cyklu i ping b\xEAd\xB9 wi\xEAksze od tej warto\x9Cci.
-lag_o_meter_blend_help Kolor Lag-O-Mierza. 1 bia\xB3y, 0 kolor gracza.
-lag_o_meter_use_old_help Czy powinni\x9Cmy u\xBFywa\xE6 starego, niestabilnego Lag-O-Mierza?
-axes_indicator_help Czy ma by\xE6 wy\x9Cwietlane oznaczenie osi.
-predict_objects_help Przewiduj ruch cyklu w grze sieciowej
-textures_hi_help U\xBFyj tekstur o lepszych kolorach.
-sparks_help Rysuj iskry podczas grindowania.
-explosion_help Wy\x9Cwietla\xE6 eksplozje?
-wrap_menu_help Je\xBFeli aktywne, to nast\xB9pi przeskok przez ca\xB3e menu, je\x9Cli dojdziesz do jego ko\xF1ca i naci\x9Cnij klawisz w d\xF3\xB3.
-floor_mirror_int_help Si\xB3a lustra pod\xB3ogi.
-color_strings_help Tw\xF3rz stringi do kolorowych efekt\xF3w.
-filter_color_strings_help Odfiltruj kody kolor\xF3w wiadomo\x9Cci z sieci.
-filter_color_names_help Odfiltruj kody kolor\xF3w nazw graczy.
-filter_name_ends_help Odfiltruj spacje i inne \x9Cmieci na pocz\xB9tku/ko\xF1cu nazw graczy.
-filter_name_middle_help Odfiltruj spacje i inne \x9Cmieci z nazw graczy.
-filter_color_server_names_help Odfiltruj kody kolor\xF3w z nazw serwer\xF3w.
-filter_dark_color_strings_help Odfiltruj czarny kolor wiadomo\x9Cci z sieci.
-filter_dark_color_names_help Odfiltruj czarny kolor nazw graczy.
-filter_dark_color_server_names_help Odfiltruj czarne znaki z nazw serwer\xF3w.
-filter_color_team_help Odfiltruj kody kolor\xF3w z diadomo\x9Cci /team.
-filter_dark_color_team_help Odfiltruj czarnu kolor z diadomo\x9Cci /team.
-zone_alpha_help Przezroczysto\x9C\xE6 stref. 1.0 - pe\xB3ny kolor.
-zone_alpha_server_help Przezroczysto\x9C\xE6 stref kontrolowana przez serwer. 1.0 - pe\xB3ny kolor.
-
-#screen mode
-custom_screen_height_help W\xB3asny rozmiar ekranu
-custom_screen_width_help W\xB3asny rozmiar ekranu
-custom_screen_aspect_help W\xB3asna dysproporcja ekranu ( szeroko\x9C\xE6 piksela/wysoko\x9C\xE6 piksela)
-screen_size_desktop Pulpit
-armagetron_screenmode_help Rozdzielczo\x9C\xE6 ekranu
-armagetron_last_screenmode_help Ostatnia rozdzielczo\x9C\xE6 ekranu
-armagetron_windowsize_help Rozmiar okna
-armagetron_last_windowsize_help Ostatni rozmiar okna
-fullscreen_help Pe\xB3ny ekran, czy gra w oknie?
-last_fullscreen_help Pe\xB3ny ekran, czy gra w oknie? - ostatnia dzia\xB3aj\xB9ca warto\x9C\xE6.
-check_errors_help Sprawdzaj, czy dany tryb video istnieje.
-last_check_errors_help Sprawdzaj, czy dany tryb video i...
[truncated message content] |
|
From: <baz...@us...> - 2009-01-05 18:13:36
|
Revision: 8747
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8747&view=rev
Author: bazaarmagetron
Date: 2009-01-05 18:13:18 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
epsy: fixed build
Modified Paths:
--------------
armagetronad/trunk/armagetronad/batch/make/version
armagetronad/trunk/armagetronad/src/Makefile.am
armagetronad/trunk/armagetronad/src/tools/tVersion.h
Added Paths:
-----------
armagetronad/trunk/armagetronad/src/tools/tVersion.cpp
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2009-01-04 22:49:50.466000080 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
+ timestamp: 2009-01-05 19:05:02.072000027 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
rebase-of: ep...@fr...-20090105180502-9mwjqfi42t9sbnab
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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
+ 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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
Modified: armagetronad/trunk/armagetronad/batch/make/version
===================================================================
--- armagetronad/trunk/armagetronad/batch/make/version 2009-01-05 12:36:57 UTC (rev 8746)
+++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-05 18:13:18 UTC (rev 8747)
@@ -34,7 +34,19 @@
major_version=`cat ${srcdir}/major_version`
DATE=`date +%Y%m%d`
builddate=`date -R`
+minor_version=
+revid=0
+revno=0
+branchnick=
+revcount=
+tag=
+srcchanged=
+builddate=
+lca=0
+lcaz=0
+branchurl=
+
#echo $major_version
#echo $minor_version
Modified: armagetronad/trunk/armagetronad/src/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-05 12:36:57 UTC (rev 8746)
+++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-05 18:13:18 UTC (rev 8747)
@@ -36,8 +36,8 @@
echo "#define TRUE_ARMAGETRONAD_VERSION VERSION" > $@; \
fi
-${srcdir}/tools/tLocale.cpp: ${srcdir}/tools/tVersion.h
-${srcdir}/tools/tVersion.h: tTrueVersion.h
+${srcdir}/tools/tLocale.cpp: ${srcdir}/tools/tVersion.cpp
+${srcdir}/tools/tVersion.cpp: tTrueVersion.h
# library file listings
@@ -50,7 +50,7 @@
# Note: tMemManager.cpp must be last to avoid false leak reports (sorry for
# the fragile dependency on undefined behaviour of the linker...)
-libtools_a_SOURCES = ${tools_extra} tools/tArray.cpp tools/tArray.h tools/tCallback.cpp tools/tCallback.h tools/tCallbackString.h tools/tColor.cpp tools/tColor.h\
+libtools_a_SOURCES = ${tools_extra} tools/tVersion.h tools/tArray.cpp tools/tArray.h tools/tCallback.cpp tools/tCallback.h tools/tCallbackString.h tools/tColor.cpp tools/tColor.h\
tools/tConfiguration.cpp tools/tConfiguration.h tools/tConsole.cpp tools/tConsole.h tools/tCrypt.cpp tools/tCrypt.h\
tools/tDirectories.cpp tools/tDirectories.h tools/tError.cpp tools/tError.h tools/tEventQueue.cpp\
tools/tEventQueue.h tools/tHeap.cpp tools/tHeap.h tools/tInitExit.h tools/tLinkedList.cpp tools/tLinkedList.h\
Added: armagetronad/trunk/armagetronad/src/tools/tVersion.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tVersion.cpp (rev 0)
+++ armagetronad/trunk/armagetronad/src/tools/tVersion.cpp 2009-01-05 18:13:18 UTC (rev 8747)
@@ -0,0 +1,44 @@
+/*
+
+*************************************************************************
+
+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.
+
+***************************************************************************
+
+*/
+#ifndef TRUE_ARMAGETRONAD_VERSION
+#include "tTrueVersion.h"
+#endif
+
+#include "tVersion.h"
+
+st_programVersion = TRUE_ARMAGETRONAD_VERSION;
+st_programRevId = TRUE_ARMAGETRONAD_REVID;
+st_programRevNo = TRUE_ARMAGETRONAD_REVNO;
+st_programBranchNick = TRUE_ARMAGETRONAD_BRANCHNICK;
+st_programRevZNr = TRUE_ARMAGETRONAD_ZNR;
+st_programRevTag = TRUE_ARMAGETRONAD_REVTAG;
+st_programChanged = TRUE_ARMAGETRONAD_CHANGED;
+st_programBuildDate = TRUE_ARMAGETRONAD_BUILDDATE;
+st_programBranchLca = TRUE_ARMAGETRONAD_BRANCHLCA;
+st_programBranchLcaZ = TRUE_ARMAGETRONAD_BRANCHLCAZ;
+st_programBranchUrl = TRUE_ARMAGETRONAD_BRANCHURL;
+
Modified: armagetronad/trunk/armagetronad/src/tools/tVersion.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tVersion.h 2009-01-05 12:36:57 UTC (rev 8746)
+++ armagetronad/trunk/armagetronad/src/tools/tVersion.h 2009-01-05 18:13:18 UTC (rev 8747)
@@ -25,22 +25,21 @@
*/
-#ifndef TRUE_ARMAGETRONAD_VERION
-#include "tTrueVersion.h"
+#ifndef tVersion_h
+#define tVersion_h 1
+static tString st_programName ("Armagetron Advanced"); //!< The name of this game (\g)
+static tString st_programVersion; //!< The build label, or version (\v)
+static tString st_programRevId; //!< The revision ID this build is based from, if any. (\i)
+static int st_programRevNo; //!< The revision number this build is based from (\o)
+static tString st_programBranchNick; //!< The branch's nick (\p)
+static int st_programRevZNr; //!< The revisions's z-number, fool's number or whatever shows up right after the z (\z)
+static tString st_programRevTag; //!< This revision's tag, if any (\t)
+static bool st_programChanged; //!< True if working tree contained changes, or if the branch diverged (\c)
+static tString st_programBuildDate; //!< The date this build was compiled on (\d)
+static int st_programBranchLca; //!< The branch's last common ancestor with it's parent branch (\l)
+static int st_programBranchLcaZ; //!< The branch's last common ancestor with it's parent branch, z-number edition (\m)
+static tString st_programBranchUrl; //!< The branch's URL, or whatever leads to it (\b)
-static tString st_programName ("Armagetron Advanced"); //!< The name of this game (\g)
-static tString st_programVersion (TRUE_ARMAGETRONAD_VERSION); //!< The build label, or version (\v)
-static tString st_programRevId (TRUE_ARMAGETRONAD_REVID); //!< The revision ID this build is based from, if any. (\i)
-static int st_programRevNo (TRUE_ARMAGETRONAD_REVNO); //!< The revision number this build is based from (\o)
-static tString st_programBranchNick(TRUE_ARMAGETRONAD_BRANCHNICK); //!< The branch's nick (\p)
-static int st_programRevZNr (TRUE_ARMAGETRONAD_ZNR); //!< The revisions's z-number, fool's number or whatever shows up right after the z (\z)
-static tString st_programRevTag (TRUE_ARMAGETRONAD_REVTAG); //!< This revision's tag, if any (\t)
-static bool st_programChanged (TRUE_ARMAGETRONAD_CHANGED); //!< True if working tree contained changes, or if the branch diverged (\c)
-static tString st_programBuildDate (TRUE_ARMAGETRONAD_BUILDDATE); //!< The date this build was compiled on (\d)
-static int st_programBranchLca (TRUE_ARMAGETRONAD_BRANCHLCA); //!< The branch's last common ancestor with it's parent branch (\l)
-static int st_programBranchLcaZ(TRUE_ARMAGETRONAD_BRANCHLCAZ); //!< The branch's last common ancestor with it's parent branch, z-number edition (\m)
-static tString st_programBranchUrl (TRUE_ARMAGETRONAD_BRANCHURL); //!< The branch's URL, or whatever leads to it (\b)
-
-
#endif
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2009-01-05 19:45:03
|
Revision: 8749
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8749&view=rev
Author: bazaarmagetron
Date: 2009-01-05 19:44:52 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
epsy: ..and have an actual working version label
Modified Paths:
--------------
armagetronad/trunk/armagetronad/batch/make/version
armagetronad/trunk/armagetronad/src/Makefile.am
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-05 19:05:02.072000027 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
rebase-of: ep...@fr...-20090105180502-9mwjqfi42t9sbnab
+ timestamp: 2009-01-05 20:36:13.522000074 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
rebase-of: ep...@fr...-20090105193613-fn2xfz27wefzuy6h
Modified: bzr:file-ids
- 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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
+ 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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
754 ep...@fr...-20090105193613-6e3qa8ar6qgwtr81
Modified: armagetronad/trunk/armagetronad/batch/make/version
===================================================================
--- armagetronad/trunk/armagetronad/batch/make/version 2009-01-05 19:03:42 UTC (rev 8748)
+++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-05 19:44:52 UTC (rev 8749)
@@ -41,7 +41,6 @@
revcount=
tag=
srcchanged=
-builddate=
lca=0
lcaz=0
branchurl=
@@ -131,15 +130,15 @@
# 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 | grep '^ *revno: [0-9\.]+$' | wc -l)
+ 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 | grep '^ parent branch: .*$' | awk '-F: ' '{ print $2 }' )
+ 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 )
+ bzrmissingcout=$( cd ${srcdir} && bzr missing --this 2>/dev/null )
missing=$?
bzr diff ${srcdir} --quiet >/dev/null 2>&1
changed=$?
@@ -149,9 +148,9 @@
# if it diverged:
then
# Count the revisions we added locally
- localrevisions=$( echo "${bzrmissingcout}" | sed -n '2,1p' | awk '{print $3}' )
+ 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} | grep -P '^ *revno: [0-9\.]+$' | wc -l )
+ 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
@@ -169,7 +168,7 @@
# 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 -d ${srcdir} | grep -P "^(.*?) +${revno}$" | awk '{ print $1 }')
+ tag=$(bzr tags -d ${srcdir} | sed -ne 's/^\(.*\) +${revno}$/\1/p' )
if test ${tag}
then
# If it is tagged, use the tag
@@ -188,7 +187,7 @@
then
major_version=$( cd ${srcdir}; bzr nick )
branchnick=$major_version
- revid=`bzr testament | grep "^revision-id: " | awk '{print $2}'`
+ revid=$( bzr testament | sed -ne 's/^revision-id: \(.*\)/\1/p' )
fi
fi
Modified: armagetronad/trunk/armagetronad/src/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-05 19:03:42 UTC (rev 8748)
+++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-05 19:44:52 UTC (rev 8749)
@@ -50,7 +50,7 @@
# Note: tMemManager.cpp must be last to avoid false leak reports (sorry for
# the fragile dependency on undefined behaviour of the linker...)
-libtools_a_SOURCES = ${tools_extra} tools/tVersion.h tools/tArray.cpp tools/tArray.h tools/tCallback.cpp tools/tCallback.h tools/tCallbackString.h tools/tColor.cpp tools/tColor.h\
+libtools_a_SOURCES = ${tools_extra} tools/tVersion.cpp tools/tArray.cpp tools/tArray.h tools/tCallback.cpp tools/tCallback.h tools/tCallbackString.h tools/tColor.cpp tools/tColor.h\
tools/tConfiguration.cpp tools/tConfiguration.h tools/tConsole.cpp tools/tConsole.h tools/tCrypt.cpp tools/tCrypt.h\
tools/tDirectories.cpp tools/tDirectories.h tools/tError.cpp tools/tError.h tools/tEventQueue.cpp\
tools/tEventQueue.h tools/tHeap.cpp tools/tHeap.h tools/tInitExit.h tools/tLinkedList.cpp tools/tLinkedList.h\
Modified: armagetronad/trunk/armagetronad/src/tools/tVersion.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tVersion.cpp 2009-01-05 19:03:42 UTC (rev 8748)
+++ armagetronad/trunk/armagetronad/src/tools/tVersion.cpp 2009-01-05 19:44:52 UTC (rev 8749)
@@ -26,19 +26,21 @@
*/
#ifndef TRUE_ARMAGETRONAD_VERSION
#include "tTrueVersion.h"
-#endif
#include "tVersion.h"
+#include "tString.h"
-st_programVersion = TRUE_ARMAGETRONAD_VERSION;
-st_programRevId = TRUE_ARMAGETRONAD_REVID;
-st_programRevNo = TRUE_ARMAGETRONAD_REVNO;
-st_programBranchNick = TRUE_ARMAGETRONAD_BRANCHNICK;
-st_programRevZNr = TRUE_ARMAGETRONAD_ZNR;
-st_programRevTag = TRUE_ARMAGETRONAD_REVTAG;
-st_programChanged = TRUE_ARMAGETRONAD_CHANGED;
-st_programBuildDate = TRUE_ARMAGETRONAD_BUILDDATE;
-st_programBranchLca = TRUE_ARMAGETRONAD_BRANCHLCA;
-st_programBranchLcaZ = TRUE_ARMAGETRONAD_BRANCHLCAZ;
-st_programBranchUrl = TRUE_ARMAGETRONAD_BRANCHURL;
+tString st_programName ("Armagetron Advanced");
+tString st_programVersion (TRUE_ARMAGETRONAD_VERSION);
+tString st_programRevId (TRUE_ARMAGETRONAD_REVID);
+int st_programRevNo (TRUE_ARMAGETRONAD_REVNO);
+tString st_programBranchNick (TRUE_ARMAGETRONAD_BRANCHNICK);
+int st_programRevZNr (TRUE_ARMAGETRONAD_ZNR);
+tString st_programRevTag (TRUE_ARMAGETRONAD_REVTAG);
+bool st_programChanged (TRUE_ARMAGETRONAD_CHANGED);
+tString st_programBuildDate (TRUE_ARMAGETRONAD_BUILDDATE);
+int st_programBranchLca (TRUE_ARMAGETRONAD_BRANCHLCA);
+int st_programBranchLcaZ (TRUE_ARMAGETRONAD_BRANCHLCAZ);
+tString st_programBranchUrl (TRUE_ARMAGETRONAD_BRANCHURL);
+#endif
Modified: armagetronad/trunk/armagetronad/src/tools/tVersion.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tVersion.h 2009-01-05 19:03:42 UTC (rev 8748)
+++ armagetronad/trunk/armagetronad/src/tools/tVersion.h 2009-01-05 19:44:52 UTC (rev 8749)
@@ -28,18 +28,20 @@
#ifndef tVersion_h
#define tVersion_h 1
-static tString st_programName ("Armagetron Advanced"); //!< The name of this game (\g)
-static tString st_programVersion; //!< The build label, or version (\v)
-static tString st_programRevId; //!< The revision ID this build is based from, if any. (\i)
-static int st_programRevNo; //!< The revision number this build is based from (\o)
-static tString st_programBranchNick; //!< The branch's nick (\p)
-static int st_programRevZNr; //!< The revisions's z-number, fool's number or whatever shows up right after the z (\z)
-static tString st_programRevTag; //!< This revision's tag, if any (\t)
-static bool st_programChanged; //!< True if working tree contained changes, or if the branch diverged (\c)
-static tString st_programBuildDate; //!< The date this build was compiled on (\d)
-static int st_programBranchLca; //!< The branch's last common ancestor with it's parent branch (\l)
-static int st_programBranchLcaZ; //!< The branch's last common ancestor with it's parent branch, z-number edition (\m)
-static tString st_programBranchUrl; //!< The branch's URL, or whatever leads to it (\b)
+#include "tString.h"
+extern tString st_programName; //!< The name of this game (\g)
+extern tString st_programVersion; //!< The build label, or version (\v)
+extern tString st_programRevId; //!< The revision ID this build is based from, if any. (\i)
+extern int st_programRevNo; //!< The revision number this build is based from (\o)
+extern tString st_programBranchNick; //!< The branch's nick (\p)
+extern int st_programRevZNr; //!< The revisions's z-number, fool's number or whatever shows up right after the z (\z)
+extern tString st_programRevTag; //!< This revision's tag, if any (\t)
+extern bool st_programChanged; //!< True if working tree contained changes, or if the branch diverged (\c)
+extern tString st_programBuildDate; //!< The date this build was compiled on (\d)
+extern int st_programBranchLca; //!< The branch's last common ancestor with it's parent branch (\l)
+extern int st_programBranchLcaZ; //!< The branch's last common ancestor with it's parent branch, z-number edition (\m)
+extern tString st_programBranchUrl; //!< The branch's URL, or whatever leads to it (\b)
+
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <z-...@us...> - 2009-01-06 17:21:10
|
Revision: 8752
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8752&view=rev
Author: z-man
Date: 2009-01-06 17:21:09 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
Fixed last few errors with SVN builds.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/batch/make/version
armagetronad/trunk/armagetronad/src/tools/tVersion.cpp
Modified: armagetronad/trunk/armagetronad/batch/make/version
===================================================================
--- armagetronad/trunk/armagetronad/batch/make/version 2009-01-06 11:39:31 UTC (rev 8751)
+++ armagetronad/trunk/armagetronad/batch/make/version 2009-01-06 17:21:09 UTC (rev 8752)
@@ -38,7 +38,7 @@
revid=0
revno=0
branchnick=
-revcount=
+revcount=0
tag=
srcchanged=
lca=0
@@ -122,7 +122,7 @@
# 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 $? -eq 0 && test -d ${srcdir}/.bzr
#if test 1 -eq 0
then
# Crappily, we can't rely on revision numbers to do anything
Modified: armagetronad/trunk/armagetronad/src/tools/tVersion.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tVersion.cpp 2009-01-06 11:39:31 UTC (rev 8751)
+++ armagetronad/trunk/armagetronad/src/tools/tVersion.cpp 2009-01-06 17:21:09 UTC (rev 8752)
@@ -30,6 +30,51 @@
#include "tVersion.h"
#include "tString.h"
+// emergency defines for macros so rarely used build paths can be lazy
+#ifndef TRUE_ARMAGETRONAD_VERSION
+#define TRUE_ARMAGETRONAD_VERSION "UNKNOWN"
+#endif
+
+#ifndef TRUE_ARMAGETRONAD_REVID
+#define TRUE_ARMAGETRONAD_REVID "UNKNOWN"
+#endif
+
+#ifndef TRUE_ARMAGETRONAD_REVNO
+#define TRUE_ARMAGETRONAD_REVNO 0
+#endif
+
+#ifndef TRUE_ARMAGETRONAD_BRANCHNICK
+#define TRUE_ARMAGETRONAD_BRANCHNICK "UNKNOWN"
+#endif
+
+#ifndef TRUE_ARMAGETRONAD_ZNR
+#define TRUE_ARMAGETRONAD_ZNR 0
+#endif
+
+#ifndef TRUE_ARMAGETRONAD_REVTAG
+#define TRUE_ARMAGETRONAD_REVTAG ""
+#endif
+
+#ifndef TRUE_ARMAGETRONAD_CHANGED
+#define TRUE_ARMAGETRONAD_CHANGED false
+#endif
+
+#ifndef TRUE_ARMAGETRONAD_BUILDDATE
+#define TRUE_ARMAGETRONAD_BUILDDATE "UNKNOWN"
+#endif
+
+#ifndef TRUE_ARMAGETRONAD_BRANCHLCA
+#define TRUE_ARMAGETRONAD_BRANCHLCA 0
+#endif
+
+#ifndef TRUE_ARMAGETRONAD_BRANCHLCAZ
+#define TRUE_ARMAGETRONAD_BRANCHLCAZ 0
+#endif
+
+#ifndef TRUE_ARMAGETRONAD_BRANCHURL
+#define TRUE_ARMAGETRONAD_BRANCHURL "UNKNOWN"
+#endif
+
tString st_programName ("Armagetron Advanced");
tString st_programVersion (TRUE_ARMAGETRONAD_VERSION);
tString st_programRevId (TRUE_ARMAGETRONAD_REVID);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2009-01-06 17:34:17
|
Revision: 8753
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8753&view=rev
Author: bazaarmagetron
Date: 2009-01-06 17:34:08 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
author: Bazaarmagetron
Automatic merging of commits that would change history order:
------------------------------------------------------------
revno: 755.1.1
committer: Manuel Moos <z-...@us...>
branch nick: armagetronad
timestamp: Tue 2009-01-06 13:18:01 +0100
message:
Merging from 0.3.1:
Manuel Moos 2009-01-06 Fixed server compilation.
Manuel Moos 2009-01-06 Fixed more warnings.
Manuel Moos 2009-01-05 Fixed unused variable and variable init orde...
dave@davefancella... 2009-01-05 Credited voodoo for camview
dave@davefancella... 2009-01-05 Added camview, from voodoo
dave@davefancella... 2009-01-05 Hopefully fixed line endings in thi...
dave@davefancella... 2009-01-05 Hopefully converted line endings to...
voodoo 2008-04-18 Apply camview patch
voodoo 2008-04-18 Apply camview patch
------------------------------------------------------------
revno: 747.1.7
committer: Manuel Moos <z-...@us...>
branch nick: armagetronad
timestamp: Tue 2009-01-06 00:10:59 +0100
message:
Fixed server compilation.
------------------------------------------------------------
revno: 747.1.6
committer: Manuel Moos <z-...@us...>
branch nick: armagetronad
timestamp: Tue 2009-01-06 00:01:16 +0100
message:
Fixed more warnings.
------------------------------------------------------------
revno: 747.1.5
committer: Manuel Moos <z-...@us...>
branch nick: armagetronad
timestamp: Mon 2009-01-05 23:56:11 +0100
message:
Fixed unused variable and variable init order warnings.
------------------------------------------------------------
revno: 747.1.4
committer: da...@da...
branch nick: 0.3.1_test
timestamp: Mon 2009-01-05 13:28:06 -0600
message:
Credited voodoo for camview
------------------------------------------------------------
revno: 747.1.3
committer: da...@da...
branch nick: 0.3.1_test
timestamp: Mon 2009-01-05 13:26:48 -0600
message:
Added camview, from voodoo
------------------------------------------------------------
revno: 685.2.1
committer: voodoo
branch nick: trunk-armagetronad-camview
timestamp: Fri 2008-04-18 17:23:02 +0200
message:
Apply camview patch
------------------------------------------------------------
revno: 685.1.1
committer: voodoo
branch nick: trunk-armagetronad-camview
timestamp: Fri 2008-04-18 17:20:40 +0200
message:
Apply camview patch
------------------------------------------------------------
revno: 747.1.2
committer: da...@da...
branch nick: armagetronad
timestamp: Mon 2009-01-05 07:12:44 -0600
message:
Hopefully fixed line endings in this file too
------------------------------------------------------------
revno: 747.1.1
committer: da...@da...
branch nick: armagetronad
timestamp: Mon 2009-01-05 05:57:51 -0600
message:
Hopefully converted line endings to DOS line endings
Modified Paths:
--------------
armagetronad/trunk/armagetronad/AUTHORS
armagetronad/trunk/armagetronad/minor_version
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
armagetronad/trunk/armagetronad/win32/README.txt
armagetronad/trunk/armagetronad/win32/makedist.bat
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 20:36:13.522000074 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
rebase-of: ep...@fr...-20090105193613-fn2xfz27wefzuy6h
+ timestamp: 2009-01-06 18:28:11.694999933 +0100
committer: Bazaarmagetron <z-...@us...>
properties:
branch-nick: trunk-armagetronad-sync
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
z-...@us...-20090106121801-fzuzz5wqmb5qwuj4
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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
754 ep...@fr...-20090105193613-6e3qa8ar6qgwtr81
+ 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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
754 ep...@fr...-20090105193613-6e3qa8ar6qgwtr81
757 z-...@us...-20090106172811-6nrrkm9rafkm9elx
Modified: armagetronad/trunk/armagetronad/AUTHORS
===================================================================
--- armagetronad/trunk/armagetronad/AUTHORS 2009-01-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/AUTHORS 2009-01-06 17:34:08 UTC (rev 8753)
@@ -60,7 +60,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
Modified: armagetronad/trunk/armagetronad/minor_version
===================================================================
--- armagetronad/trunk/armagetronad/minor_version 2009-01-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/minor_version 2009-01-06 17:34:08 UTC (rev 8753)
@@ -1 +1 @@
-_alphaDATE
+.1_alpha1
Modified: armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml
===================================================================
--- armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml 2009-01-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/resource/proto/cockpit.dtd 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-06 17:34:08 UTC (rev 8753)
@@ -147,6 +147,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\
@@ -235,7 +236,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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/engine/eCamera.cpp 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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,13 @@
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){
+ vp(view),
+ cameraMain_(rMain), renderInCockpit_(false), mirrorView_(false)
+ {
/*
if (p->pID>=0)
localPlayer=playerConfig[p->pID];
@@ -503,8 +506,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 +521,46 @@
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;
+ case CAMERA_COUNT:
+ tASSERT(0);
+ break;
+ }
+ return true;
+ }
+ return false;
+}
+
void eCamera::SwitchView(){
zNear = 0.01f;
@@ -1444,6 +1490,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 +1538,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 +1548,7 @@
test.detect(se_cameraInMaxFocusDistance*Center()->Speed());
offset = test.hit;
}
-
+
gluLookAt(0,
0,
0,
@@ -2191,6 +2241,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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/engine/eCamera.h 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/engine/eDisplay.cpp 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/engine/eGrid.cpp 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/engine/eGrid.h 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/render/rViewport.h 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:34:08 UTC (rev 8753)
@@ -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), mainCameraFlag(false), mainCameraDirFlag(false), dirAngleFlag(false),
+ posTranslationFlag(false),
+ riseFlag(false), fovFlag(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-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.cpp 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/tron/cockpit/cCockpit.h 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/tron/cockpit/cMap.cpp 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/tron/cockpit/cWidgetBase.h 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2009-01-06 17:34:08 UTC (rev 8753)
@@ -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,10 @@
su_prefetchInput=false;
+#ifndef DEDICATED
+ cCockpit::AfterRoundProcess();
+#endif
+
int i;
for (i=ePlayer::Num()-1;i>=0;i--){
if (ePlayer::PlayerConfig(i))
@@ -1204,6 +1208,7 @@
lastTime_gameloop=lastTimeTimestep=0;
}
+ cCockpit::BeforeRoundProcess();
#else
se_ResetGameTimer( -PREPARE_TIME - sg_extraRoundTime );
se_PauseGameTimer(false);
@@ -1268,14 +1273,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 );
Modified: armagetronad/trunk/armagetronad/win32/README.txt
===================================================================
--- armagetronad/trunk/armagetronad/win32/README.txt 2009-01-06 17:21:09 UTC (rev 8752)
+++ armagetronad/trunk/armagetronad/win32/README.txt 2009-01-06 17:34:08 UTC (rev 8753)
@@ -1,67 +1,67 @@
-Compiling Armagetron Advanced on Windows with Code::Blocks
-----------------------------------------------------------
-
-Code::Blocks is an open source, cross platform C/C++ IDE.
-It has multiple compiler support, and it comes in two presentations:
-MinGW bundle or Standalone for use with other compilers.
-
-More info and download of Code::Blocks: http://www.codeblocks.org
-
-Armagetron Advanced can be compiled with these compilers:
-* MinGw: obtained in the MinGW bundle download of Code::Blocks
-* Free Microsoft Visual C++ Toolkit 2003: http://msdn.microsoft.com/visualc/vctoolkit2003/
-
-Currently I use the following nightly build of Code::Blocks:
- CB_20060428_rev2395_win32_wx263.7z
-You also need an additional DLL:
- wxmsw26u_gcc_cb_wx2.6.3.7z
-
-Download Link: http://developer.berlios.de/project/showfiles.php?group_id=5358
-
-The sources are distributed over two SVN modules:
-* armagetronad: containing generic sources and codeblocks project files
-* winlibs: containing the libraries Armagetron Advanced depends on
-
-You need to check out the two modules from the repository at
-
-https://armagetronad.svn.sourceforge.net/svnroot/armagetronad
-
-You can just check out
-https://armagetronad.svn.sourceforge.net/svnroot/armagetronad/trunk, that
-way you'll have the correct directory structure, although you'll also get
-some files you don't need. One way to do that is to use TortoiseSVN
-(http://tortoisesvn.tigris.org/).
-
-1. Create a project directory (e.g. C:\Projects\Armagetron)
-2. put the armagetronad source files there
-3. In the same directory, put the winlibs files
-4. It should look something like this:
- +- Armagetron
- +- armagetronad
- +- winlibs
-5. Check you've got python installed and set the path to the executable
- inside python.bat
-6. Go to the armagetronad/win32 directory
- run update_version.bat
-7. Start the Armagetron workspace (Armagetron.workspace)
-8. To compile you will need to change the project's target to either
- Release, Debug or Profile (it defaults to Release)
-9. Go to the armagetronad/win32 directory
- Run the makedist.bat file to copy all neccessary files into
- the build directories (dist, debug or profile).
- +- Armagetron
- +- armagetronad
- +- build
- +- dist
- +- debug
- +- profile
-
-Note: Only directories that are already present will be updated.
- At the end you will get a status report about missing files.
-
-To create an installer you need to install the nullsoft installer development
-environment (http://nsis.sourceforge.net/). After that you can right click
-on armagetronad.nsi in the appropriate build directory (not in the win32
-directory, it'll fail) and select "Execute NSIS script".
-
-In case of problems, visit forums.armagetronad.net and ask for help.
+Compiling Armagetron Advanced on Windows with Code::Blocks
+----------------------------------------------------------
+
+Code::Blocks is an open source, cross platform C/C++ IDE.
+It has multiple compiler support, and it comes in two presentations:
+MinGW bundle or Standalone for use with other compilers.
+
+More info and download of Code::Blocks: http://www.codeblocks.org
+
+Armagetron Advanced can be compiled with these compilers:
+* MinGw: obtained in the MinGW bundle download of Code::Blocks
+* F...
[truncated message content] |
|
From: <baz...@us...> - 2009-01-06 22:54:36
|
Revision: 8755
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8755&view=rev
Author: bazaarmagetron
Date: 2009-01-06 22:54:35 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
epsy: allow creating src/tFakeVersion.h to override automatic version lable creating
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-06 18:28:11.694999933 +0100
committer: Bazaarmagetron <z-...@us...>
properties:
branch-nick: trunk-armagetronad-sync
+ timestamp: 2009-01-06 23:43:11.763999939 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
rebase-of: ep...@fr...-20090106224311-9f9q3yemit6sx40u
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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
754 ep...@fr...-20090105193613-6e3qa8ar6qgwtr81
757 z-...@us...-20090106172811-6nrrkm9rafkm9elx
+ 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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
754 ep...@fr...-20090105193613-6e3qa8ar6qgwtr81
757 z-...@us...-20090106172811-6nrrkm9rafkm9elx
759 ep...@fr...-20090106224311-hjguvqlwwt7tqyyd
Modified: armagetronad/trunk/armagetronad/src/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-06 20:09:29 UTC (rev 8754)
+++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-06 22:54:35 UTC (rev 8755)
@@ -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-06 23:32:57
|
Revision: 8756
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8756&view=rev
Author: bazaarmagetron
Date: 2009-01-06 23:32:55 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
author: Manuel Moos
Merging from 0.3.1:
Manuel Moos 2009-01-07 Softened limits on filename lenght in tarballs...
dave@davefancella... 2009-01-06 Merged from trunk
dave@davefancella... 2009-01-06 Fixed bug where any cockpit widgets...
dave@davefancella... 2009-01-06 Fixed bug where any cockpit widgets...
Modified Paths:
--------------
armagetronad/trunk/armagetronad/configure.ac
armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml
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-06 23:43:11.763999939 +0100
committer: epsy <ep...@fr...>
properties:
branch-nick: trunk
rebase-of: ep...@fr...-20090106224311-9f9q3yemit6sx40u
+ timestamp: 2009-01-07 00:25:55.516999960 +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
z-...@us...-20090106121801-fzuzz5wqmb5qwuj4
+ 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
z-...@us...-20090106121801-fzuzz5wqmb5qwuj4
z-...@us...-20090106232346-t572dntah914gdhz
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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
754 ep...@fr...-20090105193613-6e3qa8ar6qgwtr81
757 z-...@us...-20090106172811-6nrrkm9rafkm9elx
759 ep...@fr...-20090106224311-hjguvqlwwt7tqyyd
+ 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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
754 ep...@fr...-20090105193613-6e3qa8ar6qgwtr81
757 z-...@us...-20090106172811-6nrrkm9rafkm9elx
759 ep...@fr...-20090106224311-hjguvqlwwt7tqyyd
760 z-...@us...-20090106232555-c0rb04zb284g544v
Modified: armagetronad/trunk/armagetronad/configure.ac
===================================================================
--- armagetronad/trunk/armagetronad/configure.ac 2009-01-06 22:54:35 UTC (rev 8755)
+++ armagetronad/trunk/armagetronad/configure.ac 2009-01-06 23:32:55 UTC (rev 8756)
@@ -25,8 +25,10 @@
dnl AC_CANONICAL_HOST
AC_PROG_RANLIB
-AM_INIT_AUTOMAKE
+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/resource/proto/Anonymous/original/original.cockpit.xml
===================================================================
--- armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml 2009-01-06 22:54:35 UTC (rev 8755)
+++ armagetronad/trunk/armagetronad/resource/proto/Anonymous/original/original.cockpit.xml 2009-01-06 23:32:55 UTC (rev 8756)
@@ -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-06 22:54:35 UTC (rev 8755)
+++ armagetronad/trunk/armagetronad/src/tron/cockpit/cCamview.cpp 2009-01-06 23:32:55 UTC (rev 8756)
@@ -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,13 +195,20 @@
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()
{
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
@@ -240,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,
@@ -259,9 +268,9 @@
dirAngle(0), dirCos(0), dirSin(0),
posTranslation(tCoord(0,0)),
z(0), rise(0), fov(0),
- mirror(false), mainCameraFlag(false), mainCameraDirFlag(false), dirAngleFlag(false),
+ mirror(false), dirAngleFlag(false),
posTranslationFlag(false),
- riseFlag(false), fovFlag(false), ReadyFlag(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 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <baz...@us...> - 2009-01-07 00:08:57
|
Revision: 8757
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8757&view=rev
Author: bazaarmagetron
Date: 2009-01-07 00:08:49 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
Manuel Moos: Create tTrueVersion.h in build, not source directory.
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 00:25:55.516999960 +0100
committer: Manuel Moos <z-...@us...>
properties:
branch-nick: armagetronad
+ timestamp: 2009-01-07 00:59:27.638000011 +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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
754 ep...@fr...-20090105193613-6e3qa8ar6qgwtr81
757 z-...@us...-20090106172811-6nrrkm9rafkm9elx
759 ep...@fr...-20090106224311-hjguvqlwwt7tqyyd
760 z-...@us...-20090106232555-c0rb04zb284g544v
+ 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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
754 ep...@fr...-20090105193613-6e3qa8ar6qgwtr81
757 z-...@us...-20090106172811-6nrrkm9rafkm9elx
759 ep...@fr...-20090106224311-hjguvqlwwt7tqyyd
760 z-...@us...-20090106232555-c0rb04zb284g544v
761 z-...@us...-20090106235927-jlivdzpq5x60jm85
Modified: armagetronad/trunk/armagetronad/src/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-06 23:32:55 UTC (rev 8756)
+++ armagetronad/trunk/armagetronad/src/Makefile.am 2009-01-07 00:08:49 UTC (rev 8757)
@@ -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 00:10:23
|
Revision: 8758
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8758&view=rev
Author: bazaarmagetron
Date: 2009-01-07 00:10:18 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
Manuel Moos: Create source tarballs with tFakeVersion.h so the extended version info included in builds is correct.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/Makefile.am
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2009-01-07 00:59:27.638000011 +0100
committer: Manuel Moos <z-...@us...>
properties:
branch-nick: armagetronad
+ timestamp: 2009-01-07 00:59:48.582999945 +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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
754 ep...@fr...-20090105193613-6e3qa8ar6qgwtr81
757 z-...@us...-20090106172811-6nrrkm9rafkm9elx
759 ep...@fr...-20090106224311-hjguvqlwwt7tqyyd
760 z-...@us...-20090106232555-c0rb04zb284g544v
761 z-...@us...-20090106235927-jlivdzpq5x60jm85
+ 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 ep...@fr...-20090104202020-0lqda0kmftjpeows
749 ep...@fr...-20090104214950-7puanxm15odj137r
752 ep...@fr...-20090105180502-0782q12e1mtw28t8
754 ep...@fr...-20090105193613-6e3qa8ar6qgwtr81
757 z-...@us...-20090106172811-6nrrkm9rafkm9elx
759 ep...@fr...-20090106224311-hjguvqlwwt7tqyyd
760 z-...@us...-20090106232555-c0rb04zb284g544v
761 z-...@us...-20090106235927-jlivdzpq5x60jm85
762 z-...@us...-20090106235948-tei6dwt5b5ac0s6j
Modified: armagetronad/trunk/armagetronad/Makefile.am
===================================================================
--- armagetronad/trunk/armagetronad/Makefile.am 2009-01-07 00:08:49 UTC (rev 8757)
+++ armagetronad/trunk/armagetronad/Makefile.am 2009-01-07 00:10:18 UTC (rev 8758)
@@ -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:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X