Commit Graph

83 Commits (23b4d3e8a1ed17e3cc9eba344c2e05e554fa5623)

Author SHA1 Message Date
Rene Jochum f4017eda50 Merge remote-tracking branch 'upstream/master' into bsonlobby
Conflicts:
	configure.ac
	lib/netplay/Makefile.am
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Makefile.am
2011-07-03 01:04:50 +02:00
cybersphinx cfd5dca645 Revert "Converts warzone2100.nsi to utf8" and "Reapply Dutch Fixes from Giel"
Closes #2736.

This reverts commits b56d25a146 and
e21d4b7144.

This reverts commit
2011-05-19 14:49:27 +02:00
cybersphinx 37012d975c Fix nsis script. 2011-05-14 23:47:25 +02:00
cybersphinx f3f2c706dc Fix nsis installer for the new quick start guide. 2011-05-14 18:10:37 +02:00
cybersphinx a418051628 Some nsis fixes.
Don't set the compressor in the file, since it's set on the command line
already (prevents a warning). Remove COPYING.* files.
(cherry picked from commit c3174cae1953f7f59324aec16a4c81f04b0cfa68)
2011-05-09 02:31:50 +02:00
Rene Jochum e4ff3366fc Moves the Cacert root Cert into data/base.wz 2011-05-07 01:17:38 +02:00
Rene Jochum b56d25a146 Reapply Dutch Fixes from Giel 2011-05-03 04:58:12 +02:00
Rene Jochum e21d4b7144 Converts warzone2100.nsi to utf8 2011-05-03 04:47:16 +02:00
Buginator 33a9262ec5 Fix Dutch translation (Thanks to Giel)
Make viewing the GPL text a click-through.
Bump the (c) year.
2011-05-02 20:02:12 -04:00
Rene Jochum 8d78a78e2f Includes the cacert root cert within dpkg and nsis packages. 2011-05-02 22:15:20 +02:00
Buginator 90c91165b2 Update NSIS with Russian translation by forum member Terminator. 2011-04-24 14:44:56 -04:00
Buginator 98f9b3b601 Add version number to title, and GPL license dialog, and also add a hotlink for our site.
Russian & Dutch strings need to be fixed.
2011-04-17 16:16:08 -04:00
cybersphinx 38088f37bc Add Catalan translation by mecatxis.
Closes #2616.
2011-04-03 21:44:57 +02:00
cybersphinx 8bc7aa208c Add Hungarian translation by Mészáros Tamás.
Also sort the LANG_NAMEs.
2011-04-03 01:56:08 +02:00
cybersphinx caee6e3da7 Change video download location to Sourceforge for the Windows installer. 2011-02-10 21:20:29 +01:00
cybersphinx f01a35e768 Remove Dydo-AI and Semperfi mods from the nsis installer. 2011-01-18 02:54:51 +01:00
cybersphinx 663b3e69ee Add semperfi to the nsis installer.
Untested.
2010-12-30 23:59:22 +01:00
cybersphinx 985d2b8de2 Fix mod shortcuts for the Windows Installer. 2010-11-15 22:54:42 +01:00
cybersphinx 99486cb694 Add Turkish translation by Ayhan Görgülü.
Closes #2261.
2010-11-02 15:34:00 +01:00
Christian Ohm 78fa9a69aa Use separate installation folder and registry key for nsis.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11617 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-05 00:21:02 +02:00
Christian Ohm e5a619411e Remove every line with "ntw" from the nsis script.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11615 4a71c877-e1ca-e34f-864e-861f7616d084
2010-09-05 00:21:02 +02:00
Christian Ohm b1a4fe21fe Actually install the Korean and Slovak translations on Windows.
Refs #2074.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11432 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-11 13:48:01 +02:00
Christian Ohm 12cee1fc89 Add track3.ogg to the NSIS installer.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10910 4a71c877-e1ca-e34f-864e-861f7616d084
2010-06-03 22:41:44 +02:00
Christian Ohm 9da3443c2d Revert r9878, to make Windows cross builds work again.
Giel: Please don't just revert my changes without fixing the real problem
(see #1473).

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10618 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-17 23:01:07 +02:00
i-nod 8eed0037b2 Remove 'Run Warzone2100' and ' Show readme' checkboxes from NSIS installer's final page due to possible user context issues. On-site readme and offline readme(marked as outdated btw) links should be placed later in Start menu. Closes #1690.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10399 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-23 12:26:12 +01:00
i-nod 09a3837526 Sync NSIS project with 2.3 version.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10021 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-27 22:51:27 +01:00
Buginator b056e7184c DyDo 2.0.5 debut, NSIS, Makefile.am and Makefile.win32 fixes for the mod.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9926 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-21 06:50:54 +01:00
Giel van Schijndel e4dd2951fe Installer: use the *.gmo files from ${TOP_BUILDDIR}
The *.gmo files won't be placed in ${TOP_SRCDIR}.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9877 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-19 19:50:30 +01:00
i-nod d457d866ba - Aivolution has been removed from the MinGW build system and NSIS project
- NSIS: Aivolution and Original remnants should be removed from target system before installing new files
- NSIS: Force admin-privileges in UAC (they are required anyway), this will allow correct SM shortcuts removal possible on Vista/7


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9764 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-11 20:14:34 +01:00
i-nod cec20aae6a - NSIS changes from 2.3 (#1111).
- Additional fixes to [9642]: remove old-1.10-balance.wz instead of origianl.wz.
- MinGW build system updates.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9727 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:28:16 +01:00
Buginator ade49a97d6 frontport r9642
Fix NSIS
 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9703 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:28:11 +01:00
Christian Ohm 36acdc554b Add Croatian translation by 13KukYNexus666.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9474 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:43 +01:00
Christian Ohm 6bfac26b93 Actually install the Ukranian translation on Windows.
Closes #1424.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9327 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:20 +01:00
Christian Ohm 4f0ac79189 Change location of the GMO files for NSIS.
This is a bit ugly, but it makes building from the tarball possible. Better
solutions welcome.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9219 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:02 +01:00
Christian Ohm b0c4e40934 Include files needed for win32 cross-building.
Building from tarball still doesn't work, since nsis wants the gmo files in the
build dir while they are in the source dir.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9146 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:34 +01:00
Giel van Schijndel 0705cbdf35 Don't perform additional dependency resolving for the installer when we're not building the installer...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8948 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:00 +01:00
Giel van Schijndel e89964b87b Win32 crossbuild scripts
* build the *.gmo files when required
 * only run autogen.sh when required.
 * Use 'set -x' to achieve make-like command printing behaviour
  - I.e. instead of using a custom 'execute' function

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8909 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:27:08 +01:00
i-nod ee51bd1d5b - Windows installer project has been updated to the 2.3 state.
- Removed Grim's mod from the MinGW build system.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8515 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-28 19:34:12 +01:00
Buginator 18bd672df9 Upload the fonts.conf file that NSIS uses.
fonts.conf.wd_enable is the one where windows directory is enabled.
fonts.conf.wd_disable is the one where the windows directory is disabled (default)

The reason for this is, when enabled, it takes a very long time to build the font cache on vista & win7.

Closes ticket:1013

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8321 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:19:52 +01:00
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
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
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