Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,728 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

596 Commits (master)

Author SHA1 Message Date
Buginator 4cb339dbfa Add motd file for 2.3 / trunk and 2.2.x 
Update master server to spit out the correct MOTD based on which client connects to it.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10631 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-04-19 12:52:41 +02:00
Stiv 64cb35ec74 Update plugin status 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10390 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-21 19:47:12 +01:00
i-nod 1e4ac04582 3ds2pie tool update. Belongs to #1553. 
- Added PIE3 support.
- Conversion routine has been split into 2 parts, with intermediate PIE structure that can be used for model preview: PIE structure is filled with dump_3ds_to_pie(), PIE structure is dumped to .pie file with dump_pie_file().
- Duplicated points removal routine has been added into dump_3ds_to_pie(). "Borrowed" from simplipie tool.
- Implement 'twosided' material handler (instead of old global hack). WARNING! It's completely untested and optional.
- Command line interface is broken, most likely. Should be fixed or removed entirely.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10374 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-20 16:17:48 +01:00
i-nod 53464e236f Update simplipie a bit, so it will produce PIE2 compatible models. 
It should follow verbose switch for non-error output.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10295 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-03-16 15:47:54 +01:00
Per Inge Mathisen f3affb4c58 simplipie: Add duplicate point removal. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9790 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-13 23:05:00 +01:00
Christian Ohm 48a60262bc Make it possible to override the QGLViewer paths for qwzm. 
This makes it possible to compile qwzm on systems that use different paths
without modifying version controlled files.

Create a file called "config" in qwzm's directory that sets the
QGLVIEWER_INCL/LIBS variables. E.g. for Ubuntu 9.10 the following works:

QGLVIEWER_INCL = /usr/include/qglviewer-qt4
QGLVIEWER_LIBS = -lqglviewer-qt4

Current Debian unstable only needs the LIBS line.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9635 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:28:04 +01:00
Guangcong Luo 3cb6835e5c Delete cms.php - it appears to be superfluous. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9525 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:50 +01:00
Guangcong Luo 518bd1bf79 Add persist library to Guidecode. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9524 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:50 +01:00
Guangcong Luo cd8fc32f0e Fix typo in guidecode readme. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9523 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:50 +01:00
Guangcong Luo 23b3d52c46 Add Warzone Guide code into /trunk/tools/guidecode/. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9522 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:50 +01:00
Giel van Schijndel 84dffec0b1 Commit Trac mini plugins (which we use): 
* TracPhpBBCookieAuth
  - Considers users that are logged in on PhpBB to be logged in on Trac as well (resuing the PhpBB cookie)
 * TracHttpOnlyAuthCookie
  - Sets the HttpOnly flag on Trac's auth cookie (prevents clientside, e.g. javascript, scripting access to the cookie)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9516 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:27:49 +01:00
Giel van Schijndel f0fb5d2168 Trac plugin TicketValidEmail: 
* Reject e-mail addresses matching /^\w+@example\.(org|net|com)$/ (see #1317)
 * Suggest logging in as alternative to using a valid e-mail address for the reporter field

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8947 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:03:59 +01:00
Giel van Schijndel f0aacfd6a8 Add a new Trac plugin: TicketValidEmail 
Extends Trac to only accept anonymous tickets when the reporter name is a valid RFC822 e-mail address.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8946 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-02-09 20:03:59 +01:00
Per Inge Mathisen 3b425a0653 map2png: Fix conversion bug 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8656 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-01-30 17:12:54 +01:00
Per Inge Mathisen c6e328bbd3 Add debug message when map loading fails in map tools. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8655 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-01-30 17:12:54 +01:00
Giel van Schijndel 0b1a35cd39 IRC lobby bot: improve production of game list 
* Make sure to loop over all games only once instead of copying them
  - This might prevent a race condition
  - It definitly cleans up that piece of code
 * Make sure to list the Warzone version as well in game listings
 * Only show 2.2 games (instead of 2.1 games)
 * Bump the bot's version number from 0.0.1 to 0.0.2
 * Change 'Warzone Resurrection Project' to 'Warzone 2100 Project'

Original patch written by Buginator, rewritten by myself to be 'Pythonic'

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8653 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-01-30 17:12:54 +01:00
Buginator 9445f60753 Actually use GLuint instead of pretending to be GLuint. 
patch by stiv.
Closes ticket:1148

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8604 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-01-30 17:12:48 +01:00
Git SVN Gateway b945a74f9b Bail out when pushing to the git repository fails. 2009-11-23 18:47:00 +01:00
Dennis Schridde 6abbf79143 rpl2avi converter by Angus Lees 2009-11-22 16:34:23 +01:00
Per Inge Mathisen fe141894e8 simplipie: Fix bug that made it drop connectors. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8474 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:20:05 +01:00
Per Inge Mathisen 0405c24fb1 simplipie: Now modify PIE file in place. Makes it easier to run in scripts. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8436 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:20:00 +01:00
Per Inge Mathisen bb3975f089 Add new tool: simplipie. It strips unused flags from PIE files and rewrites them. 
It also obsoletes the no cull flag by removing it and instead adding duplicate,
reversed polygons to fix the culling issues this flags was meant to fix.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8306 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:49 +01:00
Christian Ohm 68841a105b Blender PIE import plugin: Add a default filename for the file selector 
Makes it start in the current directory instead of $HOME.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8304 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-11-22 16:19:48 +01:00
Giel van Schijndel 593c8fdb0a Lobby server: use Python's enumerate builtin to iterate over a sequence and its indices 
- instead of looping over indices alone and using those indices later on to index into the sequence

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8145 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-28 22:21:07 +02:00
Giel van Schijndel 870233db9a * Don't (attempt to) import an unused (and non-existent) module: `model` 
* Fix the URL for the TicketNotifications Trac-plugin such that it matches its source directory again

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8039 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:13 +02:00
Giel van Schijndel cb279c37c4 * Rename Trac plugin `NewTicketNotification` to the more general `TicketNotifications` 
* Add an additional package (sub-plugin): attachmentnotification
  - This package contains the new AttachmentTicketNotification Trac component
 * Add a new Trac component: AttachmentTicketNotification
  - This component sends notification mails to all ticket subscribers when an attachment is added to that ticket
  - Created this component on Per's request

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8038 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:13 +02:00
Giel van Schijndel fcaf404d25 Log exceptions using the ''exception'' log level/function 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8037 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:13 +02:00
Giel van Schijndel 3563f00a31 Trac NewTicketNotification plugin: 
* Add an admin panel to allow configuration of notification addresses (requires the TRAC_ADMIN permission)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8021 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:11 +02:00
Giel van Schijndel 550053ddc9 Trac NewTicketNotification plugin: 
* Move support for retrieving and saving the list of notification addresses to a separate module: model.py

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8020 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:11 +02:00
Giel van Schijndel 0ee9fdfb66 Add custom Trac plugin: NewTicketNotification: 
* Extends Trac to notify a configured set of e-mail addresses upon ticket creation.
  - Used by us to mail the development mailinglist for each newly created ticket

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8019 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:10 +02:00
Per Inge Mathisen b531c153f7 mapconv: Also convert gameType and gameTime from missions to new format. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8018 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:10 +02:00
Per Inge Mathisen 7866c35fcb mapload: Do not error out when encountering maps without map or terrain info. Deal with it. 
mapconv: Handle maps without map and terrain info (such as map expand missions).


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8017 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:10 +02:00
Per Inge Mathisen 650be0e27e mapconv: Now saves in same directory as read from, puts map files in correct directory, and generates a useful game.ini file 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7976 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:05 +02:00
Per Inge Mathisen 272bad92b1 Support version 2 of the WZM format. It now defines type and angles and angle restrictions of connector, 
and allows string names for meshes instead of merely an index number.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7951 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:01 +02:00
Elio Gubser 229b039492 fix path 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7950 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:07:01 +02:00
Per Inge Mathisen 4ff191aeea Fix compilation of map tools. Add support for version 10 game files with power information. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7905 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-09-27 19:06:53 +02:00
Per Inge Mathisen fe7b8fc515 mapconv: Fix key typos. Implement scroll limits and level name. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7693 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:26 +02:00
Per Inge Mathisen ec95a12e54 Implement entire Deliverance format in new PNG/INI format. That is, the binary map format 
delivered by editworld and used for skirmish and campaign maps.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7692 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:26 +02:00
Per Inge Mathisen 5a5a637ecd Clean up map tools a bit. Add new tool mapconvert that converts existing maps to proposed new map format 
based on INI and PNG files.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7691 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-06-09 23:44:25 +02:00
Giel van Schijndel df13cc83ee Fix a typo: NotImlementedError -> NotImplementedError 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7502 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-28 09:59:24 +02:00
Giel van Schijndel 103a2137f9 Lobbyserver: handle and ignore the case where sending of status messages isn't supported by the current protocol 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7501 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-28 09:59:24 +02:00
Giel van Schijndel 3b7a1bd8dc Use Python's NotImlementedError exception instead of an assert(false) to indicate the lack of an implementation. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7500 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-28 09:59:24 +02:00
Guangcong Luo cf3ea876f9 Commit ticket #423 - Add a tech tree chart generator to the tools. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7449 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-16 16:07:15 +02:00
Giel van Schijndel e959170609 Don't try referencing "not yet" defined variables 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7399 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-15 22:29:31 +02:00
Giel van Schijndel 29201b4c53 Lobby server: Display the "Removing aborted game" message when removing a game 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7397 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-15 22:29:31 +02:00
Giel van Schijndel e5e90e5121 Lobbyserver: Append to the host list instead of trying to its first (possibly non-existing) element 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7391 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-15 22:29:30 +02:00
Giel van Schijndel 7afaa55bc5 Properly handle the fact that Game.hosts is now a variably-sized list 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7372 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-10 19:18:11 +02:00
Giel van Schijndel a385545043 * Don't handle protocol specific encoding in wzmasterserver.py, instead deal with it in the Protocol classes in protocol.py 
* Don't set Game's `hosts` value to a list of ''exactly'' 3
  - Instead use empty strings for non-existing hostnames below 3 (when encoding only)
  - This allows for a bit more extensibility in the future.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7365 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-09 23:29:55 +02:00
Giel van Schijndel 3dfb215c8b Add IPv6 support to the lobby protocol 
* Add a new field: secondaryHosts, an array of two fallback hosts
  - Canibalize the entire "misc" field and part of the "extra" field for this
  - When connecting, first try the primary "host" field, then fall back to the hosts in secondaryHosts (in order)
 * Add a new field: gameId, used on the lobby server to link multiple lobby connections to a single game entry
  - First (attempt to) connect to the lobby with all available address families (currently IPv4 and IPv6)
  - Then ask for a gameId from the lobby server using the first established lobby connection
  - Set the gameId field in the GAMESTRUCT to the one retrieved
  - Transmit the GAMESTRUCT using a "addg" command to the lobby over each lobby connection
  - The lobby then compares all incoming ID numbers with ID numbers already present
  - If there's a match it will use the GAMESTRUCT already present and only add a new hostname to the list

This is the last change, part of, and closes #452

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7364 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-09 23:29:55 +02:00
Giel van Schijndel a43e84e0fd Lobby server: in the "Game unreachable" message, sent when the connection test fails, give the port number of the game server, not the lobby server 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7343 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:42 +02:00
Giel van Schijndel a71b83b91b On platforms that don't support IPV6_V6ONLY, just ignore it and hope the platform doesn't automatically enable IPv6 mapped IPv4 addresses 
This allows the lobby server to be used on platforms that don't support IPV6_V6ONLY socket option.

Thanks to Buginator for reporting this.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7342 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:41 +02:00
Giel van Schijndel e672ad000e Fix error introduced in r7323: gameHost is a member of "self" now, not a local variable 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7324 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:40 +02:00
Giel van Schijndel d02f591709 Lobby protocol; change the way the "addg" command works: 
* Make the "addg" command return a status code (ranging 200-299 on success) and message (MOTD on succes)
 * Don't use the "motd" command anymore to check the lobby status, instead use the returned status code for that purpose.
 * Allow MOTD strings of arbitrary length (by sending along the length)

This modification ensures that ''proper'' connectivity checking is being performed on the game server (and reported to the user accurately).

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7323 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:40 +02:00
Giel van Schijndel 7c49ed6628 Lobby utility library: 
* Create another custom context manager (can be used in with-statement) for creating a connection to a given (host, port): "connection"
  - Perform manual name-resolution, using each returned entry until one can be succesfully connected to (allows IPv4 + IPv6 through the same function)
 * Use this context manager instead of connecting manually

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7305 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:38 +02:00
Giel van Schijndel 24cc8fda66 Use the "Protocol" constructor function instead of trying to use "BinaryProtocol" (which doesn't exist anymore) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7304 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:38 +02:00
Giel van Schijndel e0adf0d0e8 Revert r7276's accidental change to wzmasterserver.py 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7277 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:34 +02:00
Giel van Schijndel 9943cf6b01 Lets not mark utility modules as executable 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7276 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:34 +02:00
Giel van Schijndel 8b7f17e2e5 Fix _swap_endianness() to return it's argument endian-swapped, not a tuple containing that result 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7273 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:33 +02:00
Giel van Schijndel 7e7ba74801 Move exception handling to the location where RequestHandler.handle(self) is being invoked from 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7269 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:33 +02:00
Giel van Schijndel 36dc3d8c6c Use the RequestHandler's finish() method for cleaning up any open games instead of a try-finally block 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7268 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:33 +02:00
Giel van Schijndel 6618674111 Fix a syntax error from r7266 (and a disconnected spelling error while we're at it) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7267 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:33 +02:00
Giel van Schijndel 0c7f44ee70 Make gamedblock intrinsic to GameDB itself (i.e. let it contain its own lock) 
* Return generators instead of entire lists and have the generator keep the lock intact while it's being iterated over

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7266 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:32 +02:00
Giel van Schijndel 3153a9f63d Make sure to reset the "requests" counter when checkInterval is reached 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7265 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:32 +02:00
Giel van Schijndel 563ff537a1 Lobbyserver: Use separate sockets to listen on IPv4 and IPv6 (instead of a single socket which uses IPv4 to IPv6 mapping) 
* Use select(2) to wait for a connection on both sockets and accept(2)ing them in a separate thread
 * This prevents IPv4 addresses from becoming IPv6 mapped, which might not be properly supported on all platforms
  - The IPv6 mapped addresses where transferred back to clients

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7264 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:32 +02:00
Giel van Schijndel fb4c443dd8 Update the lobby server to still be in sync with the 2.2 lobby protocol which was changed in r7239 
Use 40 bytes for the "host" (IP address) in GAMESTRUCT, this allows for using IPv6 without breaking protocol combatility again

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7249 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:30 +02:00
Giel van Schijndel b665aa67ba Update the lobby server to still be in sync with the 2.2 lobby protocol which was changed in r7246 
Move GAMESTRUCT_VERSION to the top of GAMESTRUCT, thus allowing versioning to work properly at all times

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7248 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:30 +02:00
Giel van Schijndel ebd93276a6 Make the lobby server listen and operate on IPv6 
* Also disable IPV6_V6ONLY to make sure that (on systems that support the option) IPv4 is still supported, using the same socket
  - This option works on Linux from 2.4.21 and 2.6 (according to "man ipv6")
  - On FreeBSD this works from version 6 onward (lower versions might work, I only tested on 6 and 7 and didn't find any note in the manual)
  - Furthermore, according to
    http://en.wikipedia.org/wiki/IPv4_mapped_address:
   * This works on Windows from Vista onward
   * This works on NetBSD (version unspecified)
   * This doesn't work on OpenBSD (as a design decision for security)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7225 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 20:52:19 +02:00
Giel van Schijndel 66b09c68ec * Fix a copy/paste error 
- Make sure to use the maxPlayers and currentPlayers variables found in the Game class, not the (non-existing) local variables
 * Don't use Game.check() as it doesn't exist, use Protocol.check(Game) instead

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7224 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 20:52:19 +02:00
Giel van Schijndel c2e33dc923 * Make the lobby host and version configurable 
* Use the "Protocol" instead of "BinaryProtocol" class to communicate with the lobby (in the IRC bot)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7221 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 20:52:18 +02:00
Giel van Schijndel b5e6967f73 * Fix copy-paste error ("output" should be "input") 
* Stop decoding as soon as an error is encountered


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7220 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 20:52:18 +02:00
Giel van Schijndel b0c5590f6c Semantical error: call the function instead of evaluating it 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7219 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 20:52:18 +02:00
Giel van Schijndel 05d9661d7a * Do not change the function _swap_endianness on the fly to prevent it from being used in a 2.1 lobby 
- Change this because altering _swap_endianness on the fly isn't threadsafe
  - Instead revert to code duplication (for now)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7218 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-28 00:46:45 +02:00
Giel van Schijndel a5aa693b95 Split out the different lobby protocol versions in a class per version: 
* This removes the need to specify what type of protocol (e.g. BinaryProtocol vs. JsonProtocol) should be used
  - Instead only the (Warzone) version needs to be specified, the constructor function (Protocol()) will figure out the correct protocol class to use

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7217 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-28 00:46:45 +02:00
Giel van Schijndel b64911e732 * For reading use a context managed "readable" as well 
- However, unlike "writeable" don't return a StringIO object for strings

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7216 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-28 00:46:45 +02:00
Giel van Schijndel 832f8728d2 Use the Protocol class to find out what port to listen on, instead of manually configuring 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7215 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-28 00:46:45 +02:00
Giel van Schijndel cdc8412bd7 Convert wztest.py to use the latest lobby code for testing the lobby 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7212 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-27 22:46:38 +02:00
Giel van Schijndel eebb624276 * Change the lobby IRC bot to use the same code as the lobby server for protocol handling and game representation 
* Move the "list" function (to retrieve the lobby's list of games) to the Protocol class

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7211 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-27 22:46:38 +02:00
Giel van Schijndel 32417e1bb9 * Allow Protocol's encode and decode functions to work directly on * sockets and file objects (in addition to strings) 
- This removes the requirement for the socket handler to be aware of the size of a single game
  - I.e. this allows variable sized games without another API change
 * Read and write Protocol data directly from and to the sockets, decoding and encoding on the fly

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7209 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-27 21:30:41 +02:00
Giel van Schijndel b68ab0bb6d Log tracebacks when exceptions occur and aren't handled 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7208 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-27 21:30:41 +02:00
Giel van Schijndel d1d787c8d6 * Make the game server's port version dependant 
* Move checking of game's vitality to from the Game class to the Protocol class
  - Do this because checking of games is inherently protcol dependant

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7200 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-27 21:30:40 +02:00
Giel van Schijndel 4b74fd0cc5 Don't deal with requestHandler stuff in the Game class 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7199 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-27 21:30:40 +02:00
Giel van Schijndel 57aefa7a85 * Use unpack_from, instead of unpack, if multiple items are contained in the same buffer 
* Use xrange() instead of range() when looping over its items
  - xrange() is faster and more lightweight as iterable

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7198 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-27 21:30:40 +02:00
Giel van Schijndel 227ecdb1f8 Lobby protocol: Workaround the fact that the 2.0.x versions don't perform endian swapping 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7197 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-27 21:30:40 +02:00
Giel van Schijndel 322c10e7a4 * Use struct.Struct objects instead of free functions from the "struct" module to perform encoding and decoding 
* Perform version range comparisons like this: lowest_version <= version < one_higher_than_largest_version

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7196 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-27 21:30:39 +02:00
Giel van Schijndel 9ff472fad5 Fix a syntax and semantical error: 
* Use the % operator for formatting strings
 * Use struct.unpack for decoding a struct (instead of struct.pack)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7195 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-27 21:30:39 +02:00
Giel van Schijndel 8bfd2acef1 Use a single function to perform the encoding as a C string 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7194 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-27 21:30:39 +02:00
Giel van Schijndel cffa0b65af Make BinaryProtocol more flexible to allow it to work with 2.0+ as well as the 2.2 lobby protocol (depending on what parameter was used during construction) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7128 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 16:03:19 +02:00
Giel van Schijndel 7f5bc28bd0 Move the Game, Protocol classes to files of their own (to allow them to be reused by the IRC bot, instead of duplicating code) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7127 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 16:03:19 +02:00
Giel van Schijndel f95bcd605b Move the IRC bot to the same directory as the lobby server 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7126 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:35 +02:00
Giel van Schijndel 1447766635 Whatever way we leave the bot's mainloop, make sure to terminate the lobby checking thread 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7125 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:35 +02:00
Giel van Schijndel 61d0fd23d0 Don't use Python 2.6 specific syntax (r7123) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7124 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:35 +02:00
Giel van Schijndel 2dc1bcfd12 * Catch and handle all socket errors, not just timeouts 
- Don't just report failure to the user that request a lobby listing, report the error message (asociated with the exception) as well


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7123 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:35 +02:00
Giel van Schijndel e91765af19 * Notify all served IRC channels when shutting down 
* Notify all served IRC channels when encoutering an unhandled exception (and shutting down as a result)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7118 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:34 +02:00
Giel van Schijndel fef445101e * Rename the "help" command to "about" 
* Change "commands" to dynamically look through the commands that are available and list them


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7117 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:34 +02:00
Giel van Schijndel a72e7d5288 * Move construction of BotCommands to its own class (__init__) 
* Only attempt to call attributes of BotCommands if they're functions (rejecting __.*__ functions)
 * Return from readAndHandle as soon as we've handled a message


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7116 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:34 +02:00
Giel van Schijndel c9113f9730 * Pass the IRC write function as a lambda to BotCommands' functions 
* When a user joins a served channel, send him a notice of the games currently present ("list" output)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7113 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:33 +02:00
Giel van Schijndel b07a743f60 Properly store the gameFormat struct description in the class 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7112 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:33 +02:00
Giel van Schijndel d5cdfd7adb * Add channel operator support 
* Add invite support
  - Invite users to all serviced channels when they make a request outside of a serviced channel (becmoing operator only for as long as necessary)


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7106 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:33 +02:00
Giel van Schijndel 6461dd0208 * Send replies only to the channel from which the request came 
* Send general messages to all served channels
 * Prefix all replies with the nickname of the user who made the request


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7105 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:33 +02:00
Giel van Schijndel bbfe5e2abd Don't call the IRC command handling function in the try block (we don't want to protect against errors inside the IRC command function) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7104 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:33 +02:00
Giel van Schijndel f1b178e4b0 Add multi-channel support to wzlobbybot, one list of channels in which to serve requests, another just to be present in. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7103 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:32 +02:00
Giel van Schijndel e00035b75a Add the ability for wzlobbybot to identify against NickServ 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7102 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:32 +02:00
Giel van Schijndel 7261e3392a Update the lobbybot such that it can work both with 2.0,2.1 and 2.2 lobbies, defaulting to 2.1 (as that's the current release) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7101 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:32 +02:00
Giel van Schijndel d001fdbafc Notify the user when communication with the lobby fails 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7100 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:32 +02:00
Giel van Schijndel 88ddefb584 * Move the setup code of the lobby bot into a class of its own (Bot) 
* Change to an event driven model for handling IRC commands
  - Add all IRC commands to a single class (BotCommands)
  - In class irc_connection.readAndHandle() call the corresponding function in BotCommands for the received IRC command


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7099 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-22 13:18:32 +02:00
Gerard Krol 2786cfc1e9 Add the --squash flag to gitsvngateway. With --squash it will not try to unravel any merges but instead commit it as one change. 2009-04-20 19:53:13 +02:00
Giel van Schijndel 5694b99b90 Set a timeout on the lobby client to prevent blocking on connections to the lobby 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7095 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:24 +02:00
Giel van Schijndel 846a21b8a7 Make sure that the change_notifier thread gets terminated when the user hits CTRL-C 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7094 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:24 +02:00
Giel van Schijndel f8f33d5424 * Interpolate __author__ in the "info" (about-style) message 
* Use functions to join channels and send messages
 * Notify a user requesting for services from the bot in the wrong channel


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7093 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:24 +02:00
Giel van Schijndel ead99ec654 Properly align the "private" property 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7090 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:23 +02:00
Giel van Schijndel 8d5b42fe96 Lets consistently use TABs for indentation (instead of mixing with spaces) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7089 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:23 +02:00
Giel van Schijndel e399b2562c Split out the protocol from the Game class into a separate BinaryProtocol(Protocol) class 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7088 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:23 +02:00
Giel van Schijndel 4aa8982d0a * Save Game's data in a dictionary for easier access at some locations 
- This additionally make is possible to split out the lobby protocol into a separate class later on
 * Show exception's messages when exceptions occur

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7087 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:22 +02:00
Giel van Schijndel 72d1881464 Remove trailing whitespace 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7086 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-20 15:31:22 +02:00
Buginator 562ade5d29 Use the correct version of the masterserver file 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7080 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-19 23:45:25 +02:00
Buginator c2e5d2462f Adds password support to warzone. 
Adds feedback from the lobby server.

Notes: You have to enter a password *first*, and then either host the game, or join a game.

Thanks to elio for the new icons!


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7079 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-19 23:45:25 +02:00
Giel van Schijndel bd04dd7378 Make the lobby server executable 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7073 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-19 23:45:24 +02:00
Giel van Schijndel 4beca8d487 Make the IRC bot executable 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7024 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-15 20:36:58 +02:00
Buginator e1c91576c9 Game server port is now 2100 
Master server port is now 9990 

Updated masterserver python program as well.

merge: r6994

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7018 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-12 14:12:07 +02:00
Per Inge Mathisen c0358510d8 Add missing include 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6982 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-12 14:12:03 +02:00
Giel van Schijndel cd7edf0f88 Use a more sofisticated regular expression for channel messages to ensure we only match messages that are intented for us (i.e. the lobby IRC bot) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6968 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-07 12:23:12 +02:00
Giel van Schijndel 74c3180bc3 Use a regular expression to extract messages intended for us (i.e. the lobby bot) instead of string manipulation with split & find 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6967 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-07 12:23:12 +02:00
Giel van Schijndel 9dfa15c8f1 Move the bot to #warzone2100-games and change it's real name to indicate it's Warzone 2100 origin & purpose 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6966 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-07 12:23:12 +02:00
Giel van Schijndel 3fea9dcbc3 Allow announcing to work properly still 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6965 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-07 12:23:11 +02:00
Giel van Schijndel eb27d5987e Comment on why the endian swapping is performed (while on the protocol level it shouldn't be needed) 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6964 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-07 12:23:11 +02:00
Giel van Schijndel 693a2ab4b7 Use a contextmanager and python's with-statement to manage the socket's lifetime, this guarantees exception safety 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6963 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-07 12:23:11 +02:00
Giel van Schijndel 05b1e21416 Externalise code specific to querying the lobby server into a separate module 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6962 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-07 12:23:11 +02:00
Giel van Schijndel acfa601182 Fix syntax error in lobby IRC bot 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6961 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-07 12:23:11 +02:00
Giel van Schijndel 020b66a959 Don't use an IRC specific string representation of games 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6960 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-07 12:23:11 +02:00
Giel van Schijndel d02d2a01ab Committing on behalf of and with Gerard's permission: 
The initial version of the IRC bot for Warzone's lobby with the GPLv2 added.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6959 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-07 12:23:11 +02:00
Giel van Schijndel 1f89497235 Prevent leaking memory in mapFree by deallocating all memory we allocated 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6910 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-30 16:10:58 +02:00
Giel van Schijndel 40dcefc574 Remove the C++ implementation of the lobby server since it isn't used nor is it being maintained 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6907 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-30 16:10:57 +02:00
Gerard Krol 107f634977 Set svn:eol-style native and convert the line endings to \n. 
This is to make sure Git on Windows does not complain when autocrlf and safecrlf are set.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6886 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-21 01:53:25 +01:00
Gerard Krol 3000958bca Swap the order of the arguments when calling same_commit to check if we need to push, because only old..new seems to work correctly. 2009-03-19 00:57:29 +01:00
Gerard Krol 31d09e583c Replace slashes by underscores for the gitsvngateway merge filename, and don't make it return a non-zero exit code when the --dry-run was successful. 2009-03-18 18:37:17 +01:00
Gerard Krol 596f6c38a1 Add a --no-fetch option to gitsvngateway to increase the speed of running it over a lot of branches. 2009-03-18 18:13:41 +01:00
Gerard Krol 4d230332a1 Add an --automatic switch to gitsvngateway, where it will not ask to merge changes but instead abort. 2009-03-18 17:58:42 +01:00
Gerard Krol c11e05a058 Use getopt to parse options for gitsvngateway and add the --dry-run, --prefix and --remote options. 2009-03-18 17:58:33 +01:00
Gerard Krol 0abfe13c4c Use the _gitsvngateway prefix for internally used branches. 2009-03-18 15:19:58 +01:00
Gerard Krol e58d41d67a gitsvngateway no longer uses a file to store its state but instead determines it by checking if certain branches exist. 2009-03-18 14:44:35 +01:00
Gerard Krol b43712ec75 Add some checks to gitsvngateway to speed up execution when there are no changes. 2009-03-18 14:01:04 +01:00
Gerard Krol 799ce310e1 Small changes to make gitsvngateway work with Git 1.6.0.6. 2009-03-18 13:17:52 +01:00
Gerard Krol 64d4b710c2 Use a slightly more robust way of detecting merges. It still is ugly though. 2009-03-17 20:16:05 +01:00
Gerard Krol 0a3467af02 Small cleanup of gitsvngateway, the code should be more robust now. 2009-03-17 16:50:18 +01:00
Gerard Krol bd0d42dcc0 The gitsvngateway now uses git cherry-pick instead of git merge --squash to prevent merge conflicts. 2009-03-17 16:23:45 +01:00
Gerard Krol 0f53e9ecf0 Use colour to print the messages from gitsvngateway to better separate them from the output from the Git commands. 2009-03-17 14:20:12 +01:00
Gerard Krol f52d181826 The gitsvngateway script now allows you to check what it is about to commit. It also tries to unravel a merge and commit the individual changes to SVN. 2009-03-17 13:53:31 +01:00
Gerard Krol 1b5816f89b Add "gitsvngateway", a script to pass commits from Git to SVN and from SVN to Git. 2009-03-17 11:20:25 +01:00
Per Inge Mathisen da04dd5173 map2lnd: Use the right edge brush set for each tileset. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6837 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 21:30:36 +00:00
Gerard Krol 71bc279c9e Fix some spelling errors in debug messages and comments. Patch by Paul Wise <pabs3>. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6832 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 11:51:40 +00:00