Commit Graph

441 Commits (ae878a7880b6a444a2e8fcbd1bc19dea53894a30)

Author SHA1 Message Date
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Dennis Schridde 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Giel van Schijndel 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Giel van Schijndel 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
Giel van Schijndel 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Per Inge Mathisen 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
Dennis Schridde 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
Dennis Schridde 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
Buginator 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
Giel van Schijndel 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
Giel van Schijndel 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
Dennis Schridde 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
Dennis Schridde 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
Dennis Schridde 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
Dennis Schridde 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
Dennis Schridde 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
Dennis Schridde 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
Dennis Schridde 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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
Giel van Schijndel 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 72240c1958 Recreate the EditWorld project and workspace
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4539 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-07 14:33:53 +00:00
Giel van Schijndel cc0639a9a6 * Remove some unused variables
* Fix a few syntax errors
 * Comment out (#if 0) a template function which MSVC doesn't seem to appreciate
 * Rename some variables


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4538 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-07 14:27:05 +00:00
Per Inge Mathisen cf48229cc3 Update the usage help for 3DS conversion tools.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4500 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 19:54:12 +00:00
Dennis Schridde 387fbd52d3 Typo in masterserver
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4437 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-30 17:30:19 +00:00
Dennis Schridde 7a688bdf45 Better debug output
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4386 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 12:08:13 +00:00
Dennis Schridde 40a2257a31 Fix NameError, Remove code duplication by using private method, Move private methods to top
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4385 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 12:02:37 +00:00
Dennis Schridde 9acf48f307 Check games every 100 requests
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4375 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 16:47:06 +00:00
Giel van Schijndel bb4c6e56c2 * Mark some variables as volatile (they're shared across threads)
* Assert proper usage of ReadWriteMutex


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4374 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 16:30:41 +00:00
Dennis Schridde 8370aa874c Use globals
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4372 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 15:49:26 +00:00
Dennis Schridde 132c61b913 test->check + cleanup
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4371 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 15:45:59 +00:00
Dennis Schridde 88cf9281ed Move vitality test into game class
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4370 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 14:23:46 +00:00
Dennis Schridde 227976de92 Move debug message (gamedb has its own header, no need to repeat it)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4369 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 14:22:32 +00:00
Dennis Schridde c7824914e0 Mention client IP in debug messages
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4368 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 14:17:33 +00:00
Dennis Schridde d85628ef27 gdb->gamedb and dont let struct.error raise over handle()
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4367 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 14:09:44 +00:00
Dennis Schridde 4108ad54fc Fix "AttributeError: Game instance has no attribute 'requestHandler'"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4366 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 14:03:42 +00:00
Dennis Schridde 7a08a17a6b Indention Bug (tm)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4365 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 13:09:14 +00:00
Dennis Schridde 39a4686df7 Mistake in last commit
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4364 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 12:48:08 +00:00
Dennis Schridde 6ab996879b Cleanup indention
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4363 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-27 12:45:12 +00:00
Dennis Schridde 39f34056a9 Import from __future__ has to be first in file. Additionaly let the lobby tester connect to lobby.wz2100.net
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4234 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-23 00:33:16 +00:00
Per Inge Mathisen f80e30643b pie2wzm: Handle the no-cull PIE flag by adding an extra polygon that faces
the opposite way. This way we can enable backface culling all the time.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4026 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-12 21:26:43 +00:00
Per Inge Mathisen a433f0c362 Add new tool: 3ds2wzm to convert from 3DS MAX to WZM format.
3ds2pie: Fix calculation of number of levels to import.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3929 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 21:23:23 +00:00
Per Inge Mathisen db3d0fc7f0 wzmviewer: Interpolate positions between frames for bone heap animation to
make animation smooth.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3928 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 20:36:43 +00:00
Per Inge Mathisen f45da9872b Fix memory leak in WZM code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3927 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 20:00:36 +00:00
Per Inge Mathisen d632cadb8a Add WZM -> 3DS converter.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3925 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 19:27:47 +00:00
Per Inge Mathisen 6bec88ac91 wzmviewer: Reorganize source code for easier maintenance and reuse.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3920 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-05 18:29:33 +00:00
Per Inge Mathisen e042cf4ebf wzmviewer: Bone heap animation support. Add some safety checks.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3895 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-02 22:20:16 +00:00
Per Inge Mathisen ad5851f3bf wzmviewer: Add support for displaying texture animations.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3891 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-02 16:39:23 +00:00
Dennis Schridde 9fec1a998e Use QLayout instead of fixed size.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3859 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-23 12:25:37 +00:00
Dennis Schridde 2c10e37c49 Add Slider/SpinBox combination to set model scale. Closes patch #986 (but differs from it).
Also fix minimum/maximum sizes to prevent resizing of the window.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3858 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-23 11:44:36 +00:00
Per Inge Mathisen 69e71c5778 3ds2pie: Add option to scale imported model by a given factor to correct errors
seen in Blender 3DS export.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3853 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-22 18:47:21 +00:00
Per Inge Mathisen 37a96b2041 pie2wzm: Add option to reverse winding of polygons.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3800 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-16 16:32:13 +00:00
Per Inge Mathisen 52a2f9a041 wzmviewer: Fix dimension calculation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3741 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 17:38:28 +00:00
Per Inge Mathisen 749ad7ded1 pie2wzm: Add newlines.
wzmviewer: Hack perspective depending on model size.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3740 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-10 17:24:11 +00:00
Per Inge Mathisen 84c61fed77 Fix crash in wzmviewer due to a not properly initialized frame variable.
Thanks to Buginator for reporting the problem.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3731 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 19:45:49 +00:00
Per Inge Mathisen b174ddd773 Make PIE/WZM tools more easily compile on Windows.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3730 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-09 18:56:31 +00:00
Per Inge Mathisen 6c179bb935 pie2wzm: Fix division by zero error introduced in the previous commit to it when
a mesh has no animation.
wzmviewer: Press '+' to cycle through animations or team colours. F1/F2 to 
enable/disable polygon culling. F3/F4 to enable/disable wireframe mode.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3720 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 18:43:21 +00:00
Per Inge Mathisen 05a6223814 pie2wzm: Remove output parameter - generate output filename automatically.
Add cmdline option to not guess team colour and force animation instead.
Add support for texture animation that wraps around the edge of the texture.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3718 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 17:55:15 +00:00
Per Inge Mathisen baed19b3b0 wzmviewer: Fix bug when reading in multi-mesh files.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3716 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 10:54:57 +00:00
Per Inge Mathisen 49e97ae793 Add a very simple model viewer application for the WZM format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3715 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 10:38:49 +00:00
Per Inge Mathisen b278c8d77d pi2wzm: Write correct TEXTURE directive. Fix bug in index array generation.
Generate correct animation frame list. Add support for converting connectors.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3714 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-08 10:27:03 +00:00
Per Inge Mathisen 0207ceb4c1 Add a tool to convert from the PIE format to the imaginary WZM format.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3710 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-07 14:59:53 +00:00
Per Inge Mathisen f47c263d99 pie23ds: Fix handling of texture animation / team colour.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3706 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-06 21:08:46 +00:00
Per Inge Mathisen 8dfb001797 Remove two forgotten debug printfs in pie23ds
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3705 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-06 17:43:26 +00:00
Per Inge Mathisen 8b037dc016 Add a very basic PIE -> 3DS conversion tool.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3704 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-06 17:38:49 +00:00
Per Inge Mathisen 0f647f937e Make 3ds2pie tool conform to PIE standard even though the Warzone code ignores
the exact number given in the LEVEL directive.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3703 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-06 17:35:28 +00:00
Giel van Schijndel 748adec208 Use network byte order for struct unpacking on the lobby server (rather than native byte ordering)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3666 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-03 16:51:56 +00:00
Dennis Schridde 76fddad000 Generic cleanup. Mostly remove struct keyword where unnecessary.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3585 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-28 00:02:28 +00:00
Giel van Schijndel d868ec0a50 * Make Win::HWND a "strong" typedef; this guarantees that code that just assumes Win::HWND is the same type as ::HWND (from <windows.h>) will fail to compile
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3551 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-24 00:43:10 +00:00
Giel van Schijndel c1eb47283e * Fix a typo in a Doxygen comment
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3494 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 23:09:34 +00:00
Giel van Schijndel 8ce3b1fcce * Initialise `_errCode` in Win::Error's constructor (because it's declared const...)
* Handle `show_command_last__` in the switch for `__ShellExecuteShowCmd` to prevent warnings
 * Don't specify default template parameters for function template Win::ShellExecute as function templates cannot have default template parameters

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3482 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 17:15:35 +00:00
Giel van Schijndel 31a31943bc Forgot to update EditWorld's projectfile in r3480, so doing it now
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3481 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 16:28:19 +00:00
Giel van Schijndel bfa243f575 * Move some WinAPI functions into new file winapi.[ch]pp and a namespace of its own: 'Win'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3480 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 16:25:32 +00:00
Dennis Schridde d8d2697d0d Per says all of swapYZ, reverseWinding, invertUV are necessary for 3DS Max created .3ds files, so enable them all by default. (In GUI and CLI.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3477 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 12:55:22 +00:00
Dennis Schridde d22bf8f49c Add tooltips
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3476 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 22:28:13 +00:00
Dennis Schridde bb6437fe06 Drag&Drop support. (Any filename ending in ".3ds" is accepted.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3469 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 19:40:40 +00:00
Dennis Schridde 4ac1dfecfd - Replace texpageNr lineEdit, with texturePage spinBox.
- Remove associated error-checking (emptyness), since that is guaranteed by Qt.
- Use Ui::Gui3ds2pie instead of Ui_Gui3ds2pie. (Autodetected by Qt/UIC. make distclean if it complains.)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3466 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 02:26:05 +00:00
Dennis Schridde 716d1796b5 Enable swapYZ by default, like in the commandline variant.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3465 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 01:54:49 +00:00
Dennis Schridde 356ed35cbb Add Qt4 GUI. It uses 3ds2pie.c:dump_pie_file() and only has very basic error checking right now.
- To get the (currently only german) translation, run "lrelease 3ds2pie_gui.pro".
- When translating with (Qt Linguist), make sure to use the preview function to check whether your strings fit into the UI.
  If they don't, try to use a shorter translation, otherwise adapt the UI.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3464 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 01:19:55 +00:00
Dennis Schridde 4ea16727f9 3ds2pie says it is licensed as LGPL-2.1, so use that instead.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3463 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 01:14:19 +00:00
Dennis Schridde cb768653a6 Remove unnecessary (CVS?) header.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3462 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 01:13:31 +00:00
Dennis Schridde 5dc7edf2c1 Move 3ds2pie.c out of src/ again...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3461 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-14 00:28:00 +00:00
Dennis Schridde b557a843ca - Make dump_pie_file work on parameters instead of globals
- Use C89 tolower() for string conversion
- Fix unsignedness warnings
- Some variable renames
- Move parse_args and associated globals into !WZ_3DS2PIE_GUI


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3460 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 23:39:45 +00:00
Dennis Schridde 7edfeb0b0e Move C file to src/ to match default project settings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3459 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 23:10:46 +00:00
Dennis Schridde a01c019d97 Prepare for additional GUI.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3457 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 22:01:21 +00:00
Dennis Schridde ad2658fcec Move 3ds2pie from conversion_tools to a dedicated directory.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3456 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 21:30:55 +00:00
Giel van Schijndel 546abc300e * Use more correct prototypes for the member functions of class BMPHandler, this should reduce unnecessary casting to and from void*
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3451 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 14:09:08 +00:00
Giel van Schijndel 6afd374095 Don't depend on Windows API specific functions when an alternative is provided by the C library:
* Replace usage of WinAPI function lstrcmpA with libc function strcmp

This addresses #4


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3450 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-13 13:56:41 +00:00
Per Inge Mathisen 7b81b5c76f Fix some ugly shadowing and reuse of variables.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3428 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-10 17:50:40 +00:00
Per Inge Mathisen f7fbf845c0 Small cleanup to animation code, and fix copy&paste typo in 3ds2pie.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3412 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 21:58:05 +00:00
Giel van Schijndel 28f40cd637 * Initialise CBrushProp's member variables in the constructor's initialisation list instead of its code-body
* Rename some private member variables: s/m_\([^\s]\+\)/_\1/g

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3410 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 18:01:03 +00:00
Giel van Schijndel 12ea06d1b6 * Remove the IMG -> XML convertor script as the IMG format has been changed to CSV in r3302
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3397 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 20:53:45 +00:00
Per Inge Mathisen eeb1c6832c Add a number of options to the 3DS to PIE converter. It can now successfully import
3DS models made in 3DS Max to Warzone.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3396 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 20:26:15 +00:00
Per Inge Mathisen 9c032e04ac Fix a basic mistake in the converter, and make texture filenames lowercase.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3384 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 15:29:27 +00:00
Per Inge Mathisen 2455f1ee4d A basic 3DS -> PIE format converter. Currently handles a single, textured
triangle mesh only.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3382 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 14:56:44 +00:00
Dennis Schridde 389c0246d1 Rename some files with spaces in them.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3367 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 21:21:10 +00:00
Giel van Schijndel d288708bab * Don't write unused (i.e. it isn't ever read by EditWorld or Warzone) taglist.tag anymore when exporting maps (complements r3357)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3358 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 16:20:09 +00:00