Commit Graph

4673 Commits (30af74e59dc83b150ac0b5e10888af4d22023042)

Author SHA1 Message Date
Per Inge Mathisen 30af74e59d Mostly cosmetic cleanup of action update code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5823 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-15 21:48:58 +00:00
Per Inge Mathisen 4cfdec7d58 Remove some dead code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5822 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-15 20:40:38 +00:00
Giel van Schijndel 535c97354f Add Doxygen comments to functions screenDoDumpToDiskIfRequired and screenDumpToDisk
"Poked" by ticket:23 to add these API-level comments, but the comments themselves are completely different.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5821 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-15 20:27:18 +00:00
Giel van Schijndel b8e75ddfbe Make sure to use a `\` (back slash) when breaking lines in Makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5820 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-15 19:37:46 +00:00
Freddie Witherden 237fbd2514 Add more granular window positioning functions to Betawidget.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5819 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-15 19:29:57 +00:00
Freddie Witherden c51ae395ce Fix a potential memory leak in hBox.c, plus some minor cleanup.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5818 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-15 10:28:48 +00:00
Freddie Witherden d8aca5b13f Add animation support to betawidget (#27), improvements to follow.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5817 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-15 09:59:11 +00:00
Freddie Witherden 4718a24ede Add a preliminary window class. Todo:
* More granular control over window position (relative offsets &c);
 * frame drawing code.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5816 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-14 22:04:10 +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 77f057bd08 Fix team colours in naval PIE propulsion file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5813 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-14 20:13:18 +00:00
Elio Gubser 1465f18367 reversed first line because order green, orange, grey... is hardcoded
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5812 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-14 20:07:11 +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
Giel van Schijndel 4a1c068930 Fix typo in Dutch translation
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5809 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-14 15:14:13 +00:00
Freddie Witherden d6da0800f9 Redo the layout for the entire window when a child widget is added or removed.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5808 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-13 22:19:44 +00:00
Freddie Witherden 96e327b46c Add GPLv2 or above licensing cruft to betawidget.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5807 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-13 22:00:17 +00:00
Per Inge Mathisen 44861ebd89 Add naval propulsion PIE model and texture.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5803 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-13 19:15:55 +00:00
Freddie Witherden ab0ba130de Use a triangle strip as opposed to quads for widget compositing.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5802 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-13 16:25:36 +00:00
Freddie Witherden a0384da56a Do not allow setting of widget->offset directly, instead use a setter method.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5801 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-13 11:21:58 +00:00
Freddie Witherden f66a96b560 Add drag support to betawidget. This closes ticket #30.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5800 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-12 13:00:40 +00:00
Freddie Witherden fb6b8d30b6 Clean up the mouse motion event handling code somewhat.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5799 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-12 11:27:54 +00:00
Freddie Witherden 2d54d1b25b Update the doxygen documentation for betawidget some more.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5798 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-11 19:03:48 +00:00
Freddie Witherden c6c9aeb0c6 Extend the mouseEvent structure so that it also contains the location of the previous mouse event.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5797 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-11 17:18:26 +00:00
Giel van Schijndel 2b572a9492 Work around the fact that on FreeBSD POLL_ERR and POLL_HUP are defined to the same value
This problem is similar to DebianBug:492786

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5795 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-11 15:29:51 +00:00
Giel van Schijndel 5e593ad615 Add platform detection code for GNU/kFreeBSD (OS with FreeBSD kernel and GNU utilities and libraries) to allow compiling on this system
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5794 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-11 15:29:44 +00:00
Giel van Schijndel 1e2717ee8f Add a line break ('\') in src/Makefile.am which got removed in r5696
This closes ticket:29 patch by <skellr>

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5793 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-11 10:45:28 +00:00
Freddie Witherden dd3944c26c More const-correctness for betawidget.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5792 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-11 10:27:11 +00:00
Freddie Witherden 421335008a Improve const-correctness in betawidget.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5791 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-10 22:51:12 +00:00
Freddie Witherden b752595aae Add the implementation-defined widgetGetTime() function (which returns the current time in ms).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5789 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-10 12:43:45 +00:00
Freddie Witherden 0c527f5c38 Update the doxygen documentation for betawidget.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5788 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-10 11:12:42 +00:00
Freddie Witherden 7403707e37 Ensure that we set the event type correctly for timer events.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5787 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-09 20:52:51 +00:00
Freddie Witherden 0440da3f48 Make it possible to get and set the user-data of event handlers.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5786 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-08 18:15:50 +00:00
Freddie Witherden b8d25a33e2 Fix another (and with any luck the last) bug in vector.c.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5785 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-08 17:16:00 +00:00
Giel van Schijndel 9fb5fd1718 * Add a new function `Vector2f_To2i` to convert float vectors to integer vectors
* Add 4 new functions `Vector[23][fi]_LinearInterpolate` which linearly interpolate the position between to points at a certain distance from the starting point

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5784 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-08 15:49:24 +00:00
Giel van Schijndel 77404123a6 Update player[1-7].[sv]lo so that they're "generated" from the last version of player0.[sv]lo r5726 didn't use the latest version somehow
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5783 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-08 14:45:11 +00:00
Per Inge Mathisen 35b32a31db Fix bug #12121: Map: Highway broken with 2.1. Be more lenient with broken maps, since we do not
have a map editor that we can fix: If the next feature in the map overlaps another, remove the 
already placed feature in favour of the new one.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5782 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-07 16:02:22 +00:00
Per Inge Mathisen 6f89f25b80 Attempt fix for bug #12118: Could not find string for ID. Has high risk for creating
more asserts - please report them to me.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5781 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-07 15:40:21 +00:00
Elio Gubser f7e29e9709 new data directory for svg-icons, there's no naming specification yet
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5780 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-07 13:50:33 +00:00
Elio Gubser fce4029e9d small changes in intfac1(hammer modified), intfac2(new weapon icon) and frontend2(nicer computer-ai)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5779 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-07 12:37:46 +00:00
Giel van Schijndel 81005f3605 Remove the status check for GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT as it was removed from the GL_EXT_framebuffer_object extension and Mac OSX doesn't provide it
Deletion suggested by Buginator. This should fix bug #12136

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5777 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-04 20:58:28 +00:00
Per Inge Mathisen e4a968fb74 Fix problem introduced in previous bugfix to paths, which made us create non-optimal paths for single
tile obstructions that are also valid targets, such as oil derricks.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5776 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-04 19:11:24 +00:00
Per Inge Mathisen c227811cc6 Fix upgrading 3x3 size buildings. Fix in r5766 was wrong, sorry. Thanks to nexz for a patch
suggesting a possible solution, although I wrote my own.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5775 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-04 18:32:41 +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
Buginator a5f4f862d1 Fix crash when cyborg transport dies with selection window still open.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5773 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-04 04:55:39 +00:00
Giel van Schijndel ced8a64ad1 Revert r5768 which got committed accidentily
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5772 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 23:09:33 +00:00
Giel van Schijndel 7980737e77 * Use ssprintf instead of snprintf to print into a statically sized string
* Reduce the nesting inside Init_FBO
 * Bail out of Init_FBO as soon as we discovered that FBOs are unavailable

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5771 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 22:56:38 +00:00
Giel van Schijndel ef72bf0a43 * "Upgrade" the function comments for NETsendGAMESTRUCT and NETrecvGAMESTRUCT to Doxygen comments
* Restore the empty lines removed in r5732
 * Add a note to GAMESTRUCT containing a list of elements that need to be updated when GAMESTRUCT's definition changes

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5770 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 21:34:18 +00:00
Giel van Schijndel 83159f335d Coding style:
* Fix indentation
 * Don't repeat function prototypes in their pre-leading comments
 * "Upgrade" some function comments to Doxygen comments
 * Remove whitespace from the end of lines
 * Reintroduce empty lines removed in r5733

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5769 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 21:06:39 +00:00
Giel van Schijndel d54e360aa7 Add some code to hook into Mumble's Link plugin and provide Mumble with positional information about the player's current viewing position in Warzone
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5768 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 20:53:14 +00:00
Per Inge Mathisen af224be8bc When iterating over neighbouring start tiles for a path, do not iterate from the end
position of the path. Fixes bug in new multi-threaded path finding code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5766 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 20:04:29 +00:00
Buginator 38c54928d3 Delete the FBO (if we are using it) when done with it, and also fix a whitespace issue. :S
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5765 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-03 19:36:02 +00:00