Forgot to include the diff; how embarrassing... Now at the bottom.
On Mon, Jun 15, 2020 at 04:26:15PM -0600, Thomas Frohwein wrote:
> Hi,
>
> Below a diff to update OpenRA to 20200503. The most significant change
> is the added ability to zoom with the mouse wheel, making these games
> much more suitable for current high-resolution monitors.
>
> Release announcement at [1], changelog at [2]. Someone with a nice
> German accent even went through the trouble of creating a video summary
> of all the important changes to OpenRA [3].
>
> This update requires devel/msbuild which is now available as package for
> amd64. I have yet to figure out what exactly breaks the build on i386.
>
> I tested singleplayer Red Alert campaigns without finding any problems.
> Multiplayer can discover games on the servers; so should work, too.
>
> Some more details about the update:
> - Upstream's approach for geo locating is to fetch a package
> IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP from somewhere. Since I don't know
> anything about the source of that, I just patched it to continue to
> use libmaxminddb as previously, which appears to work judging by
> normal function of the discovery of multiplayer games.
> - Hardcode the game version now - appears to be better potentially for
> multiplayer participation than to leave version out like previously.
>
> ok's, comments welcome
>
> [1] https://www.openra.net/news/release-20200503/
> [2]
> https://github.com/OpenRA/OpenRA/wiki/Changelog/61b8f4fd0ee62ef2e82120e3b52480a431ae7f83
> [3] https://youtu.be/L2sQP3YYBMA
>
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/openra/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 12 Jul 2019 20:46:22 -0000 1.5
+++ Makefile 9 Jun 2020 04:30:26 -0000
@@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2019/07/12 20:46:22 sthen Exp $
COMMENT = open-source real-time strategy game engine
-V = 20190314
+V = 20200503
DISTNAME = openra-${V}
CATEGORIES = games x11
HOMEPAGE = https://www.openra.net
MAINTAINER = Thomas Frohwein <[email protected]>
-REVISION = 2
# GPLv3 (openra)
# MIT (StyleCopPlus, StyleCop, SharpZipLib, NUnit, NUnit.Console, Open.Nat,
@@ -31,7 +30,8 @@ DLLMAP_FILES = thirdparty/download/Open
MODLUA_VERSION = 5.1
MODLUA_SA = Yes
-BUILD_DEPENDS = net/curl
+BUILD_DEPENDS = devel/msbuild \
+ net/curl
RUN_DEPENDS = devel/desktop-file-utils \
net/libmaxminddb,-db \
x11/gtk+3,-guic
@@ -40,6 +40,7 @@ LIB_DEPENDS = audio/openal \
USE_GMAKE = Yes
# Target 'test' only checks the official mods for erroneous yaml files
NO_TEST = Yes
+ALL_TARGET = version all
SUBST_VARS += LOCALSTATEDIR
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/openra/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 31 Mar 2019 05:09:06 -0000 1.1.1.1
+++ distinfo 9 Jun 2020 04:30:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (openra-20190314.tar.xz) = mNi6WriuDFjCwAxZvo2/7s2vU+oPXT+tbyQbekwUrfE=
-SIZE (openra-20190314.tar.xz) = 23872504
+SHA256 (openra-20200503.tar.xz) = zyCg6N+OHt7f2Zpl5Lzi1cVktPWLQ+cDm+SXDccRUWk=
+SIZE (openra-20200503.tar.xz) = 26813308
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/openra/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 28 Apr 2019 03:34:16 -0000 1.2
+++ patches/patch-Makefile 9 Jun 2020 04:30:26 -0000
@@ -1,14 +1,14 @@
-$OpenBSD: patch-Makefile,v 1.2 2019/04/28 03:34:16 thfr Exp $
+$OpenBSD$
set the installdir to PREFIX/share rather than PREFIX/lib
-don't get VERSION from git
-disable fetch-geoip-db.sh which is not compatible with building without network
-access
+hardcode VERSION, instead of getting it from git
+don't install IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP; use libmaxminddb from
+ports instead
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -64,7 +64,7 @@ datadir ?= $(datarootdir)
+@@ -58,7 +58,7 @@ datadir ?= $(datarootdir)
mandir ?= $(datarootdir)/man/
bindir ?= $(prefix)/bin
libdir ?= $(prefix)/lib
@@ -17,21 +17,56 @@ Index: Makefile
BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
DATA_INSTALL_DIR = $(DESTDIR)$(gameinstalldir)
-@@ -83,7 +83,7 @@ INSTALL_DATA = $(INSTALL) -m644
+@@ -76,13 +76,13 @@ INSTALL_PROGRAM = $(INSTALL) -m755
+ INSTALL_DATA = $(INSTALL) -m644
+
+ # Toolchain
+-MSBUILD = msbuild -verbosity:m -nologo
++MSBUILD = msbuild -verbosity:d -nologo -clp:DisableConsoleColor
+
+ # Enable 32 bit builds while generating the windows installer
+ WIN32 = false
# program targets
- CORE = pdefault game utility server
-VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD
2>/dev/null || echo git-`git rev-parse --short HEAD`)
-+#VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD
2>/dev/null || echo git-`git rev-parse --short HEAD`)
++VERSION = release-20200503
# dependencies
UNAME_S := $(shell uname -s)
-@@ -314,7 +314,7 @@ osx-dependencies: cli-dependencies geoip-dependencies
- @ $(CP_R) thirdparty/download/osx/*.dll.config .
+@@ -101,7 +101,7 @@ check-scripts:
+ check: dependencies
+ @echo
+ @echo "Compiling in debug mode..."
+- @$(MSBUILD) -t:build -p:Configuration=Debug
++ @$(MSBUILD)
+ @echo
+ @echo "Checking runtime assemblies..."
+ @mono --debug OpenRA.Utility.exe all --check-runtime-assemblies
$(WHITELISTED_OPENRA_ASSEMBLIES) $(WHITELISTED_THIRDPARTY_ASSEMBLIES)
$(WHITELISTED_CORE_ASSEMBLIES)
+@@ -157,7 +157,7 @@ ifeq ($(WIN32), $(filter $(WIN32),true yes y on 1))
+ else
+ @$(MSBUILD) -t:build -p:Configuration=Release
+ endif
+- @./fetch-geoip.sh
++# @./fetch-geoip.sh
+
+ clean:
+ @ $(MSBUILD) -t:clean
+@@ -169,10 +169,8 @@ clean:
+ distclean: clean
+
+ cli-dependencies:
+- @./thirdparty/fetch-thirdparty-deps.sh
+ @ $(CP_R) thirdparty/download/*.dll .
+ @ $(CP_R) thirdparty/download/*.dll.config .
+- @ test -f OpenRA.Game/obj/project.assets.json || $(MSBUILD) -t:restore
+
+ linux-dependencies: cli-dependencies linux-native-dependencies
- geoip-dependencies:
-- @./thirdparty/fetch-geoip-db.sh
-+# @./thirdparty/fetch-geoip-db.sh
- @ $(CP) thirdparty/download/GeoLite2-Country.mmdb.gz .
+@@ -219,7 +217,6 @@ install-engine:
+ @$(INSTALL_DATA) VERSION "$(DATA_INSTALL_DIR)/VERSION"
+ @$(INSTALL_DATA) AUTHORS "$(DATA_INSTALL_DIR)/AUTHORS"
+ @$(INSTALL_DATA) COPYING "$(DATA_INSTALL_DIR)/COPYING"
+- @$(INSTALL_DATA) IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
"$(DATA_INSTALL_DIR)/IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP"
- dependencies: $(os-dependencies)
+ @$(CP_R) glsl "$(DATA_INSTALL_DIR)"
+ @$(CP_R) lua "$(DATA_INSTALL_DIR)"
Index: patches/patch-OpenRA_Game_Network_GeoIP_cs
===================================================================
RCS file: /cvs/ports/games/openra/patches/patch-OpenRA_Game_Network_GeoIP_cs,v
retrieving revision 1.1
diff -u -p -r1.1 patch-OpenRA_Game_Network_GeoIP_cs
--- patches/patch-OpenRA_Game_Network_GeoIP_cs 28 Apr 2019 03:34:16 -0000
1.1
+++ patches/patch-OpenRA_Game_Network_GeoIP_cs 9 Jun 2020 04:30:26 -0000
@@ -1,27 +1,25 @@
-$OpenBSD: patch-OpenRA_Game_Network_GeoIP_cs,v 1.1 2019/04/28 03:34:16 thfr
Exp $
+$OpenBSD$
-get geoip from the net/libmaxminddb,-db port per sthen@'s recommendation
+get geoip from the net/libmaxminddb,-db port
Index: OpenRA.Game/Network/GeoIP.cs
--- OpenRA.Game/Network/GeoIP.cs.orig
+++ OpenRA.Game/Network/GeoIP.cs
-@@ -55,9 +55,9 @@ namespace OpenRA.Network
+@@ -113,7 +113,7 @@ namespace OpenRA.Network
+
+ static IP2LocationReader database;
+
+- public static void Initialize(string databasePath =
"IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP")
++ public static void Initialize(string databasePath =
"${LOCALSTATEDIR}/db/GeoIP/GeoLite2-Country.mmdb")
{
- try
+ if (!File.Exists(databasePath))
+ return;
+@@ -122,7 +122,7 @@ namespace OpenRA.Network
{
-- using (var fileStream = new
FileStream("GeoLite2-Country.mmdb.gz", FileMode.Open, FileAccess.Read))
-- using (var gzipStream = new
GZipInputStream(fileStream))
-- database = new
Reader(gzipStream);
-+ using (var fileStream = new
FileStream("${LOCALSTATEDIR}/db/GeoIP/GeoLite2-Country.mmdb", FileMode.Open,
FileAccess.Read))
-+ //using (var gzipStream = new
GZipInputStream(fileStream))
-+ database = new
Reader(fileStream);
+ using (var z = new ZipFile(databasePath))
+ {
+- var entry =
z.FindEntry("IP2LOCATION-LITE-DB1.IPV6.BIN", false);
++ var entry =
z.FindEntry("${LOCALSTATEDIR}/db/GeoIP/GeoLite2-Country.mmdb", false);
+ database = new
IP2LocationReader(z.GetInputStream(entry));
+ }
}
- catch (Exception e)
- {
-@@ -84,4 +84,4 @@ namespace OpenRA.Network
- }
- }
- }
--}
-\ No newline at end of file
-+}
Index: patches/patch-launch-dedicated_sh
===================================================================
RCS file: /cvs/ports/games/openra/patches/patch-launch-dedicated_sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-launch-dedicated_sh
--- patches/patch-launch-dedicated_sh 31 Mar 2019 05:09:06 -0000 1.1.1.1
+++ patches/patch-launch-dedicated_sh 9 Jun 2020 04:30:26 -0000
@@ -5,8 +5,8 @@ full path for the assembly
Index: launch-dedicated.sh
--- launch-dedicated.sh.orig
+++ launch-dedicated.sh
-@@ -20,7 +20,7 @@ EnableSingleplayer="${EnableSingleplayer:-"False"}"
- EnableSyncReports="${EnableSyncReports:-"False"}"
+@@ -24,7 +24,7 @@ ShareAnonymizedIPs="${ShareAnonymizedIPs:-"True"}"
+ SupportDir="${SupportDir:-""}"
while true; do
- mono --debug OpenRA.Server.exe Game.Mod="$Mod" \
Index: patches/patch-thirdparty_Eluant_dll_config_in
===================================================================
RCS file:
/cvs/ports/games/openra/patches/patch-thirdparty_Eluant_dll_config_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-thirdparty_Eluant_dll_config_in
--- patches/patch-thirdparty_Eluant_dll_config_in 31 Mar 2019 05:09:06
-0000 1.1.1.1
+++ patches/patch-thirdparty_Eluant_dll_config_in 9 Jun 2020 04:30:26
-0000
@@ -7,6 +7,6 @@ Index: thirdparty/Eluant.dll.config.in
+++ thirdparty/Eluant.dll.config.in
@@ -1,3 +1,4 @@
<configuration>
- <dllmap os="linux" dll="lua51.dll" target="@LIBLUA51@" />
+ <dllmap dll="lua51.dll" target="@LIBLUA51@" />
+ <dllmap os="openbsd" dll="lua51.dll" target="liblua5.1.so" />
</configuration>
Index: patches/patch-thirdparty_download_OpenAL-CS_dll_config
===================================================================
RCS file: patches/patch-thirdparty_download_OpenAL-CS_dll_config
diff -N patches/patch-thirdparty_download_OpenAL-CS_dll_config
--- patches/patch-thirdparty_download_OpenAL-CS_dll_config 28 Apr 2019
03:34:16 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-thirdparty_download_OpenAL-CS_dll_config,v 1.3 2019/04/28
03:34:16 thfr Exp $
-
-add openbsd to dllmap
-
-Index: thirdparty/download/OpenAL-CS.dll.config
---- thirdparty/download/OpenAL-CS.dll.config.orig
-+++ thirdparty/download/OpenAL-CS.dll.config
-@@ -3,4 +3,5 @@
- <dllmap dll="soft_oal.dll" os="windows" target="soft_oal.dll"/>
- <dllmap dll="soft_oal.dll" os="osx"
target="/System/Library/Frameworks/OpenAL.framework/OpenAL"/>
- <dllmap dll="soft_oal.dll" os="linux" target="libopenal.so.1"/>
-+ <dllmap dll="soft_oal.dll" os="openbsd" target="libopenal.so.1"/>
- </configuration>
Index: patches/patch-thirdparty_download_SharpFont_dll_config
===================================================================
RCS file:
/cvs/ports/games/openra/patches/patch-thirdparty_download_SharpFont_dll_config,v
retrieving revision 1.3
diff -u -p -r1.3 patch-thirdparty_download_SharpFont_dll_config
--- patches/patch-thirdparty_download_SharpFont_dll_config 28 Apr 2019
03:34:16 -0000 1.3
+++ patches/patch-thirdparty_download_SharpFont_dll_config 9 Jun 2020
04:30:26 -0000
@@ -5,9 +5,13 @@ add openbsd to dllmap
Index: thirdparty/download/SharpFont.dll.config
--- thirdparty/download/SharpFont.dll.config.orig
+++ thirdparty/download/SharpFont.dll.config
-@@ -3,4 +3,5 @@
- <dllmap dll="freetype6" os="linux" target="libfreetype.so.6" />
+@@ -1,6 +1,7 @@
+ <?xml version="1.0" encoding="utf-8" ?>
+ <configuration>
+- <dllmap dll="freetype6" os="linux" target="libfreetype.so.6" />
++ <dllmap dll="freetype6" os="linux" target="libfreetype.so" />
<dllmap dll="freetype6" os="osx"
target="/Library/Frameworks/Mono.framework/Libraries/libfreetype.6.dylib" />
- <dllmap dll="freetype6" os="freebsd" target="libfreetype.so.6" />
-+ <dllmap dll="freetype6" os="openbsd" target="libfreetype.so.6" />
+- <dllmap dll="freetype6" os="freebsd" target="libfreetype.so.6" />
++ <dllmap dll="freetype6" os="freebsd" target="libfreetype.so" />
++ <dllmap dll="freetype6" os="openbsd" target="libfreetype.so" />
</configuration>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/openra/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 28 Apr 2019 03:34:17 -0000 1.2
+++ pkg/PLIST 9 Jun 2020 04:30:27 -0000
@@ -36,19 +36,18 @@ share/openra/Eluant.dll
share/openra/Eluant.dll.config
share/openra/FuzzyLogicLibrary.dll
share/openra/ICSharpCode.SharpZipLib.dll
-share/openra/MaxMind.Db.dll
share/openra/Open.Nat.dll
share/openra/OpenAL-CS.dll
share/openra/OpenAL-CS.dll.config
share/openra/OpenRA.Game.exe
share/openra/OpenRA.Platforms.Default.dll
+share/openra/OpenRA.Platforms.Default.dll.config
share/openra/OpenRA.Server.exe
share/openra/OpenRA.Utility.exe
share/openra/SDL2-CS.dll
share/openra/SDL2-CS.dll.config
-share/openra/SharpFont.dll
-share/openra/SharpFont.dll.config
share/openra/VERSION
+share/openra/fetch-geoip.sh
share/openra/global mix database.dat
share/openra/glsl/
share/openra/glsl/combined.frag
@@ -387,7 +386,6 @@ share/openra/mods/cnc/bits/nuyell11.aud
share/openra/mods/cnc/bits/nuyell12.aud
share/openra/mods/cnc/bits/nuyell6.aud
share/openra/mods/cnc/bits/nuyell7.aud
-share/openra/mods/cnc/bits/overlay.shp
share/openra/mods/cnc/bits/pdigits.shp
share/openra/mods/cnc/bits/pip-hazmat.shp
share/openra/mods/cnc/bits/pip-heal.shp
@@ -425,6 +423,8 @@ share/openra/mods/cnc/bits/rtib8.tem
share/openra/mods/cnc/bits/rtib9.des
share/openra/mods/cnc/bits/rtib9.tem
share/openra/mods/cnc/bits/sandbag2.aud
+share/openra/mods/cnc/bits/scripts/
+share/openra/mods/cnc/bits/scripts/campaign-global.lua
share/openra/mods/cnc/bits/silo.shp
share/openra/mods/cnc/bits/silomake.shp
share/openra/mods/cnc/bits/snow.mix
@@ -464,8 +464,11 @@ share/openra/mods/cnc/chrome/connection.
share/openra/mods/cnc/chrome/credits.yaml
share/openra/mods/cnc/chrome/dialogs.yaml
share/openra/mods/cnc/chrome/editor.yaml
+share/openra/mods/cnc/chrome/gamesave-browser.yaml
+share/openra/mods/cnc/chrome/gamesave-loading.yaml
share/openra/mods/cnc/chrome/ingame-chat.yaml
share/openra/mods/cnc/chrome/ingame-debug.yaml
+share/openra/mods/cnc/chrome/ingame-debuginfo.yaml
share/openra/mods/cnc/chrome/ingame-info.yaml
share/openra/mods/cnc/chrome/ingame-infobriefing.yaml
share/openra/mods/cnc/chrome/ingame-infochat.yaml
@@ -473,7 +476,6 @@ share/openra/mods/cnc/chrome/ingame-info
share/openra/mods/cnc/chrome/ingame-infoscripterror.yaml
share/openra/mods/cnc/chrome/ingame-infostats.yaml
share/openra/mods/cnc/chrome/ingame-menu.yaml
-share/openra/mods/cnc/chrome/ingame-observerstats.yaml
share/openra/mods/cnc/chrome/ingame.yaml
share/openra/mods/cnc/chrome/lobby-kickdialogs.yaml
share/openra/mods/cnc/chrome/lobby-mappreview.yaml
@@ -482,6 +484,7 @@ share/openra/mods/cnc/chrome/lobby-optio
share/openra/mods/cnc/chrome/lobby-players.yaml
share/openra/mods/cnc/chrome/lobby-servers.yaml
share/openra/mods/cnc/chrome/lobby.yaml
+share/openra/mods/cnc/chrome/mainmenu-prompts.yaml
share/openra/mods/cnc/chrome/mainmenu.yaml
share/openra/mods/cnc/chrome/mapchooser.yaml
share/openra/mods/cnc/chrome/missionbrowser.yaml
@@ -496,6 +499,8 @@ share/openra/mods/cnc/chrome/settings.ya
share/openra/mods/cnc/chrome/tooltips.yaml
share/openra/mods/cnc/cursors.yaml
share/openra/mods/cnc/hotkeys.yaml
+share/openra/mods/cnc/icon-2x.png
+share/openra/mods/cnc/icon-3x.png
share/openra/mods/cnc/icon.png
share/openra/mods/cnc/installer/
share/openra/mods/cnc/installer/covertops.yaml
@@ -631,6 +636,21 @@ share/openra/mods/cnc/maps/gdi07/map.png
share/openra/mods/cnc/maps/gdi07/map.yaml
share/openra/mods/cnc/maps/gdi07/rules.yaml
share/openra/mods/cnc/maps/gdi07/sequences.yaml
+share/openra/mods/cnc/maps/gdi08a/
+share/openra/mods/cnc/maps/gdi08a/gdi08a-AI.lua
+share/openra/mods/cnc/maps/gdi08a/gdi08a.lua
+share/openra/mods/cnc/maps/gdi08a/map.bin
+share/openra/mods/cnc/maps/gdi08a/map.png
+share/openra/mods/cnc/maps/gdi08a/map.yaml
+share/openra/mods/cnc/maps/gdi08a/rules.yaml
+share/openra/mods/cnc/maps/gdi09/
+share/openra/mods/cnc/maps/gdi09/gdi09-AI.lua
+share/openra/mods/cnc/maps/gdi09/gdi09.lua
+share/openra/mods/cnc/maps/gdi09/map.bin
+share/openra/mods/cnc/maps/gdi09/map.png
+share/openra/mods/cnc/maps/gdi09/map.yaml
+share/openra/mods/cnc/maps/gdi09/rules.yaml
+share/openra/mods/cnc/maps/gdi09/weapons.yaml
share/openra/mods/cnc/maps/haos-ridges-cnc.oramap
share/openra/mods/cnc/maps/hattrix.oramap
share/openra/mods/cnc/maps/hegemony-or-survival.oramap
@@ -844,9 +864,9 @@ share/openra/mods/cnc/tilesets/snow.yaml
share/openra/mods/cnc/tilesets/temperat.yaml
share/openra/mods/cnc/tilesets/winter.yaml
share/openra/mods/cnc/uibits/
+share/openra/mods/cnc/uibits/chrome-2x.png
+share/openra/mods/cnc/uibits/chrome-3x.png
share/openra/mods/cnc/uibits/chrome.png
-share/openra/mods/cnc/uibits/reticle.png
-share/openra/mods/cnc/uibits/strategic.png
share/openra/mods/cnc/weapons/
share/openra/mods/cnc/weapons/ballistics.yaml
share/openra/mods/cnc/weapons/explosions.yaml
@@ -858,9 +878,9 @@ share/openra/mods/common/
share/openra/mods/common/FreeSans.ttf
share/openra/mods/common/FreeSansBold.ttf
share/openra/mods/common/OpenRA.Mods.Cnc.dll
-share/openra/mods/common/OpenRA.Mods.Cnc.dll.mdb
+share/openra/mods/common/OpenRA.Mods.Cnc.pdb
share/openra/mods/common/OpenRA.Mods.Common.dll
-share/openra/mods/common/OpenRA.Mods.Common.dll.mdb
+share/openra/mods/common/OpenRA.Mods.Common.pdb
share/openra/mods/common/chrome/
share/openra/mods/common/chrome/assetbrowser.yaml
share/openra/mods/common/chrome/color-picker.yaml
@@ -869,8 +889,11 @@ share/openra/mods/common/chrome/connecti
share/openra/mods/common/chrome/credits.yaml
share/openra/mods/common/chrome/dropdowns.yaml
share/openra/mods/common/chrome/editor.yaml
+share/openra/mods/common/chrome/gamesave-browser.yaml
+share/openra/mods/common/chrome/gamesave-loading.yaml
share/openra/mods/common/chrome/ingame-chat.yaml
share/openra/mods/common/chrome/ingame-debug.yaml
+share/openra/mods/common/chrome/ingame-debuginfo.yaml
share/openra/mods/common/chrome/ingame-fmvplayer.yaml
share/openra/mods/common/chrome/ingame-info.yaml
share/openra/mods/common/chrome/ingame-infobriefing.yaml
@@ -880,7 +903,6 @@ share/openra/mods/common/chrome/ingame-i
share/openra/mods/common/chrome/ingame-infostats.yaml
share/openra/mods/common/chrome/ingame-menu.yaml
share/openra/mods/common/chrome/ingame-observer.yaml
-share/openra/mods/common/chrome/ingame-observerstats.yaml
share/openra/mods/common/chrome/ingame-perf.yaml
share/openra/mods/common/chrome/ingame.yaml
share/openra/mods/common/chrome/lobby-kickdialogs.yaml
@@ -890,6 +912,7 @@ share/openra/mods/common/chrome/lobby-op
share/openra/mods/common/chrome/lobby-players.yaml
share/openra/mods/common/chrome/lobby-servers.yaml
share/openra/mods/common/chrome/lobby.yaml
+share/openra/mods/common/chrome/mainmenu-prompts.yaml
share/openra/mods/common/chrome/mainmenu.yaml
share/openra/mods/common/chrome/map-chooser.yaml
share/openra/mods/common/chrome/missionbrowser.yaml
@@ -913,7 +936,7 @@ share/openra/mods/common/metrics.yaml
share/openra/mods/d2k/
share/openra/mods/d2k/Dune2k.ttf
share/openra/mods/d2k/OpenRA.Mods.D2k.dll
-share/openra/mods/d2k/OpenRA.Mods.D2k.dll.mdb
+share/openra/mods/d2k/OpenRA.Mods.D2k.pdb
share/openra/mods/d2k/audio/
share/openra/mods/d2k/audio/music.yaml
share/openra/mods/d2k/audio/notifications.yaml
@@ -926,6 +949,7 @@ share/openra/mods/d2k/bits/assaultmove.s
share/openra/mods/d2k/bits/attackmove.shp
share/openra/mods/d2k/bits/camera.shp
share/openra/mods/d2k/bits/clock.shp
+share/openra/mods/d2k/bits/concfoot.shp
share/openra/mods/d2k/bits/flagfly.shp
share/openra/mods/d2k/bits/fpls.shp
share/openra/mods/d2k/bits/fullshroud.shp
@@ -1064,6 +1088,7 @@ share/openra/mods/d2k/chrome.yaml
share/openra/mods/d2k/chrome/dropdowns.yaml
share/openra/mods/d2k/chrome/ingame-infostats.yaml
share/openra/mods/d2k/chrome/ingame-menu.yaml
+share/openra/mods/d2k/chrome/ingame-observer.yaml
share/openra/mods/d2k/chrome/ingame-player.yaml
share/openra/mods/d2k/chrome/lobby-players.yaml
share/openra/mods/d2k/chrome/mainmenu.yaml
@@ -1072,6 +1097,8 @@ share/openra/mods/d2k/chrome/multiplayer
share/openra/mods/d2k/chrome/tooltips.yaml
share/openra/mods/d2k/cursors.yaml
share/openra/mods/d2k/hotkeys.yaml
+share/openra/mods/d2k/icon-2x.png
+share/openra/mods/d2k/icon-3x.png
share/openra/mods/d2k/icon.png
share/openra/mods/d2k/installer/
share/openra/mods/d2k/installer/d2k-a.yaml
@@ -1321,6 +1348,13 @@ share/openra/mods/d2k/maps/ordos-05/map.
share/openra/mods/d2k/maps/ordos-05/ordos05-AI.lua
share/openra/mods/d2k/maps/ordos-05/ordos05.lua
share/openra/mods/d2k/maps/ordos-05/rules.yaml
+share/openra/mods/d2k/maps/ordos-06a/
+share/openra/mods/d2k/maps/ordos-06a/map.bin
+share/openra/mods/d2k/maps/ordos-06a/map.png
+share/openra/mods/d2k/maps/ordos-06a/map.yaml
+share/openra/mods/d2k/maps/ordos-06a/ordos06a-AI.lua
+share/openra/mods/d2k/maps/ordos-06a/ordos06a.lua
+share/openra/mods/d2k/maps/ordos-06a/rules.yaml
share/openra/mods/d2k/maps/pasty-mesa/
share/openra/mods/d2k/maps/pasty-mesa/map.bin
share/openra/mods/d2k/maps/pasty-mesa/map.png
@@ -1375,9 +1409,13 @@ share/openra/mods/d2k/sequences/vehicles
share/openra/mods/d2k/tilesets/
share/openra/mods/d2k/tilesets/arrakis.yaml
share/openra/mods/d2k/uibits/
-share/openra/mods/d2k/uibits/buttons.png
share/openra/mods/d2k/uibits/chrome.png
share/openra/mods/d2k/uibits/dialog.png
+share/openra/mods/d2k/uibits/glyphs-2x.png
+share/openra/mods/d2k/uibits/glyphs-3x.png
+share/openra/mods/d2k/uibits/glyphs.png
+share/openra/mods/d2k/uibits/loadscreen-2x.png
+share/openra/mods/d2k/uibits/loadscreen-3x.png
share/openra/mods/d2k/uibits/loadscreen.png
share/openra/mods/d2k/weapons/
share/openra/mods/d2k/weapons/debris.yaml
@@ -1386,11 +1424,12 @@ share/openra/mods/d2k/weapons/missiles.y
share/openra/mods/d2k/weapons/other.yaml
share/openra/mods/d2k/weapons/smallguns.yaml
share/openra/mods/modcontent/
+share/openra/mods/modcontent/chrome-2x.png
+share/openra/mods/modcontent/chrome-3x.png
share/openra/mods/modcontent/chrome.png
share/openra/mods/modcontent/chrome.yaml
share/openra/mods/modcontent/content.yaml
-share/openra/mods/modcontent/cursor.pal
-share/openra/mods/modcontent/cursor.shp
+share/openra/mods/modcontent/cursor.png
share/openra/mods/modcontent/cursors.yaml
share/openra/mods/modcontent/metrics.yaml
share/openra/mods/modcontent/mod.yaml
@@ -1676,6 +1715,8 @@ share/openra/mods/ra/bits/mbTSLA.sno
share/openra/mods/ra/bits/mbTSLA.tem
share/openra/mods/ra/bits/mcvhusk.shp
share/openra/mods/ra/bits/mgg.shp
+share/openra/mods/ra/bits/mh60.shp
+share/openra/mods/ra/bits/mh60icon.shp
share/openra/mods/ra/bits/mine.int
share/openra/mods/ra/bits/missmake.shp
share/openra/mods/ra/bits/mpspawn.shp
@@ -1684,7 +1725,6 @@ share/openra/mods/ra/bits/msloicon2.shp
share/openra/mods/ra/bits/napalm1.shp
share/openra/mods/ra/bits/nopower.shp
share/openra/mods/ra/bits/oilb.shp
-share/openra/mods/ra/bits/overlay.shp
share/openra/mods/ra/bits/parach-shadow.shp
share/openra/mods/ra/bits/pdoficon.shp
share/openra/mods/ra/bits/pip-disguise.shp
@@ -1743,6 +1783,7 @@ share/openra/mods/ra/bits/snowhut.shp
share/openra/mods/ra/bits/stnkicon.shp
share/openra/mods/ra/bits/tanktrap1.shp
share/openra/mods/ra/bits/tanktrap2.shp
+share/openra/mods/ra/bits/tenficon.shp
share/openra/mods/ra/bits/tent.sno
share/openra/mods/ra/bits/tent.tem
share/openra/mods/ra/bits/tentmake.sno
@@ -1766,14 +1807,18 @@ share/openra/mods/ra/bits/xcrateb.shp
share/openra/mods/ra/bits/xcratec.shp
share/openra/mods/ra/bits/xcrated.shp
share/openra/mods/ra/bits/yak.shp
+share/openra/mods/ra/bits/yrotorlg.shp
share/openra/mods/ra/bits/zombicon.shp
share/openra/mods/ra/bits/zombie.shp
share/openra/mods/ra/chrome/
share/openra/mods/ra/chrome.yaml
+share/openra/mods/ra/chrome/gamesave-loading.yaml
share/openra/mods/ra/chrome/ingame-observer.yaml
share/openra/mods/ra/chrome/ingame-player.yaml
share/openra/mods/ra/cursors.yaml
share/openra/mods/ra/hotkeys.yaml
+share/openra/mods/ra/icon-2x.png
+share/openra/mods/ra/icon-3x.png
share/openra/mods/ra/icon.png
share/openra/mods/ra/installer/
share/openra/mods/ra/installer/aftermath.yaml
@@ -1902,6 +1947,7 @@ share/openra/mods/ra/maps/center-of-atte
share/openra/mods/ra/maps/center-of-attention-redux-2/map.yaml
share/openra/mods/ra/maps/center-of-attention-redux-2/rules.yaml
share/openra/mods/ra/maps/chaos-canyon.oramap
+share/openra/mods/ra/maps/climax-rev15.oramap
share/openra/mods/ra/maps/coastal-influence.oramap
share/openra/mods/ra/maps/cold-front.oramap
share/openra/mods/ra/maps/countercross.oramap
@@ -2037,6 +2083,12 @@ share/openra/mods/ra/maps/sarin-gas-1-cr
share/openra/mods/ra/maps/sarin-gas-1-crackdown/map.png
share/openra/mods/ra/maps/sarin-gas-1-crackdown/map.yaml
share/openra/mods/ra/maps/sarin-gas-1-crackdown/rules.yaml
+share/openra/mods/ra/maps/sarin-gas-2-down-under/
+share/openra/mods/ra/maps/sarin-gas-2-down-under/downunder.lua
+share/openra/mods/ra/maps/sarin-gas-2-down-under/map.bin
+share/openra/mods/ra/maps/sarin-gas-2-down-under/map.png
+share/openra/mods/ra/maps/sarin-gas-2-down-under/map.yaml
+share/openra/mods/ra/maps/sarin-gas-2-down-under/rules.yaml
share/openra/mods/ra/maps/shattered-mountain/
share/openra/mods/ra/maps/shattered-mountain/map.bin
share/openra/mods/ra/maps/shattered-mountain/map.png
@@ -2049,16 +2101,16 @@ share/openra/mods/ra/maps/six-below-zero
share/openra/mods/ra/maps/six-below-zero/map.png
share/openra/mods/ra/maps/six-below-zero/map.yaml
share/openra/mods/ra/maps/six-below-zero/rules.yaml
-share/openra/mods/ra/maps/snow town/
-share/openra/mods/ra/maps/snow town/map.bin
-share/openra/mods/ra/maps/snow town/map.png
-share/openra/mods/ra/maps/snow town/map.yaml
-share/openra/mods/ra/maps/snow town/rules.yaml
share/openra/mods/ra/maps/snow-off/
share/openra/mods/ra/maps/snow-off/map.bin
share/openra/mods/ra/maps/snow-off/map.png
share/openra/mods/ra/maps/snow-off/map.yaml
share/openra/mods/ra/maps/snow-off/rules.yaml
+share/openra/mods/ra/maps/snow-town/
+share/openra/mods/ra/maps/snow-town/map.bin
+share/openra/mods/ra/maps/snow-town/map.png
+share/openra/mods/ra/maps/snow-town/map.yaml
+share/openra/mods/ra/maps/snow-town/rules.yaml
share/openra/mods/ra/maps/soviet-01/
share/openra/mods/ra/maps/soviet-01/map.bin
share/openra/mods/ra/maps/soviet-01/map.png
@@ -2167,6 +2219,13 @@ share/openra/mods/ra/maps/tabula-rasa.or
share/openra/mods/ra/maps/tainted-peak.oramap
share/openra/mods/ra/maps/tandem.oramap
share/openra/mods/ra/maps/temperal.oramap
+share/openra/mods/ra/maps/top-o-the-world/
+share/openra/mods/ra/maps/top-o-the-world/map.bin
+share/openra/mods/ra/maps/top-o-the-world/map.png
+share/openra/mods/ra/maps/top-o-the-world/map.yaml
+share/openra/mods/ra/maps/top-o-the-world/rules.yaml
+share/openra/mods/ra/maps/top-o-the-world/scu36ea.lua
+share/openra/mods/ra/maps/top-o-the-world/weapons.yaml
share/openra/mods/ra/maps/tournament-island.oramap
share/openra/mods/ra/maps/unconventional-warfare.oramap
share/openra/mods/ra/maps/union-sacree.oramap
@@ -2213,10 +2272,14 @@ share/openra/mods/ra/tilesets/interior.y
share/openra/mods/ra/tilesets/snow.yaml
share/openra/mods/ra/tilesets/temperat.yaml
share/openra/mods/ra/uibits/
-share/openra/mods/ra/uibits/buttons.png
-share/openra/mods/ra/uibits/chrome.png
share/openra/mods/ra/uibits/dialog.png
+share/openra/mods/ra/uibits/glyphs-2x.png
+share/openra/mods/ra/uibits/glyphs-3x.png
+share/openra/mods/ra/uibits/glyphs.png
+share/openra/mods/ra/uibits/loadscreen-2x.png
+share/openra/mods/ra/uibits/loadscreen-3x.png
share/openra/mods/ra/uibits/loadscreen.png
+share/openra/mods/ra/uibits/sidebar.png
share/openra/mods/ra/weapons/
share/openra/mods/ra/weapons/ballistics.yaml
share/openra/mods/ra/weapons/explosions.yaml
