Commit Graph

290 Commits (ebecb854b116f8fc3e56c2af0d00d43016313c38)

Author SHA1 Message Date
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