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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
0abfe13c4c
Use the _gitsvngateway prefix for internally used branches.
2009-03-18 15:19:58 +01:00
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
b43712ec75
Add some checks to gitsvngateway to speed up execution when there are no changes.
2009-03-18 14:01:04 +01:00
799ce310e1
Small changes to make gitsvngateway work with Git 1.6.0.6.
2009-03-18 13:17:52 +01:00
64d4b710c2
Use a slightly more robust way of detecting merges. It still is ugly though.
2009-03-17 20:16:05 +01:00
0a3467af02
Small cleanup of gitsvngateway, the code should be more robust now.
2009-03-17 16:50:18 +01:00
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
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
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
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
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
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
811bb12786
map2png: Little utility to create PNG previews from map files. Very basic at the moment.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6830 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-09 23:05:54 +00:00
7a9da735e2
map2lnd: Fix bug in setting the number of objects in the exported map.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6818 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 17:15:14 +00:00
b8268b2370
mapinfo: Correct for structure padding. Now we can parse savegame structures, too.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6817 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 17:06:11 +00:00
48ff63c9d1
map2lnd: Export structures as well.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6816 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 16:52:17 +00:00
eb14b8753d
map2lnd: Support exporting droids.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6815 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 15:11:54 +00:00
eb8329e481
mapinfo: Read droid data for editworld maps (not savegames).
...
mapinfo: Calculate number of players by checking construction droids.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6814 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-08 14:19:28 +00:00
3fd2879d6a
mapinfo: Fix crash on some failures upon trying to close already closed file.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6803 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 21:52:34 +00:00
c8dcde2182
map2lnd: Fix bug in positioning of features. Thanks again to Mysteryem for debugging help.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6797 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 18:57:41 +00:00
9dbcf2dca1
Implement more robust error handling. Sanity check feature coordinates.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6796 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 18:47:07 +00:00
788bd21477
map2lnd: Read tileset type and use it to determine which tileset is being exported. Also export all features.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6783 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 14:20:20 +00:00
a31fe8a6ec
mapinfo: Add function to deduce a given map's tileset from the terrain type info.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6767 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-02 19:40:31 +00:00
a348f2683b
map2lnd: Convert gateway information.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6766 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-02 18:53:08 +00:00
17733f3946
map2lnd: Reuse physfs aux code from framework. More generic handling of partially big endian ported savegames. Initial support for features.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6757 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 12:44:54 +00:00
8f3a5ab23d
map2lnd: Update documentation some more with info from Editworld. Clean up the messy source a bit.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6755 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 01:21:29 +00:00
28df89817c
map2lnd: Fix documentation of map logic.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6754 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 00:58:41 +00:00
bed64f33e9
map2lnd: Fix geometry
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6753 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-01 00:25:13 +00:00
9d986d917f
map2ldn: Fix conversion error. Reported by Mysteryem.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6739 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 09:44:32 +00:00
7b8e81ed8f
map2lnd: Tons of bugfixes thanks to some help by Mysteryem. It is hardcoded to use Arizona at the moment, though.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6731 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-27 22:24:37 +00:00
09ddf35b87
mapinfo: Parse .gam file and show scroll limits.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6730 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-26 23:17:05 +00:00
08e9bd5efa
Initial map to LND format converter from patch #787 : LND format exporter, now as a separate
...
application. It has not been tested with editworld yet. Needs some TLC.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6729 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-26 22:10:57 +00:00
58546965b7
Delete commented out references to non-existent files from gamedesc.lev
...
Delete two unused and broken map files that either belongs to an expand mission or is unreferenced.
Add basic unit testing framework for testing all map files in data/base.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6728 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-26 19:41:25 +00:00
be34651386
A simple map inspection tool
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6727 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-24 22:12:49 +00:00
aac41748dc
Bump copyright
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6617 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-10 18:01:48 +00:00
2d24d351e5
qwzm: Make use of QGLViewer. This lets us rotate and translate the model, as well as add various
...
helpful hints to the scene. Note that you need to install QGLViewer to use qwzm now.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6592 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-07 18:21:06 +00:00
90121f4920
pie2wzm: Fix spurious warning about missing connector directive in PIE model.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6590 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-07 12:35:11 +00:00
d4beacb790
pie2wzm: Make sure we output a line ending after the connector directive for multi-mesh models.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6589 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-07 12:28:37 +00:00
ea999b01a7
qwzm: Port over level parsing fix from pie2wzm. Fix connector parsing error.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6588 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-04 23:25:30 +00:00
9b26e6c1bd
qwzm: Add missing file from way back.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6587 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-04 23:13:02 +00:00
86d734598f
pie2wam: Add verbose mode. Fix parsing error in some multilevel files.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6586 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-04 23:12:05 +00:00
3fb2610c6c
Convert OpenDocument documents shortcuts.odt and todo.odt to reStructuredText (easier to edit and view)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6545 4a71c877-e1ca-e34f-864e-861f7616d084
2009-01-11 20:49:43 +00:00
2528179e0b
pie2wzm: Support new WZM connector spec.
...
qwzm: Fix tessellation bug in PIE conversion code. Fix crash.
wzm base: Detect more errors, print nicer WZM output.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6508 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-26 19:28:22 +00:00
739fbcce41
qwzm: Add beginnings of connector support.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6496 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-26 00:37:11 +00:00
7314ba1b29
qwzm: Add short-cut keys and some GUI prettifying.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6459 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-12 18:29:33 +00:00
b63790aaba
qwzm: Forgot to commit one file
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6458 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-12 17:55:19 +00:00
0d243ce82d
qwzm: Show animation frames as they are animated. Allow user to manually step through frames.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6452 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-10 21:27:42 +00:00
001c5f2326
qwzm: You can now add and remove animation frames to models.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6451 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-10 20:34:08 +00:00
7c477d668d
qwzm: Allow basic editing of animation frames. You can change timing, translation and rotation.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6447 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-09 21:27:19 +00:00
5a98e7c029
qwzm: Add dialog to display the animation frames for each model mesh.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6446 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-09 20:59:57 +00:00
541335f18e
I forgot one file...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6244 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-04 22:07:24 +00:00
f714179393
qwzm: Refactor model loading functions to save code lines and remove duplicate code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6242 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 21:31:51 +00:00
3d34a03813
qwzm: Move conversion functions into their own file. Add TODO messages to stdout for stuff that doesn't work.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6241 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 21:07:17 +00:00
753bc5ac03
qwzm: Add import from PIE feature.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6240 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 20:52:00 +00:00
28d9734e8f
pie2wzm: Remove two bad TODO items
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6239 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 20:49:26 +00:00
07c1245e01
qwzm: Add 3DS import feature.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6238 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 19:50:54 +00:00
632b539aea
wzmutils: Add WZM save model function.
...
qwzm: Add more dummy GUI stubs. Implement save and save as.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6237 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 17:47:10 +00:00
615520bc59
wzmviewer/qwzm: Unify animation code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6236 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-02 15:16:03 +00:00
ecb8208534
qwzm: Brute force fix for infinitely extrapolating interpolation in no animation case.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6235 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 23:47:35 +00:00
d7c9a522c9
qwzm: Fix animation bug due to using different timers for drawing and animating.
...
However, introduces new bug, when animation is not on, interpolation function will
extrapolate into infinity, creating really funny non-animation animation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6234 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 23:10:10 +00:00
a2031b9fd3
wzmviewer: Refactor more code for sharing with qwzm
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6233 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 22:24:09 +00:00
232629a685
qwzm: Add more error reporting
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6232 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 20:57:43 +00:00
b32d3eaa76
Fix valgrind warning
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6231 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-01 20:35:55 +00:00
797701f42b
Add WZM editor written in Qt. Be warned that it is still buggy and incomplete.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6228 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-29 17:56:58 +00:00
bc4a850c94
wzmviewer: More refactoring to ease code sharing between programs.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6226 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-29 16:33:37 +00:00
3345cb2180
Refactor wzmviewer for easier code sharing with other programs.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6225 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-29 13:22:51 +00:00
5f5489b650
* Stuff SESSIONDESC.dwUser[1-4] in an array: SESSIONDESC.dwUserFlags\[4]
...
* Rewrite NETgetGameFlagsUnjoined such that it's not hardcoded for its `flag` parameter anymore
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6150 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-14 12:58:59 +00:00
c5c4025eb1
Fix a syntax error in the part of html2trac that deals with <u> tags
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5969 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-08 08:43:37 +00:00
1cbb4857b7
wzmviewer: Fix animation support. Add oil derrick sample WZM file for testing. Notice that I have
...
inverted the rotation numbers, and done away with the multiplied by 1000 from the ANI file format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5815 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-14 21:23:08 +00:00
419e25b44f
pie2wzm: Fix wrong guesswork on import of team colours.
...
wzmviewer: Clean up team colour and animation confusion. Update to latest WZM spec.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5811 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-14 20:03:35 +00:00
fee5ee63c8
Add obj2pie converter by elio. Fixed some compiler warnings and style issues.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5774 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-04 17:55:57 +00:00
571f019dbf
Fix definitions: "Note that you need a space in front of the defined term."
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5756 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 21:59:19 +00:00
9b07458f0d
XHTML 1.1 to Trac Wiki converter
...
Usage: ./html2trac.rb < input.xhtml > output.trac
Note that this is currently customised for the scripting manual and quite possible that you have to extend/adjust it before it works for any other file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5755 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-02 21:53:18 +00:00
2df15ab5c6
Fixes endian issue with master server code.
...
We always want the structure packed to be 'network byte order' (big-endian).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5728 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 18:11:00 +00:00
7125ab811c
Access OpenGL headers on Mac OSX through OpenGL/<header> instead of opengl/<header> (lower case)
...
This fixes a compile error reported by <ruud> on IRC
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5641 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-22 20:23:24 +00:00
fbeca90347
Modify the 'forward declaration name' of COMPONENT_TYPE for EditWorld to still match that of Warzone itself, which got changed in r5485
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5492 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-11 11:48:18 +00:00
022315eef0
Hardcode top_srcdir to make building from non-topdir possible, dont depend on the touch command, fix LDFLAGS to not depend on the removed TARGET variable
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5476 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 20:10:16 +00:00
302a557478
Rename "raw" Makefiles to "win32" Makefiles
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5402 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 14:29:04 +00:00
45f23a4926
Merge commit 'HEAD@{3}'
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5347 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 22:32:44 +00:00
050ec39c11
Use the (also new in this commit) relative variants of the directories almost everywhere.
...
Exception is when generating the .wz files, where we need the path to the build directory and building a reverse relative path to $(srcdir) will be messy.
Also silence submake.mk a great deal.
Bug #11883 should be fixed now for the most part.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5325 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 23:41:52 +00:00
fd2bfb0e0f
Prepare for another fix for parts of bug #11883 : Issues with the improved raw Makefiles
...
- Rename Makefile.raw to lowercase
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5321 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 22:48:45 +00:00
73b35ab8d6
Rename top_srcdir/top_builddir to abs_top_srcdir/abs_top_builddir, to make this more obvious.
...
Their use is currently flawed, since it will not work in directories with spaces in them... (
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5319 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 20:19:54 +00:00
9bd8b24921
Boost raw Makefiles
...
- Use PACKAGE, PACKAGE_VERSION, remove VERSION
- Allow out-of-source-dir builds (mkdir build && cd build && make -f ../Makefile.raw)
- Move config.mk from $(top_srcdir)/makerules/config.mk to $(top_builddir)/config.mk
When keeping current behaviour (srcdir=builddir), this means: Move it from makerules into the main directory
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5308 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-23 13:54:47 +00:00
c8d9336618
Update the Pygments WRF lexer for the changes done to the WRF file format in r5188:5189
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5190 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-25 20:03:37 +00:00
d16f801020
Add the new LeveLexer from r4833 to the Python Egg as well
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4834 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 00:45:15 +00:00
d83e9ff749
* Add yet another Pygments lexer: LevelLexer which lexes .lev files
...
* Mark the .lev files as text/x-wzlev
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4833 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 00:41:59 +00:00
cbda32117e
Add a STRRES lexer as well for Pygments
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4814 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-27 01:46:59 +00:00
7688f97ed3
* Add support for single line comments to the WRFLexer
...
* Perform non-greedy matching to match string literals (the data type in WRF files)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4813 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-27 01:46:55 +00:00
c6fb031d82
Don't use a 'Whitespace' token, use 'Text' instead
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4811 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-27 00:50:54 +00:00
58bf1f3481
Make the WRFLexer parse text/x-wrf files
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4810 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-27 00:47:56 +00:00
56e269d2c1
Add a lexer for Pygments (a generic syntax highlighter in Python)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4807 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-26 23:38:28 +00:00
Giel van Schijndel
Gerard Krol
Buginator
Per Inge Mathisen
Dennis Schridde