Commit Graph

7877 Commits (3f97c795c02d3a4bcd38ed8bfd1426758a10e281)

Author SHA1 Message Date
Guangcong Luo 2197ffed66 Fix bug #1581 - incorrect power calculation
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10769 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-04 21:36:08 +02:00
Christian Ohm 12805816a4 French translation update by Gilles J. Seguin.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10767 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-04 19:08:52 +02:00
Guangcong Luo 4a21f58307 Apply patch #1820 - Easier queueing of building/demolishing while holding down Shift. refs ticket:1820
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10766 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-03 08:50:19 +02:00
Guangcong Luo 2883c1c9e2 Display build cursors while building. Simplify cursor logic a bit.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10765 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-03 08:50:19 +02:00
René Jürgens 55e32c9402 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10763 4a71c877-e1ca-e34f-864e-861f7616d084 2010-05-03 08:50:18 +02:00
Per Inge Mathisen b54fd792ab semperfi: Fix bug that made us never build incendry, and less often upgrade.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10761 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-03 08:50:18 +02:00
Per Inge Mathisen fac1b9d48a Revert r10678 - as ASR_NEAREST can be much slower than the removed hack.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10760 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-03 08:50:17 +02:00
Safety0ff 5c74291bab qwzm:
-Check that file is open before trying to write to it.
-Remove unnecessary include.
-Use 256 for fallback texture dimensions when writing a pie 2.
-Fix rounding when exporting to pie 2.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10759 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:51 +02:00
dak180 e3c1703206 Improve the fetch scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10757 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:51 +02:00
Guangcong Luo 4ed334e27d Always show a delivery point when cheating droids with the debug menu.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10755 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:50 +02:00
Safety0ff 1ade59528c qwzm:
-Touch up r10748 and fix a typo it introduced.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10754 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:50 +02:00
Buginator 0c456a73da revert a bad commit (r10752)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10753 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:50 +02:00
Buginator a198e7c5f8 testing
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10752 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:50 +02:00
dak180 a382b728c9 Update Ogg to 1.2.0 and Vorbis to 1.3.1.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10751 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:43 +02:00
dak180 2806c9ddf0 Update zlib to 1.2.5.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10750 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:43 +02:00
Safety0ff dfdb343064 QWZM:
-Reviewed loadPIE and savePIE functions.
-Improved documentation of savePIE function.
-Added bounds checking to prevent currentFrame being an invalid value.
Refs #1763.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10748 4a71c877-e1ca-e34f-864e-861f7616d084
2010-05-02 09:20:42 +02:00
Safety0ff 78a9b96ea6 QWZM: Unclobber indentation (refs r10729,r10740.)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10747 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Guangcong Luo 5e6480371f Clean up validLocation [for structure placement] code. Visible changes: Required distance between two structures no longer depends on which one is built first. Now only 1 tile needed between 2 repair facilities.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10746 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Guangcong Luo 1a45555ebc Make sure LasSat doesn't get identified as a fortress.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10745 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Per Inge Mathisen 0b10affd98 Correct the signs used in a previous formation patch. Noted by enki in ticket:1649
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10744 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Christian Ohm 040c02d418 Spanish translation update by Saberuneko.
Closes #1813.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10743 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Safety0ff ec73038633 QWZM:
Copy display/wzmutils .c & .h to the qwzm folder so that they can be modified for cpp/Qt/QWZM.
Revert r10279 for display/wzmutils .c & .h so that they work like wzmviewer expects them to.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10741 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Safety0ff 2c08757b1c QWZM: Apply UI improvement patch by Emdek.
Modifications I made to it:
-Fixed the mesh selection issue in the patch.
-Witheld renaming the program (needs more discussion,) and changed version string.
Refs #1763.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10740 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Christian Ohm dc2cae0ce9 French translation update by Gilles J. Seguin.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10739 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-30 12:33:20 +02:00
Guangcong Luo 28bf4191b6 Make walls rotate to match hardpoints and fortresses, but not bunkers and [most] towers. Also simplify structChooseWallType a bit.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10737 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:20 +02:00
Guangcong Luo edea97a633 Make double-click interval game-speed independent (patch idea by Safety0ff)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10735 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:20 +02:00
Christian Ohm a993c51db9 Improve GLee detection.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10734 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:19 +02:00
Christian Ohm 91e4eabd51 Add autoconf macro missing from the last commit.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10732 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:19 +02:00
Christian Ohm ccd4264005 Enhanced GLee detection.
Since the pkg-config script Debian ships is a custom addition, test for GLee
manually as well.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10731 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:19 +02:00
Christian Ohm fd4571b88b Fix GLee include paths.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10730 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:19 +02:00
Safety0ff f146e9c044 QWZM:
-Added experimental PIE export.
-Added experimental PIE 3 import.
-Merged PIE and WZM opening into one dialog.
-Fixed ambiguous shortcuts.
-Single mesh display.
-Turned on alpha blending (for textures with alpha.)
-Improved (but not removed,) use of hardcoded paths for texture finding.
-Fixed some memory leaks.
-Way less potential program exits.
-Disabled (i.e. grayed out) buttons that don't currently do anything.
-Fixed some warnings.

Possibly other stuff, and probably new bugs. ;P
Refs #1763




git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10729 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:18 +02:00
Guangcong Luo 7bdf216507 Fix typo in previous commit.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10728 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:18 +02:00
Guangcong Luo a51f97c63e Improved AI slider.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10727 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:17 +02:00
Guangcong Luo 4282d92b3c Add "SCOUT" and "DISEMBARK" cursors.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10726 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-28 07:52:17 +02:00
Per Inge Mathisen 02ae467dc2 semperfi: Put a power generator into the must-build list before expanding the base, to avoid starvation problems.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10722 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-26 11:31:28 +02:00
Per Inge Mathisen 5428d8ccca Update RPM build script
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10720 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-26 11:31:28 +02:00
Per Inge Mathisen b357462efc New improved scav script that operates scavengers individually. Helps when they are station in multiple scav bases.
This fixes the scavenger problems reported in http://forums.wz2100.net/viewtopic.php?f=30&t=5100


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10716 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-25 21:24:58 +02:00
Christian Ohm aadc958906 Update .gitignore.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10715 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-25 21:24:58 +02:00
Per Inge Mathisen e7c22ecc5c Put miniupnpc and iniparser license files into dist tarball
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10713 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-25 21:24:57 +02:00
Christian Ohm e7183c700f Use a different macro for the gettext version check.
Also remove an accidentally committed line from POTFILES.in.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10712 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-25 21:24:57 +02:00
dak180 91b820f198 Fix a few typos.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10709 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-25 12:04:35 +02:00
Buginator 8ad47a08e6 Set some missing svn properties for the sequenceaudio/cam*/*.txa & /*.txt files.
2.3: r10707

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10708 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-25 12:04:34 +02:00
Christian Ohm 5f43907ac7 Only use our integrated GLee header when needed.
Fixes building with the integrated GLee removed.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10701 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-24 19:29:21 +02:00
Christian Ohm 7327fc0493 Include po/update-po.sh in the tarball.
Fixes make distcheck.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10700 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-24 19:29:21 +02:00
Christian Ohm 8b034711f4 Update translations.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10699 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-24 19:29:21 +02:00
Christian Ohm 7664a38d5e Ukrainian translation update by Olexandr1986.
Closes #1797.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10698 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-24 19:29:20 +02:00
dak180 d72ba6b872 Keep up with the changing urls for the videos and some general clean up.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10692 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-24 19:29:19 +02:00
Per Inge Mathisen b1547abfa1 semperfi: Avoid starvation problem that occurs if AI builds too many power generators at once,
finishing none of them before running out of power. Now prioritizes aiding power generator
construction or upgrade before building new ones. Thanks to Safety0ff for reporting this issue.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10691 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-24 19:29:19 +02:00
dak180 765c648058 Distinguish between different types of .wz files
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10689 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-23 13:10:04 +02:00
Per Inge Mathisen afc69769b0 Make a .wz archive for semperfi. Patch by Safety0ff, closes ticket:1789
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10680 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-23 13:10:01 +02:00