Commit Graph

112 Commits (677c52277e47086ed17254e55f061450f7c94754)

Author SHA1 Message Date
Dennis Schridde a3f46201bb Fix out-of-source build: Relative paths to srcdir were double applied
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6748 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 19:41:20 +00:00
Per Inge Mathisen 0bd4f60a78 Set svn eol-style native to scripts files and svg files that are missing it while I'm at it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6585 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-04 23:09:36 +00:00
Per Inge Mathisen bb9bc6e335 Set svn:eol-style native on some TXT files that are missing the property.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6584 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-04 23:04:18 +00:00
Per Inge Mathisen 1154d45ed1 Set svn:eol-style property on some WRF files that are missing it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6583 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-04 23:03:10 +00:00
Per Inge Mathisen fac247afba Fix bad texture page names in some PIE files.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6582 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-04 23:00:47 +00:00
Per Inge Mathisen 28e24651e5 Fix missing svn:eol-style property on some PIE files.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6581 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-04 22:30:42 +00:00
René Jürgens 1e8738943c paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6489 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:33:51 +00:00
René Jürgens 6d8e785cda paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6488 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:33:47 +00:00
René Jürgens 495b750653 paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6487 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:31:40 +00:00
René Jürgens 046692a397 paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6486 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:31:36 +00:00
René Jürgens d7c55d5ae9 paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6485 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:31:31 +00:00
René Jürgens 1d6541278f paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6484 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:31:08 +00:00
René Jürgens 434bae24c7 paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6483 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:31:05 +00:00
René Jürgens 97a4754891 paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6482 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:31:01 +00:00
René Jürgens 342bf90bb8 paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6481 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:30:58 +00:00
René Jürgens 3d0f5d5e0d paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6480 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:30:54 +00:00
René Jürgens 4fea33ecca paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6479 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:30:31 +00:00
René Jürgens 3e137a5ebd paste new ntw mod files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6478 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:30:28 +00:00
René Jürgens 7f2bf8a30b deleting all ntw mod files in the trunk version for a ntw mod update.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6477 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 20:28:46 +00:00
Giel van Schijndel 448431d344 Rename the NTW mod's directory back to "ntw"
r6474 changed it to "ntw mod", but that directory path adds little, and introduces problems with our build systems due to the embedded space and makes maintaining compatibility with [milestone:2.1] more difficult (considering that NTW is already packaged as part of 2.1.0 in Debian and Gentoo).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6476 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 19:55:26 +00:00
René Jürgens d273dcdaa2 01_ wrfs are not needed for ntw mod.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6475 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 18:28:10 +00:00
René Jürgens 159aa080f0 Please call it NTW Mod not only NTW.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6474 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-24 18:21:31 +00:00
Gerard Krol 71af833dd5 Add an urban sky and (for now) also use it for the Rockies.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6347 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-17 10:02:28 +00:00
Gerard Krol a5128f0d6d Rename the current skybox texture page to page-25-sky-arizona and use the entire texture, instead of only the bottom half of
it. This will make it easier to change the sky for the different areas.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6345 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-17 08:06:49 +00:00
Giel van Schijndel 810fac209b * Wrap all file lists in the automake and win32 makefiles across lines such that there's only one file on each line
* Alphabetically sort the file lists

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6144 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-13 13:04:37 +00:00
Giel van Schijndel 372851ea71 Fix typo that prevented the multiplayer mod from being installed
Patch by Paul Wise <pabs>, this closes bug #12313

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6043 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-18 18:31:15 +00:00
René Jürgens afd15e3dc5 git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6023 4a71c877-e1ca-e34f-864e-861f7616d084 2008-09-14 15:40:13 +00:00
René Jürgens ec42455709 test
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6022 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 15:39:49 +00:00
Giel van Schijndel 5daf3d8035 Simplify the automake processed makefiles in data/
* Getting rid of the custom crafted installation rules
 * Replace them with a single automake primary build rule: nodist_<instdir>_DATA

This closes ticket:62

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5995 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-12 08:19:57 +00:00
Giel van Schijndel c2f0855e00 NTW is a multiplay mod, not a global mod. So move it to data/mods/multiplay.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5989 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-11 09:12:38 +00:00
Giel van Schijndel 77404123a6 Update player[1-7].[sv]lo so that they're "generated" from the last version of player0.[sv]lo r5726 didn't use the latest version somehow
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5783 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-08 14:45:11 +00:00
Dennis Schridde 87f127c146 Do not autogenerate aivolution scripts
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5726 4a71c877-e1ca-e34f-864e-861f7616d084
2008-08-01 17:39:10 +00:00
Roman C 2eba906351 Aivolution AI builds bunker buster tanks again.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5671 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-26 16:09:55 +00:00
Giel van Schijndel b7f1b4aae1 Read some scripts using their __lower-case__ name (as these file's names are lower-case)
This might fix bug #12011

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5539 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-13 22:25:44 +00:00
Dennis Schridde 022315eef0 Hardcode top_srcdir to make building from non-topdir possible, dont depend on the touch command, fix LDFLAGS to not depend on the removed TARGET variable
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5476 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 20:10:16 +00:00
Giel van Schijndel 6fcbc73c2c Merge the DATA build option (for the win32 makefile build system) into INSTALLER as the data packages are only required when building an installer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5473 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-10 17:51:31 +00:00
Dennis Schridde 302a557478 Rename "raw" Makefiles to "win32" Makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5402 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-06 14:29:04 +00:00
Dennis Schridde 45f23a4926 Merge commit 'HEAD@{3}'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5347 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 22:32:44 +00:00
Dennis Schridde fcd1455f44 Merge commit 'HEAD@{4}'
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5346 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-28 22:32:14 +00:00
Dennis Schridde 050ec39c11 Use the (also new in this commit) relative variants of the directories almost everywhere.
Exception is when generating the .wz files, where we need the path to the build directory and building a reverse relative path to $(srcdir) will be messy.
Also silence submake.mk a great deal.
Bug #11883 should be fixed now for the most part.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5325 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 23:41:52 +00:00
Dennis Schridde fd2bfb0e0f Prepare for another fix for parts of bug #11883: Issues with the improved raw Makefiles
- Rename Makefile.raw to lowercase


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5321 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 22:48:45 +00:00
Dennis Schridde 73b35ab8d6 Rename top_srcdir/top_builddir to abs_top_srcdir/abs_top_builddir, to make this more obvious.
Their use is currently flawed, since it will not work in directories with spaces in them... (


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5319 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-24 20:19:54 +00:00
Dennis Schridde 9bd8b24921 Boost raw Makefiles
- Use PACKAGE, PACKAGE_VERSION, remove VERSION
- Allow out-of-source-dir builds (mkdir build && cd build && make -f ../Makefile.raw)
- Move config.mk from $(top_srcdir)/makerules/config.mk to $(top_builddir)/config.mk
   When keeping current behaviour (srcdir=builddir), this means: Move it from makerules into the main directory


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5308 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-23 13:54:47 +00:00
Dennis Schridde adcac9d1e8 Add NTW Mod 1.6.6 by Delphinio under GPL2+
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5240 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-11 15:14:55 +00:00
Dennis Schridde e7a0a57b0e Simplify buildsystem for base.wz/mp.wz and make sure to really regenerate the archives.
This would not always work before, since we just depend on the directory, not each file in it.
This oversight made make not recognize when a file was changed and the archive needs to be regenerated.
We now run zip on every invocation of the data target.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5158 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 22:01:07 +00:00
Roman C d24c8d0eb3 Aivolution: prevent division by zero, this hopefully fixes bug #11725.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5154 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 19:04:42 +00:00
Roman C 3fdc1dc341 Aivolution:
-use super cannon cyborgs
-use thermite flamers cyborgs
-research more flamer upgrades

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5022 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 17:18:29 +00:00
Roman C 77317b4508 Aivolution:
-remove unused research
-calculate the most effective AT weapon on the fly

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5015 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 13:24:42 +00:00
Roman C a63115ec88 Fixed a crash in Aivolution.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4931 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-04 17:15:40 +00:00
Roman C be072337f4 Aivolution: increase number of min attackers needed to start attacking an enemy.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4930 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-04 16:51:23 +00:00