Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,240 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

224 Commits (ed753ff8c455fa5838799dab46f40120c2debde1)

Author SHA1 Message Date
Cyp 4a1b5fb543 Bump year. 
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
 2011-02-25 18:50:54 +01:00
Cyp 0a064c2470 Fix GLee.cpp → GLee.c in Linux and Windows build scripts. 
And LPTCSTR → LPCTSTR in some Windows file, apparently LPTCSTR wasn't similar enough for it to compile, closes ticket:2428.
 2010-12-21 22:13:25 +01:00
Cyp 0646b37603 Rename *.c to *.cpp. 2010-12-16 23:28:56 +01:00
Cyp 2bcb709cf4 Move broken dependency hack out of most Makefile.am's, except the for the root. 2010-12-16 23:14:38 +01:00
Cyp bf38eb51ea Add branch switching hack to remaining Makefile.am files. 2010-12-06 00:19:30 +01:00
Cyp 25671b1083 Revert "Replace immediate-mode rendering with VA-based rendering" for now, since it makes rendering trucks very slow. 
This reverts commit f363a02af7.

Please revert this revert when this is fixed.
 2010-10-26 08:36:22 +02:00
Giel van Schijndel f363a02af7 Replace immediate-mode rendering with VA-based rendering 
Almost completely (one corner case requires reading GL specs) replace
immediate-mode rendering with VA-based rendering by means of
glDrawArrays.

This, when completed, makes porting to OpenGL ES 2.0 and OpenGL 3.0
without backwards compatibility easier.

This closes #2172

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11686 4a71c877-e1ca-e34f-864e-861f7616d084
 2010-09-20 18:34:41 +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
Freddie Witherden d0fec57acf Minor indentation/spelling fixes in patternManager.[ch]. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7263 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-05-06 22:29:32 +02:00
Giel van Schijndel 2da9dad740 Link betawidget with Pango 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7033 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-16 19:40:47 +02:00
Freddie Witherden f4e366cf33 Fix some indentation issues in button.[ch]. 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7025 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-15 20:36:59 +02:00
Elio Gubser c18559d219 release patterns when quit 
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@6979 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-08 14:04:26 +02:00
Elio Gubser 9353874ef9 adds the base button class and imageButton class 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6956 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-06 13:09:09 +02:00
Freddie Witherden 4ab0f78bf4 Fix some indentation problems in hBox.[ch]. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6954 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-06 13:09:09 +02:00
Elio Gubser defbe884a7 fixed small bug in size fit algorithm 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6953 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-06 13:09:09 +02:00
Elio Gubser 959838440d fix for the same reason as r6951 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6952 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-06 13:09:09 +02:00
Elio Gubser e1478d46e8 don't use the helper macros before we set classInfo, as this would result in undefinied behaviour. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6951 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-06 13:09:08 +02:00
Elio Gubser adfc6f2aa8 added some asserts and improved commentaries 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6950 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-06 13:09:08 +02:00
Elio Gubser acf512b28a fixed incorrect if-condition 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6949 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-06 13:09:08 +02:00
Freddie Witherden 2a9d01789a Ensure to flush/mark dirty the Cairo image surface when we draw/read from it outside of Cairo. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6948 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-06 13:09:08 +02:00
Elio Gubser df6647b9f5 adds the patternManager for betawidget. take a look at sdl-testapp.lua for usage example 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6946 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-03 18:53:12 +02:00
Freddie Witherden 6b641069df Support resizing of widgets with OpenGL content. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6945 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-03 18:53:12 +02:00
Freddie Witherden cab53fcbfb Add OpenGL support to betawidget. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6944 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-04-03 18:53:12 +02:00
Elio Gubser 9b76a1480e fixed some nasty bugs in the svgManager 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6839 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 22:50:30 +00:00
Gerard Krol 71bc279c9e Fix some spelling errors in debug messages and comments. Patch by Paul Wise <pabs3>. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6832 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-03-11 11:51:40 +00:00
Freddie Witherden 1d9dd3ea82 Fix a minor indentation issue in clipboard.h 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6663 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-02-19 20:43:42 +00:00
Dennis Schridde aac41748dc Bump copyright 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6617 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-02-10 18:01:48 +00:00
Freddie Witherden fdf3e351c5 Add the button class; support for greyscaling disabled buttons pending. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6541 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-01-08 22:01:31 +00:00
Giel van Schijndel dae099706c Set the m4 macro directory in betawidget's configure script 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6540 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-01-07 20:05:45 +00:00
Freddie Witherden 97c0d84346 Update the svgManager, adding support for fetching the size at which an image will be rendered and cleaning up the interface for specifying the dimensions at which an image should be rendered. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6539 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-01-06 15:20:22 +00:00
Giel van Schijndel f224f9f2df Fix configure.ac for betawidget 
* It seems that autoconf (2.63 or 2.62) changed the names that are acceptable as custom variable name, and no longer accepts LT_\w+ as variable names.

This addresses #201 and hopefully fixes it.

@EvilGuru, if this fixes it, please close the ticket.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6538 4a71c877-e1ca-e34f-864e-861f7616d084
 2009-01-05 22:52:15 +00:00
Elio Gubser 5514e846ee adds a feature that fits in the image in the desired width and height without loosing its proportion 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6463 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-13 15:54:21 +00:00
Freddie Witherden 63b23fe53a Prevent the addition of children to spacers. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6441 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-07 13:37:10 +00:00
Giel van Schijndel 7e18d7e5aa * Compile and link in svgManager.[ch] (its complaining about linker errors otherwise) 
* Detect libsvg-cairo in the configure script
 * Link against libsvg-cairo


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6440 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-07 03:03:50 +00:00
Giel van Schijndel d261ddbbd1 * Generate the (size_t count, const T* array) typemap using a SWIG macro 
* Use this macro definition for widget:addAnimation(frames) instead of the previously custom crafted typemap
 * Add src/lua_memberfnptr.i and src/lua_table_as_array.i to the Makefile's EXTRA_DIST list


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6439 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-07 01:29:59 +00:00
Giel van Schijndel c71d586739 Betawidget Lua interface: 
* Alter the "(callback handler, callback destructor, void *userData)" typemap such that it can be used as a more generic member-function callback
  * Additionally place this typemap in a file of its own for greater ease of reuse
 * Use this new typemap (for type SWIGLUA_MEMBER_FN) in the interface definition because of its greater simplicity


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6438 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-06 20:00:20 +00:00
Freddie Witherden 3e9530696d Commit patch #157 by Elio which adds SVG support to betawidget, along with some modifications by myself. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6437 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-06 19:43:10 +00:00
Giel van Schijndel a60dcc9b31 Alter the AC_PROG_SWIG macro: 
* Make its dependency on AC_PROG_SED and AC_PROG_GREP explicit (AC_REQUIRE)
 * Depend on AX_WITH_PROG for finding out about SWIG's location
 * Use AX_COMPARE_VERSION (instead of lost of customly crafted code) to compare SWIG's version to that required
 * Instead of emitting a warning error out when SWIG can't be found or it doesn't satisfy the required version
 * Use a ''correct'' commandline (parameters to SWIG and correct regex + substitution) to find out SWIG's version


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6436 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-06 15:12:18 +00:00
Freddie Witherden b7a866a01d Fix a typo in widgetCairoCreate and be sure to explicity set the type of anti-aliasing we want. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6428 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-03 12:11:50 +00:00
Freddie Witherden 179920cb15 Add an interator-like interface to vector.h. Based off patch #157 by Elio. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6425 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-02 21:03:13 +00:00
Freddie Witherden 670ebcd4bb Improve the Doxygen documentation for vector.h 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6424 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-02 20:47:21 +00:00
Freddie Witherden f25687e130 Remove an unnecessary cast in widget.c. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6422 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-01 13:12:58 +00:00
Freddie Witherden fe1954ca69 Fix some indentation errors in widget.c 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6421 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-12-01 12:57:13 +00:00
Freddie Witherden 0c0828cf79 Modify the event handling and propagation in betawidget; events are now passed top-down with keyboard and click events terminating once handled. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6420 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-11-30 23:44:16 +00:00
Elio Gubser 28f63005bc revert changes to min/max functions, getMinSize and getMaxSize should remain un-implemented in widget.c 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6408 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-11-30 11:48:50 +00:00
Elio Gubser d6c203c74a added widgetGetMinSizeImpl() and widgetGetMaxSizeImpl() copied from window.[c/h],because there was an assert when using textEntry 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6407 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-11-30 11:27:13 +00:00
Giel van Schijndel b2b9e78bbe Use $(LUA_LIBS) instead of $(LUA_LIBTOOL) to link with Lua (the latter variable isn't defined anymore) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6398 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-11-26 22:17:15 +00:00
Freddie Witherden 8c92c4931b Rewrite the hBox class in terms of the table class. This helps to cut down on code duplication. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6394 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-11-26 20:42:03 +00:00
Freddie Witherden 6bf597ba14 Improve the tableSetPadding function that it now returns false on failure and true on success. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6393 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-11-26 20:40:10 +00:00
Freddie Witherden cc25793143 Fix compilation of betawidget after the source move. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6387 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-11-26 00:49:02 +00:00