b9b1a4bac7
Move the "Mesa hack" from GLee.c into screen.c:screenInitialise()
...
There we can check the GL_RENDERER string for more fine control. Currently it
is enabled when the string starts with "Mesa", so it doesn't affect any other
drivers. It might need more checks if new Mesa versions break this.
Fixes #608 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7694 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:26 +02:00
fe7b8fc515
mapconv: Fix key typos. Implement scroll limits and level name.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7693 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:26 +02:00
ec95a12e54
Implement entire Deliverance format in new PNG/INI format. That is, the binary map format
...
delivered by editworld and used for skirmish and campaign maps.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7692 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:26 +02:00
5a5a637ecd
Clean up map tools a bit. Add new tool mapconvert that converts existing maps to proposed new map format
...
based on INI and PNG files.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7691 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:25 +02:00
054ea6be3b
Missed a directory to remove from search path
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7690 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:24 +02:00
51a28557b9
Make sure pointer is valid before attempting to remove it from the list.
...
Remove more useless abort()s.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7688 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:24 +02:00
5a8cab42d9
Bump up timeout period to 2500ms from 1000ms for dial-up modem users.
...
Fixes ticket:543
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7687 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:24 +02:00
0e7ef7d20c
Add missing mod directories, and remove 'autoload' from trunk as well.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7686 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:23 +02:00
f2a6546000
Don't allow 2x experience points in campaign games if it is supposed to be only for MP games.
...
Fixes ticket:562
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7685 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:22 +02:00
61e9a25ea2
Allow mist fog type in campaign games. (Fog type is set by user preferences)
...
Patch by Vermithrax
closes ticket:561
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7684 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:22 +02:00
eaec14b3c0
Do not strip away unused players in scavenger multiplayer mode anymore.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7683 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:21 +02:00
79ed9b96e8
Do not make power option go away in pre-game dialog when turning scavengers on.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7682 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:20 +02:00
8e237aefcb
Fix warning reported in ticket:586.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7681 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:19 +02:00
70ebec41b0
Fix compile issue
...
Thanks to stiv for the report.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7679 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:18 +02:00
cdbe56c1c5
Merge netplay (anti-dpid) branch to trunk.
...
netplay branch ceases to exists anymore.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7678 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:17 +02:00
dd412c3e95
NTW Mod: cyborg armors increased
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7675 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:15 +02:00
cf79203cb5
NTW Mod 1.8.6c image
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7674 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:14 +02:00
274b0483f9
Fix size of flashing timer box in campaign. This closes ticket:596 "Time ends warning quad is to small".
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7672 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:12 +02:00
8c16a47ef0
Fix broken sources after 'make clean' in tarball generated by 'make dist'. Reported by 'JimPansen' in the forums.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7671 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:11 +02:00
e4e6bbf992
NTW Mod: cyborg armor upgrade fix and all cyborgs cost 20 more.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7665 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:10 +02:00
f3b754c4eb
Purely cosmetic improvement to rarely touched code.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7662 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-09 23:44:09 +02:00
cbe998956a
Slight cleanup of glOrtho parameters that should be double floats.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7660 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:06 +02:00
788f399615
Adding crash handler testing code. (to test crash dump reports)
...
enable it by --crash on the command line.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7659 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:06 +02:00
bff6a7c84e
Change texLoad to a bool function, to correctly handle tertiles that are of the wrong depth.
...
This is in response to refs ticket:578 where the wrong tertile depth is used on some tiles, causing GL drivers to crash.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7658 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:06 +02:00
a76f71463a
Update tile-62 decal
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7657 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:05 +02:00
bf5f17d46f
Make it possible to drag a line of rearm pad production similar to how walls and defenses
...
can be built by dragging the production with the mouse. It also removes the obligatory
empty tile between rearm pads. Instead, it allows units to drive over rearm pads that are
not currently busy rearming. This closes ticket:569
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7654 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:05 +02:00
c6eb8163f2
Do not shuffle VTOL droids out of the way if they are busy rearming on a rearm pad.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7653 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:05 +02:00
d6e036a25d
Fix compile error.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7651 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:05 +02:00
24c8a256c9
Remove reference to removed SVG file
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7649 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:05 +02:00
5f4223cbf2
Icons updated a bit - add some dithering to 32x32x16, make the other ones more readable.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7647 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:04 +02:00
f488b0c4ee
New terrain decals by Zarel:
...
* Arizona: tread tracks
* Arizona: that weird brown stuff
* Mountain: tread tracks
* Mountain: roads
* Mountain: a crater
Zarel: "I believe the decals for Arizona are done. There are probably a few
Urban and Mountain ones that still need to be done."
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7646 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:04 +02:00
4c640229ab
Temporary workaround for bad resource compiler not supporting modern icon formats.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7643 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:04 +02:00
08afa2392b
Remove outdated SVG file.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7641 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:03 +02:00
a965cec42d
New icons and header. Large icon is missing due to lack of support from some resource compiler.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7639 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:03 +02:00
57af1ab80d
Revert warzone2100.ico
...
(you can't use vista format icons with VC2005--it breaks the build process)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7637 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:03 +02:00
75c14da826
Add new maps to NTW Mod.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7636 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:03 +02:00
7dfb60d64a
Set Command Center limit to 1.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7635 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:03 +02:00
0a90019d09
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7634 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-05 16:21:03 +02:00
e43a332578
Draw the skybox after the terrain but before the transparent objects. This fixes the black smoke that could be seen against the sky.
2009-06-01 21:47:28 +02:00
fe7dfb2b1a
Rename the dirDiff function to moveDirDiff and remove the old moveDirDiff which was just a duplicate.
2009-06-01 21:27:15 +02:00
6d08939f11
Update NSIS again, and add the wz2100header.bmp that NSIS uses.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7625 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:57 +02:00
a72fb9094d
Updated icon file - new 32x32x256, 16x16x256, 32x32x16 versions, other versions updated to be more readable at lower resolutions.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7622 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:57 +02:00
7fa42b2038
Add a high-resolution of the Warzone logo.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7621 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
111711ad6b
trunk: Revert removal of line in Makefile.am that was (at least sometimes) necessary to build base.wz and mp.wz.
...
Also make sure all .wz archives are generated on 'make dist', so as not to require 'make' to be run first.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7620 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
62c9c4abab
Icons now have 32x32x16 version.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7611 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
9ac1b1adfd
Fix 'make dist' for trunk.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7609 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
91c9a8c7f7
Remove unused/unmaintained file for waf builds.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7605 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
7c9ba61782
New icons by Garrett Wiens-Kind <Neuralize>, 16x16 version by Zarel.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7603 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:55 +02:00
0429360f72
New Warzone logo created by Garrett Wiens-Kind <Neuralize>.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7601 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:55 +02:00
ebbc650470
Move AIV from global to multiplay, since it is only a MP mod.
...
Update makefile(s) as well, and configure.ac
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7596 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:55 +02:00
Christian Ohm
Per Inge Mathisen
Buginator
René Jürgens
Guangcong Luo
Gerard Krol