Commit Graph

2476 Commits (fd9d44e1d313df2ffd360ca6ec3d7e6ccb596b15)

Author SHA1 Message Date
Per Inge Mathisen 0b9521927f Remove unused function
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2985 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-06 19:46:10 +00:00
Per Inge Mathisen 411b172dac Fix problems updating texture size. Also see bug #10456.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2984 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-06 18:26:16 +00:00
Freddie Witherden 299d7bfcfb Commit patch #871
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2983 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-05 21:56:12 +00:00
Per Inge Mathisen 8d48c5fdd1 Partial conversion from 0.0->1.0 texture coordinate range. For now only terrain
textures are converted. Once they are done, the texture matrix hack is restored.
Thanks to devurandom and cybersphinx for help and previous efforts in this area.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2980 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-05 18:54:17 +00:00
Per Inge Mathisen 4519230af1 Split out CLIP_VERTEX from TERRAIN_VERTEX, since the former usages are not really
related to terrain, and do not need all terrain fields and future changes.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2979 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-04 20:25:25 +00:00
Dennis Schridde e749359794 * r2977 /branches/2.0/icons/warzone2100.desktop: Bring desktop file up to current revision of the Free Desktop Desktop Entry Specification: http://standards.freedesktop.org/desktop-entry-spec/1.0/
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2978 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-04 20:06:42 +00:00
Dennis Schridde 5dbbf0dcae Fix sectioning in the ChangeLog
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2975 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-04 18:29:19 +00:00
Per Inge Mathisen cd91da0caa Add right and left scroll bars to build menu tabs. By Buginator in patch #870 with
some cosmetic fixes by me.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2974 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-03 20:47:05 +00:00
Per Inge Mathisen f86858109a Fix texture size warning. It will correctly nag about missing support for 2048x2048 textures.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2973 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-03 20:29:34 +00:00
Per Inge Mathisen d52871aadf Fix crash bug that I introduced in r2797 in actionDroidBase when droid is attacking.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2972 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-03 20:00:01 +00:00
Dennis Schridde 2d65b95b4c Bump to 2.0.9 instead of 2.0.8_p1
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2969 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-03 19:30:34 +00:00
Dennis Schridde f599deeb6a Import 2.0.8_p1
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2967 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-03 14:51:29 +00:00
Giel van Schijndel 1258e860d3 * Set svn:eol-style and svn:mime-type properties on build scripts
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2964 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-03 08:32:03 +00:00
Christian Ohm e21ccef5d7 Fix some terrain tile textures which had purple fringes.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2962 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 19:13:04 +00:00
Per Inge Mathisen 6da463546f More PIELIGHT fixes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2961 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 16:38:21 +00:00
Giel van Schijndel c17f0faa5c * Remove (yes, yet another) left-over forward declaration of addText
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2960 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 14:17:00 +00:00
Giel van Schijndel 7d047b02a6 * Remove left-over forward declaration of addText
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2959 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 14:16:03 +00:00
Giel van Schijndel 3fcc1cdfbe * Bring the NSIS install and update scripts somewhat in sync
* Rename all .xhtml output files to .html as on Windows by default .xhtml isn't associated with anything while .html is associated with the default browser
  * Change the output file names (of the generated installers) for the 2.0.8 updaters to the same filenames that are used for the downloads
  * Comment out the radio button license selection (people will still have to select "I Agree", though now through a button, not through option boxes)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2958 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 13:58:11 +00:00
Freddie Witherden 147fbc34b6 Update the change log
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2957 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 12:40:04 +00:00
Freddie Witherden cd3741d626 Remove unused function addText from frontend.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2956 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 12:18:25 +00:00
Freddie Witherden 1cd7b2f4be Add a video menu to allow configuring of things such as resolution and windowed/fullscreen mode.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2955 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 11:35:25 +00:00
Giel van Schijndel 1c4d4b297e * Rename auto_revision to autorevision
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2954 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 01:11:20 +00:00
Giel van Schijndel 9a0eecb753 * Revert accidental commit of exceptionhandler in r2952
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2953 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 00:03:52 +00:00
Giel van Schijndel 55526401be * Copy over the cross compile scripts from the 2.0 branch to trunk (with necessary modifications)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2952 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-02 00:02:45 +00:00
Giel van Schijndel 357643ef64 * Make sure to use '-lmingw32 -lSDLmain' as the first linked libraries when compiling with MinGW (i.e. link with these __before__ any other libs)
* On MinGW always link in '-lz -lintl -liconv -lfreetype -lfontconfig -lexpat -lgdi32' as well


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2951 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 23:59:19 +00:00
Giel van Schijndel 319eade975 * Add the new readme files to the NSIS installer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2950 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 23:51:52 +00:00
Giel van Schijndel 51cb8fedd9 * Set svn:eol-style on docs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2949 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 23:46:48 +00:00
Giel van Schijndel ae79833367 * In vasprintf when we have to produce a zero-length string:
* Assign the resulting pointer to the char** strp pointer
  * Return zero (instead of the pointer)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2948 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 23:44:29 +00:00
Per Inge Mathisen 466b3c6248 Remove non-working terrain outline feature
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2945 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 20:46:08 +00:00
Per Inge Mathisen 97006ed5a9 A few cleanups. Rename testEffect to something more descriptive.
Fix landing lights bug on structures.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2944 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 20:24:10 +00:00
Per Inge Mathisen bca08e24a2 Cleanup of renderStructure(). Allow structures with a NULL weapon IMD, such as a pillbox,
to display additional weapons.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2943 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 19:05:38 +00:00
Per Inge Mathisen b4fce60214 Remove duplicated weapon drawing code for structures.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2940 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 17:49:45 +00:00
Per Inge Mathisen 4bbf490aca Change the rendering of the normal terrain to use vertex arrays. We still
recalculate everything each turn. See patch #865.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2939 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 17:07:03 +00:00
Per Inge Mathisen afa23e157a Beauty fixes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2937 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:55:23 +00:00
Giel van Schijndel 939f1d5c05 * Don't install documents by means of dh_installdocs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2936 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:47:42 +00:00
Dennis Schridde d75b63cdb3 Cleanup water-moving:
- Remove now unnecessary offset parameter from pie_DrawTerrainTriangle
- Move GL code from display3d.c to piematrix.c


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2935 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:43:28 +00:00
Per Inge Mathisen 3dfc90107e Simplify handling and drawing of areas outside the map.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2934 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:35:49 +00:00
Dennis Schridde d555904212 Move the water by translating the texture matrix, instead of translating UV coords for every vertex.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2933 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:31:09 +00:00
Dennis Schridde 0a1a0a1772 Fix compilation (INETBYTESPERSEC was renamed to MAX_BYTESPERSEC, I didn't check that)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2932 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:27:46 +00:00
Dennis Schridde bb39a3a8c7 Port r2930:
- Make the lobby button actually work. (Connect to "" == masterserver instead of uninitialised randomness.)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2931 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 16:11:51 +00:00
Per Inge Mathisen 51daa7e62f Remove the NODRAWTILE bit. We do not need it, and it is in the way of progress.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2928 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 15:17:29 +00:00
Giel van Schijndel 899b3dc1f5 * Merge 2.0.8 RC1 and 2.0.8 ChangeLog sections
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2927 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 14:23:16 +00:00
Per Inge Mathisen 984e291774 Readd clipping code unintentionally circumvented when moving code around in r2917.
Now ill effects could be seen with this code gone, though.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2924 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 14:04:24 +00:00
Per Inge Mathisen 1d1e96fb4f Remove empty NEWS and README files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2923 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 13:30:32 +00:00
Giel van Schijndel 00797f8e8a * Bump all version numbers to 2.0.8 (for the 2.0 branch)
* Update the trunk ChangeLog to contain the 2.0.8 part


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2922 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 13:26:40 +00:00
Giel van Schijndel 0be3f710d4 * Properly merge 2.0.8 RC1 ChangeLog into trunk's ChangeLog
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2921 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 12:49:25 +00:00
Per Inge Mathisen 3ddda5a074 Fix buggy water animation if texture page is a different size. There is
still a problem that the speed of the animation depends on texture size.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2920 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 12:36:22 +00:00
Giel van Schijndel eb083a515f * When building a Debian package, make the "configure" file depend on "configure.ac" and "autogen.sh"
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2918 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 12:03:22 +00:00
Per Inge Mathisen d36f393179 Draw water edges in a separate pass. This reduces the number of depth state changes
needed to draw the map view with water.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2917 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 11:45:34 +00:00
Per Inge Mathisen 131cb1bf6f Reduce the number of depth changes when drawing water.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2914 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 10:36:25 +00:00