Commit Graph

323 Commits (516067dec0b14c4bc99c5ce648811c27c39966db)

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