Commit Graph

520 Commits (d1c5a649974dc114d2b11a99611d91d24d33a9a5)

Author SHA1 Message Date
Per Inge Mathisen 9b6e542bfa Remove pietoaster 2010-12-31 23:42:53 +01:00
Per Inge Mathisen b15addfcf1 simplipie: Add warning when not all polygons in a mesh do not use the same number of frames for texture animation. 2010-12-31 22:26:45 +01:00
Per Inge Mathisen 3d7a7b397b simplipie: Fix error when fixing face culling and tessellation at the same time. 2010-12-31 18:20:51 +01:00
Per Inge Mathisen 22bbd8dd51 simplipie: Fix missing space in frame animation directive print out. 2010-12-31 17:12:17 +01:00
Per Inge Mathisen 2133cd5ec6 simplipie: Add support for triangle tessellation 2010-12-31 16:53:05 +01:00
buginator c560f8a3e9 Fix typo 2010-12-06 21:14:00 -05:00
Per Inge Mathisen 7de25a9d5b Lay the groundwork for a more modern component drawing system. Removes support for OpenGL 1.x. See ticket:2310 2010-12-04 15:57:26 +01:00
Per Inge Mathisen 26d51104f9 simplipie: Remove old style team colour information if tcmask is used. 2010-11-12 22:23:05 +01:00
Giel van Schijndel 9d973acc20 Debianize the two ticket-related Trac plugins
Turn the ticketnotifications and ticketvalidemail Trac plugins into
Debian packages, allowing for slightly easier management of these
plugins.

Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2010-10-04 19:39:13 +02:00
Safety0ff 72464dfe24 mapconv: Fix an small error in an error output.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11714 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-20 18:34:42 +02:00
Safety0ff 746ffaa836 obj2pie: Fix last obj face duplication bug.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11681 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-18 23:07:47 +02:00
Buginator aabcb5f2fb Commit patch #2065 by FastDeath, with slight modifications by me.
Fixes some issue with the wzmasterserver, see ticket for details.

Closes ticket:2065


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11483 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-15 22:07:18 +02:00
Giel van Schijndel ccbd9c56c7 wzmasterserver.py: change the `__author__` value to "The Warzone 2100 Project"
This used to be a list of authors.  Ego-boosting can always be performed by the AUTHORS file, no need to boost it all over the place ;-)

Suggested by Fastdeath's patch, see #1985

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11369 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-03 09:38:30 +02:00
Buginator edb644a03b Fix (and add missing) headers to files.
2009  Warzone Resurrection Project -> 2010  Warzone 2100 Project

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11298 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:58:33 +02:00
Per Inge Mathisen 33afe5bc3d simplipie: Make it accept multiple filenames as arguments to make mass-conversions simpler.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11171 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-11 23:04:18 +02:00
Safety0ff 35995c8c27 obj2pie:
- Add PIE 3 support.
- Add tcmask pie type option.
- Fix rounding of PIE 2 texture coordinates.
- Tolerate vertex normals.
- Use duplicate faces instead of deprecated flag.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10812 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-16 11:17:06 +02:00
Safety0ff 5c74291bab qwzm:
-Check that file is open before trying to write to it.
-Remove unnecessary include.
-Use 256 for fallback texture dimensions when writing a pie 2.
-Fix rounding when exporting to pie 2.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10759 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:51 +02:00
Safety0ff 1ade59528c qwzm:
-Touch up r10748 and fix a typo it introduced.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10754 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:50 +02:00
Safety0ff dfdb343064 QWZM:
-Reviewed loadPIE and savePIE functions.
-Improved documentation of savePIE function.
-Added bounds checking to prevent currentFrame being an invalid value.
Refs #1763.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10748 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:42 +02:00
Safety0ff 78a9b96ea6 QWZM: Unclobber indentation (refs r10729,r10740.)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10747 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Safety0ff ec73038633 QWZM:
Copy display/wzmutils .c & .h to the qwzm folder so that they can be modified for cpp/Qt/QWZM.
Revert r10279 for display/wzmutils .c & .h so that they work like wzmviewer expects them to.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10741 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Safety0ff 2c08757b1c QWZM: Apply UI improvement patch by Emdek.
Modifications I made to it:
-Fixed the mesh selection issue in the patch.
-Witheld renaming the program (needs more discussion,) and changed version string.
Refs #1763.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10740 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Safety0ff f146e9c044 QWZM:
-Added experimental PIE export.
-Added experimental PIE 3 import.
-Merged PIE and WZM opening into one dialog.
-Fixed ambiguous shortcuts.
-Single mesh display.
-Turned on alpha blending (for textures with alpha.)
-Improved (but not removed,) use of hardcoded paths for texture finding.
-Fixed some memory leaks.
-Way less potential program exits.
-Disabled (i.e. grayed out) buttons that don't currently do anything.
-Fixed some warnings.

Possibly other stuff, and probably new bugs. ;P
Refs #1763




git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10729 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:18 +02:00
Per Inge Mathisen 455fd8a613 Modify MOTD for 2.2 to make it nicer looking
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10635 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-19 12:52:42 +02:00
Buginator 4cb339dbfa Add motd file for 2.3 / trunk and 2.2.x
Update master server to spit out the correct MOTD based on which client connects to it.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10631 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-19 12:52:41 +02:00
Stiv 64cb35ec74 Update plugin status
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10390 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-21 19:47:12 +01:00
i-nod 1e4ac04582 3ds2pie tool update. Belongs to #1553.
- Added PIE3 support.
- Conversion routine has been split into 2 parts, with intermediate PIE structure that can be used for model preview: PIE structure is filled with dump_3ds_to_pie(), PIE structure is dumped to .pie file with dump_pie_file().
- Duplicated points removal routine has been added into dump_3ds_to_pie(). "Borrowed" from simplipie tool.
- Implement 'twosided' material handler (instead of old global hack). WARNING! It's completely untested and optional.
- Command line interface is broken, most likely. Should be fixed or removed entirely.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10374 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-20 16:17:48 +01:00
i-nod 53464e236f Update simplipie a bit, so it will produce PIE2 compatible models.
It should follow verbose switch for non-error output.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10295 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-16 15:47:54 +01:00
Per Inge Mathisen f3affb4c58 simplipie: Add duplicate point removal.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9790 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-13 23:05:00 +01:00
Christian Ohm 48a60262bc Make it possible to override the QGLViewer paths for qwzm.
This makes it possible to compile qwzm on systems that use different paths
without modifying version controlled files.

Create a file called "config" in qwzm's directory that sets the
QGLVIEWER_INCL/LIBS variables. E.g. for Ubuntu 9.10 the following works:

QGLVIEWER_INCL = /usr/include/qglviewer-qt4
QGLVIEWER_LIBS = -lqglviewer-qt4

Current Debian unstable only needs the LIBS line.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9635 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:28:04 +01:00
Guangcong Luo 3cb6835e5c Delete cms.php - it appears to be superfluous.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9525 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:50 +01:00
Guangcong Luo 518bd1bf79 Add persist library to Guidecode.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9524 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:50 +01:00
Guangcong Luo cd8fc32f0e Fix typo in guidecode readme.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9523 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:50 +01:00
Guangcong Luo 23b3d52c46 Add Warzone Guide code into /trunk/tools/guidecode/.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9522 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:50 +01:00
Giel van Schijndel 84dffec0b1 Commit Trac mini plugins (which we use):
* TracPhpBBCookieAuth
  - Considers users that are logged in on PhpBB to be logged in on Trac as well (resuing the PhpBB cookie)
 * TracHttpOnlyAuthCookie
  - Sets the HttpOnly flag on Trac's auth cookie (prevents clientside, e.g. javascript, scripting access to the cookie)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9516 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:49 +01:00
Giel van Schijndel f0fb5d2168 Trac plugin TicketValidEmail:
* Reject e-mail addresses matching /^\w+@example\.(org|net|com)$/ (see #1317)
 * Suggest logging in as alternative to using a valid e-mail address for the reporter field

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8947 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:59 +01:00
Giel van Schijndel f0aacfd6a8 Add a new Trac plugin: TicketValidEmail
Extends Trac to only accept anonymous tickets when the reporter name is a valid RFC822 e-mail address.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8946 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:03:59 +01:00
Per Inge Mathisen 3b425a0653 map2png: Fix conversion bug
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8656 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:54 +01:00
Per Inge Mathisen c6e328bbd3 Add debug message when map loading fails in map tools.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8655 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:54 +01:00
Giel van Schijndel 0b1a35cd39 IRC lobby bot: improve production of game list
* Make sure to loop over all games only once instead of copying them
  - This might prevent a race condition
  - It definitly cleans up that piece of code
 * Make sure to list the Warzone version as well in game listings
 * Only show 2.2 games (instead of 2.1 games)
 * Bump the bot's version number from 0.0.1 to 0.0.2
 * Change 'Warzone Resurrection Project' to 'Warzone 2100 Project'

Original patch written by Buginator, rewritten by myself to be 'Pythonic'

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8653 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:54 +01:00
Buginator 9445f60753 Actually use GLuint instead of pretending to be GLuint.
patch by stiv.
Closes ticket:1148

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8604 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 17:12:48 +01:00
Git SVN Gateway b945a74f9b Bail out when pushing to the git repository fails. 2009-11-23 18:47:00 +01:00
Dennis Schridde 6abbf79143 rpl2avi converter by Angus Lees 2009-11-22 16:34:23 +01:00
Per Inge Mathisen fe141894e8 simplipie: Fix bug that made it drop connectors.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8474 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:20:05 +01:00
Per Inge Mathisen 0405c24fb1 simplipie: Now modify PIE file in place. Makes it easier to run in scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8436 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:20:00 +01:00
Per Inge Mathisen bb3975f089 Add new tool: simplipie. It strips unused flags from PIE files and rewrites them.
It also obsoletes the no cull flag by removing it and instead adding duplicate,
reversed polygons to fix the culling issues this flags was meant to fix.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8306 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:19:49 +01:00
Christian Ohm 68841a105b Blender PIE import plugin: Add a default filename for the file selector
Makes it start in the current directory instead of $HOME.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8304 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:19:48 +01:00
Giel van Schijndel 593c8fdb0a Lobby server: use Python's enumerate builtin to iterate over a sequence and its indices
- instead of looping over indices alone and using those indices later on to index into the sequence

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8145 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-28 22:21:07 +02:00
Giel van Schijndel 870233db9a * Don't (attempt to) import an unused (and non-existent) module: `model`
* Fix the URL for the TicketNotifications Trac-plugin such that it matches its source directory again

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8039 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:07:13 +02:00
Giel van Schijndel cb279c37c4 * Rename Trac plugin `NewTicketNotification` to the more general `TicketNotifications`
* Add an additional package (sub-plugin): attachmentnotification
  - This package contains the new AttachmentTicketNotification Trac component
 * Add a new Trac component: AttachmentTicketNotification
  - This component sends notification mails to all ticket subscribers when an attachment is added to that ticket
  - Created this component on Per's request

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8038 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:07:13 +02:00