Steven Koenig
1bed910d23
* Completed/Updated/Fixed German translation of .nsi-files
...
* Converted warzone2100.nsi to ISO-8859-15 (NSIS requires this)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5975 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-09 09:35:22 +00:00
Buginator
420fbeca2d
Phase 1 for the multiplayer scoreboard enhancements.
...
Color codes entries based on friend/foe colors.
(Your always white, team players = yellow, enemy = red, dead = gray.)
We also show unit count for your player, and structure count (on skirmish games) which is replaced by 'ping' on MP games.
Follow up thread about next phase is here:
http://developer.wz2100.net/ticket/12
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5974 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-09 04:13:09 +00:00
Giel van Schijndel
4ca3f73cbb
Print an empty string when the clipboard contains nothing (i.e. betawidget.getClipboardText() returned nil)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5973 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-08 21:34:31 +00:00
Giel van Schijndel
5184c015e4
* Don't store a Lua reference to the widget itself in the callback struct
...
- This struct is only destroyed when the callback is destroyed, which (by default) only happens when the widget is destroyed.
- Keeping a reference to the widget prevents Lua's garbage collector from ever destroying the widget
- Thus store a reference to the widget in a Lua "weak table"
- Also store the callback function in this table
* Thus we now only keep a reference to a Lua table referring to the widget (weakly) and the function (normally/strongly)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5972 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-08 21:34:17 +00:00
Giel van Schijndel
a1d7f9bfa1
* Include the NTW mod in the NSIS installer
...
NOTE: Still requires a German translation string for the description
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5971 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-08 19:43:59 +00:00
Freddie Witherden
5bdf883268
Add GPLv2 or above licensing cruft to the SDL betawidget test application; remove the erroneous call to SDL_Quit which was added in r5964.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5970 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-08 17:45:51 +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
Giel van Schijndel
574a74ab35
Extend the betawidget Lua testapp:
...
* Be more interesting when clicking the first window
* Add a timer event handler
* Add a clipboard usage example
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5968 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-08 00:32:22 +00:00
Giel van Schijndel
1eefcb27c9
In r5961 the prototype for resetRadarRedraw() got removed causing compilation problems: fixed
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5967 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-08 00:16:15 +00:00
Giel van Schijndel
966e1bfedc
Add an example of how to use a closure in Lua in order to bind user data to an event handler
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5966 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-08 00:06:04 +00:00
Giel van Schijndel
f81ac77f91
Rewrite the SDL betawidget testapp to set up its GUI using Lua and betawidget's Lua bindings
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5965 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 23:56:00 +00:00
Giel van Schijndel
75b4e523bd
Fix a memory leak which resulted from neglecting to call SDL_Quit()
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5964 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 23:51:21 +00:00
Giel van Schijndel
b033817fc4
* Add a Lua interface to (parts of) betawidget
...
* Partially generated by SWIG
* Partially handcrafted
* Already supports registering Lua functions as event handlers of `widget` derivatives
* Slight change in betawidget headers because the struct typedef's somehow confused the compiler
* Use libtool for linking with Lua
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5963 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 23:47:53 +00:00
Giel van Schijndel
5802bba3ae
Add a small SDL test application for betawidget (committed for EvilGuru)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5962 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 22:50:25 +00:00
Per Inge Mathisen
e26af6f48b
Improve doxygen documentation for path and minimap subsystems.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5961 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 21:44:06 +00:00
Per Inge Mathisen
4def288387
Remove requirement on texture rectangle extension for minimap code.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5960 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 21:41:50 +00:00
Freddie Witherden
c174efd0c7
Fix a typo in the doxygen documentation for widget.h.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5959 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 21:10:31 +00:00
Buginator
21fdab0117
Modify debug output to specify the 'real' directory that physfs is using for the file in question.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5958 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 20:00:54 +00:00
Steven Koenig
64715c592f
* Alphabetical order can be difficult...
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5956 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 18:08:09 +00:00
Steven Koenig
d755c30648
* Set power generator output boost for Gas Turbine Generator to +30%
...
* This fixes bug #12262
* Added myself to the AUTHORS file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5955 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 17:59:16 +00:00
Freddie Witherden
a7eee1378d
Pass the ID of an event handler to destruct events the same way as we would to regular events.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5953 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 16:58:46 +00:00
Freddie Witherden
50747b6e53
Fix compilation of betawidget/platform/sdl/event.c.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5952 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 15:31:34 +00:00
Freddie Witherden
b827f0b7d6
Add support for text events to betawidget.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5951 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 14:05:55 +00:00
Freddie Witherden
c670477709
Fix the include paths for clipboardWin32.c
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5950 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 13:57:01 +00:00
Freddie Witherden
19345a8d2e
Fix the X11 clipboard code so that it now waits for a response before attempting to fetch the data; also make it request a UFT-8 string.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5949 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 13:35:39 +00:00
Per Inge Mathisen
85b9e9b164
Remove irrelevant -Wextra from profiling debug build modes.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5948 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 10:08:52 +00:00
Per Inge Mathisen
789c2f0502
patch #1102 : Effects cleanup, part 1.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5947 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-07 09:34:18 +00:00
Giel van Schijndel
d4923de07a
Conditionally compile in one of platform/sdl/clipboard* depending on the host platform we're compiling for
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5946 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 22:39:43 +00:00
Buginator
3d866e1a8c
Just moving the menu up to make it look a bit better.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5945 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 20:44:30 +00:00
Giel van Schijndel
d40084dadc
Take care of #including utf.h and the content of <stdbool.h> and <stdint.h>
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5943 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 17:20:34 +00:00
Giel van Schijndel
01c6ba831c
Allow compiling of utf.c outside of framework's debug facilities (i.e. allow it to be used in betawidget)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5942 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 16:20:06 +00:00
Giel van Schijndel
330d599916
Apparently betawidget depends on GLee and utf.[ch], so make sure to compile those along
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5941 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 16:11:30 +00:00
Giel van Schijndel
bdae8ce9ef
Only #include types.h in utf.h as we don't depend on the entire framework
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5940 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 16:02:26 +00:00
Giel van Schijndel
e9ea1df8d9
* Move the addition of SDL's stuff to CPPFLAGS and LIBS to the "platform selection" part
...
* Make sure to also check for and link against OpenGL
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5939 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 15:50:48 +00:00
Giel van Schijndel
6150e58b45
* Make sure that we only have a compile and link time dependency on Cairo when compiling and linking betawidget, not when using it
...
* When only compiling and linking against betawidget just forward declare cairo_t
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5938 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 15:38:31 +00:00
Giel van Schijndel
a8aa84dec4
Use libtool for compiling and linking of betawidget
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5937 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 15:05:55 +00:00
Giel van Schijndel
5ce8de3abe
Add a perliminary buildsystem for betawidget (autotools buildsystem)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5936 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 13:26:03 +00:00
Giel van Schijndel
1d57b4792f
Add the cross compilation options to configure's --help output
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5935 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 13:24:29 +00:00
Giel van Schijndel
1c19456d4e
Remove non-sensical text/plain mime-type from configure.ac
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5934 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 13:11:21 +00:00
Freddie Witherden
2547bdcf29
Revert the changes to window.[ch] which were committed by accident in r5931.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5933 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 12:31:44 +00:00
Freddie Witherden
04e2f5f82b
Update the widget animation callback to use widgetReposition as opposed to setting the position directly.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5932 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-06 12:26:27 +00:00
Giel van Schijndel
906f766b8a
* When using a va_list multiple times make sure to va_copy it first
...
* Make sure to call va_end on all instances of va_list when we're done with it
Similar to r5930 (which fixed ticket:50)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5931 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-05 20:10:47 +00:00
Giel van Schijndel
37c6b31651
* When using a va_list multiple times make sure to va_copy it first
...
* Because va_copy is C99 provide a fallback for it on non-C99 systems (which assumes that va_list is just a pointer to the stack)
This fixes ticket:50, thanks to Buginator for finding the cause (though this solution is different from his suggestion)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5930 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-05 19:38:22 +00:00
Freddie Witherden
548c43e6e3
Add support for resize and reposition events to betawidget.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5929 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-05 17:05:56 +00:00
Freddie Witherden
d7d9e3286c
Fix bug #12268 which caused abandoned factory modules to result in destruction of the entire factory.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5928 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-05 16:30:46 +00:00
Freddie Witherden
9deaad010d
Simplify event creation by adding a helper function to generate the base structure.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5927 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-05 15:03:21 +00:00
Freddie Witherden
4c70b5eb7a
Fix a bug similar in ilk to that fixed in r5925, except for vertical as opposed to horizontal window alignment.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5926 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-03 21:36:28 +00:00
Freddie Witherden
ad1a6db74e
Fix a bug in the window alignment code, thanks to Elio for reporting it.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5925 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-03 19:05:29 +00:00
Freddie Witherden
79df709d5b
Improve the Doxygen documentation for widget.h
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5924 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-03 19:02:39 +00:00
Per Inge Mathisen
eedb9a9c98
Cosmetic fix: Make EffectGetNumFrames static.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5923 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-03 16:22:24 +00:00