Commit Graph

60 Commits (79ed9b96e83e8740e05a5d2a75d06e95467cb514)

Author SHA1 Message Date
Buginator 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
Buginator 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
Guangcong Luo 9000a57144 Fix bug #541 - Uninstaller misses some files.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7544 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-28 09:59:31 +02:00
Guangcong Luo 18a64a9387 Move the "Video" component out of the "Mods" section in the Windows installer.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7409 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-15 22:29:32 +02:00
Guangcong Luo 5a974ed226 Windows installer fixes:
* Make the cross-compile script Ubuntu-compatible
 * Don't redownload the music mod if we already have it
 * Download sequences (if we don't already have it)
 * Remove EULA agreement (The GPL is not a EULA)
 * Install OpenAL silently (Its license is not a EULA; see ML discussion)

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7327 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:40 +02:00
Giel van Schijndel 939f4902ad Replace SDL-net by using BSD sockets instead
NOTE: Still needs some checking and work for Windoze compatibility.

Addresses #435

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7286 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:35 +02:00
Christian Ohm b04a4a7412 Change some defaults:
- Use DejaVu Sans
- Don't pause on focus loss
- Use the whole window for videos

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7232 4a71c877-e1ca-e34f-864e-861f7616d084
2009-05-06 22:29:29 +02:00
Gerard Krol 107f634977 Set svn:eol-style native and convert the line endings to \n.
This is to make sure Git on Windows does not complain when autocrlf and safecrlf are set.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6886 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-21 01:53:25 +01:00
Dennis Schridde 205e3da43a Create the Windows installer in builddir instead of srcdir
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6852 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-14 23:32:49 +00:00
Dennis Schridde 8ea3af5271 Remove grim-mod, as it is no longer included in the sources
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6851 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-14 23:32:45 +00:00
Per Inge Mathisen 42d5809ae5 Move the RPM spec file where it belongs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6800 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 20:46:49 +00:00
Dennis Schridde e2745322e3 Fix warnings in NSIS scripts
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6627 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-11 14:13:08 +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
Giel van Schijndel 129377b82d Update changelogs and bump version numbers in prepration of releasing 2.1.1
This addresses #202


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6548 4a71c877-e1ca-e34f-864e-861f7616d084
2009-01-11 21:34:54 +00:00
Giel van Schijndel 260f91548a Update changelogs and bump version numbers in prepration of releasing [milestone:2.1]
This addresses #172.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6471 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-21 18:34:29 +00:00
Giel van Schijndel 0dc0addab9 music_1.0.wz got renamed to community-music_1.0.wz so update the URL in the installer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6414 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-30 18:05:27 +00:00
Giel van Schijndel 6ed88bec7b Bump version numbers for 2.1 RC2 and update changelogs
Addresses #165

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6412 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-30 15:27:37 +00:00
Giel van Schijndel ef994389f5 Bump release date of 2.1_rc1 to today
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6254 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-09 15:49:47 +00:00
Giel van Schijndel 4d066be1ca * Merged revision r6249 via svnmerge from trunk
* Update the Debian changelog as well

........
  r6249 | muggenhor | 2008-11-08 20:30:18 +0100 (za, 08 nov 2008) | 4 lines
  
  Allow the initialisation function of the debug callback to fail and report its failure through its return value:
   * If initialisation of the debug callback failed, do ''not'' add it to the list of debug callbacks to use
  
  This fixes ticket:136
........

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6250 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-08 20:46:40 +00:00
Giel van Schijndel d0cae6d040 Bump the version numbers
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6248 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-08 19:03:53 +00:00
Giel van Schijndel bb64ebc231 Build depend on libgl-dev (for the Debian pkg)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6246 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-07 14:43:39 +00:00
Giel van Schijndel 5ad2a63ae1 Update changelogs to include the addition of the New Team War (NTW) mod to 2.1
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6091 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 14:14:10 +00:00
Giel van Schijndel 3833da4719 Tag of the `2.1 beta 5` release
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6090 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-28 13:50:23 +00:00
Giel van Schijndel 2c616f323e Trunk is currently broken when playing music and switching between the "base" and "mp" mods, see ticket:57.
This revision fixes ticket:57. We (Buginator, EvilGuru and Giel) decided to use the fix suggested in ticket:57 for now and to use [wiki:Proposal:ModMounting] on a later date. I.e. fix the problem now (however dirty the solution may be), and implement a properly designed one later on, instead of letting trunk remain broken until said proposal is worked out in enough detail.

This revision fixes bug #11847, bug #11875, bug #11898, bug #11976, bug #11989, bug #12017, bug #12250 and bug #12280.

Patch by Buginator and myself


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6028 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 20:36:50 +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
Steven Koenig 1bed910d23 * Completed/Updated/Fixed German translation of .nsi-files
* Converted warzone2100.nsi to ISO-8859-15 (NSIS requires this)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5975 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-09 09:35:22 +00:00
Giel van Schijndel a1d7f9bfa1 * Include the NTW mod in the NSIS installer
NOTE: Still requires a German translation string for the description


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5971 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-08 19:43:59 +00:00
Giel van Schijndel de70b9ceb8 Add all translations in po/ to the NSIS installer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5633 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-21 19:29:49 +00:00
Giel van Schijndel cce9e1d768 Include the "Bold" face of DejaVu Sans Mono as well in the NSIS installer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5632 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-21 19:19:56 +00:00
Giel van Schijndel 1311a3dc19 Don't define EXTDIR as a subdir of the devpackage, define it as the dir of the devpackage
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5613 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-20 16:18:34 +00:00
Giel van Schijndel 8a4ccb21a7 Merge changelog changes of r5587 from the 2.1 branch into trunk
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5591 4a71c877-e1ca-e34f-864e-861f7616d084
2008-07-19 20:15:10 +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
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
Giel van Schijndel 1aa21f208e * Update Debian changelog
* Fix win32 version info
  * We live in 2008 now...
  * Use 2.0.993.0 instead of 2.0.3.0 for 2.1 beta3 (the same scheme was used for beta1 & beta2)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5227 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-07 12:26:03 +00:00
Dennis Schridde 976240b528 Fix raw makefile dep
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5157 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 21:50:40 +00:00
Dennis Schridde 85ab4e02e9 Move base files from data/ into data/base/ (and stuff from warzone.wz to base.wz respecitively).
Should not create any problems, buildsystems were changed (MacOSX, please test).
Reason: Organisation, later: simplification.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5156 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 21:42:44 +00:00
Dennis Schridde 3c3a5d9a89 Formating and dont download gpg-signatures, which wont be checked by anyone anyway.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4783 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-26 13:54:08 +00:00
Giel van Schijndel 495b86f592 Update pkg/nsis/Makefile.am to match the rename from NSIS_COMPRESSION to INSTALLER_COMPRESSION in r4714
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4718 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-21 00:44:46 +00:00
Giel van Schijndel 40cc8f09ac Give the configure and crossbuild scripts the possibility to specify the compression method on the command line (--with-nsis-compression)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4663 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-17 14:32:48 +00:00
Giel van Schijndel 78612ffe4f Lets not bother users by telling users the download failed because it was succesfull (no, that's not fuzzy logic, it isn't logic at all)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4613 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 19:28:57 +00:00
Giel van Schijndel c29591c6c7 Use "correct" filenames for the music modpack
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4612 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 19:23:06 +00:00
Giel van Schijndel f70cadb837 During installation (NSIS) provide the option to download and install the new music modpack
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4608 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 18:33:31 +00:00
Giel van Schijndel f23ef17e7d During uninstall (Windows - NSIS installer) also remove Aivolution
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4607 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 17:41:30 +00:00