diff --git a/INSTALL b/INSTALL index cab43ddaab..2f29a4823f 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -Copyright 2007-2011 The OpenRA Developers (see AUTHORS) +Copyright 2007-2013 The OpenRA Developers (see AUTHORS) This file is part of OpenRA, which is free software. It is made available to you under the terms of the GNU General Public License as published by the Free Software Foundation. For more information, @@ -29,8 +29,8 @@ Run the game with `OpenRA.Game.exe Game.Mods=ra` for Red Alert or `OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer -UBUNTU (substitute comparable packages for other linux distros): -* mono-runtime (>= 2.6.7), +UBUNTU (substitute comparable packages for other Linux distros): +* mono-runtime (>= 2.10) * mono-gmcs * freetype * libmono-corlib1.0-cil @@ -39,8 +39,6 @@ UBUNTU (substitute comparable packages for other linux distros): * libsdl1.2-dev * nvidia-cg-toolkit (for Cg renderer) -OpenRA does not work with some older versions of Compiz. On affected systems, disable desktop effects before playing. This is fixed in Ubuntu Natty and later. - The following dlls can also be installed into your system GAC. This is not recommended because we ship a custom Tao.FreeType that can conflict with other applications that use Tao: diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 36d6723990..5e76423425 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -441,14 +441,11 @@ namespace OpenRA var settings = new ServerSettings() { Name = "Skirmish Game", - Map = map + Map = map, + AdvertiseOnline = false, + AllowPortForward = false }; - // Work around a miscompile in mono 2.6.7: - // booleans that default to true cannot be set false by an initializer - settings.AdvertiseOnline = false; - settings.AllowPortForward = false; - server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), Game.Settings.Game.Mods, settings, modData); diff --git a/OpenRA.Launcher.Mac/Controller.m b/OpenRA.Launcher.Mac/Controller.m index 3e2a965484..c3cb70d599 100644 --- a/OpenRA.Launcher.Mac/Controller.m +++ b/OpenRA.Launcher.Mac/Controller.m @@ -28,7 +28,7 @@ extern char **environ; defaultButton:@"Download Mono" alternateButton:@"Quit" otherButton:nil - informativeTextWithFormat:@"OpenRA requires the Mono Framework version 2.6.7 or later."]; + informativeTextWithFormat:@"OpenRA requires the Mono Framework version 2.10 or later."]; if ([alert runModal] == NSAlertDefaultReturn) [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.go-mono.com/mono-downloads/download.html"]]; @@ -153,9 +153,7 @@ extern char **environ; sscanf([ret UTF8String], "Mono JIT compiler version %d.%d.%d", &major, &minor, &point); [ret release]; - return (major > 2 || - (major == 2 && minor > 6) || - (major == 2 && minor == 6 && point >= 7)); + return (major > 2 || (major == 2 && minor >= 10)); } - (void)dealloc diff --git a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA index 4e575c6269..56d2aedbe7 100755 Binary files a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA and b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA differ diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control index 5d35b5b187..536d9dfd3d 100644 --- a/packaging/linux/deb/DEBIAN/control +++ b/packaging/linux/deb/DEBIAN/control @@ -3,7 +3,7 @@ Version: {VERSION} Architecture: all Maintainer: Chris Forbes Installed-Size: {SIZE} -Depends: libopenal1, mono-runtime (>= 2.6.7), libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, libmono-i18n2.0-cil +Depends: libopenal1, mono-runtime (>= 2.10), libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, libmono-i18n2.0-cil Section: games Priority: extra Homepage: http://www.open-ra.org/