Commit Graph

274 Commits (251317bd9a36883deffa0be645060c9f6776533b)

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