From 0dea1d14714569ed4eff66831f4f7fca0ecca7c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 8 Oct 2013 23:04:36 +0200 Subject: [PATCH 1/2] renamed and relocated fonts --- mods/cnc/chrome/ingame.yaml | 2 +- mods/cnc/mod.yaml | 4 ++-- Dune2k.ttf => mods/d2k/Dune2k.ttf | Bin mods/d2k/mod.yaml | 2 +- titles.ttf => mods/ra/ZoodRangmah.ttf | Bin mods/ra/mod.yaml | 2 +- packaging/package-all.sh | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename Dune2k.ttf => mods/d2k/Dune2k.ttf (100%) rename titles.ttf => mods/ra/ZoodRangmah.ttf (100%) diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index 1397667cee..ec39311aac 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -3,7 +3,7 @@ Container@INGAME_ROOT: Children: Timer@GAME_TIMER: X: WINDOW_RIGHT/2 - Y: 0-10 + Y: 0 StrategicProgress@STRATEGIC_PROGRESS: X: WINDOW_RIGHT/2 Y: 40 diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index a3976513fa..897e8fdb99 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -139,8 +139,8 @@ Fonts: Font:FreeSansBold.ttf Size:14 Title: - Font:titles.ttf - Size:48 + Font:FreeSansBold.ttf + Size:32 MediumBold: Font:FreeSansBold.ttf Size:18 diff --git a/Dune2k.ttf b/mods/d2k/Dune2k.ttf similarity index 100% rename from Dune2k.ttf rename to mods/d2k/Dune2k.ttf diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 631bdc5162..ce74fa3fe8 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -124,7 +124,7 @@ Fonts: Font:FreeSansBold.ttf Size:14 Title: - Font:Dune2k.ttf + Font:mods/d2k/Dune2k.ttf Size:32 BigBold: Font:FreeSansBold.ttf diff --git a/titles.ttf b/mods/ra/ZoodRangmah.ttf similarity index 100% rename from titles.ttf rename to mods/ra/ZoodRangmah.ttf diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index dfc6dda6e3..0e904c6a39 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -142,7 +142,7 @@ Fonts: Font:FreeSansBold.ttf Size:14 Title: - Font:titles.ttf + Font:mods/ra/ZoodRangmah.ttf Size:48 BigBold: Font:FreeSansBold.ttf diff --git a/packaging/package-all.sh b/packaging/package-all.sh index c4bc9d72bc..87b55facee 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -30,7 +30,7 @@ markdown DOCUMENTATION.md > DOCUMENTATION.html # they are now installed to the game directory instead of placed in the gac FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \ 'OpenRA.FileFormats.dll' 'OpenRA.Renderer.SdlCommon.dll' 'OpenRA.Renderer.Cg.dll' 'OpenRA.Renderer.Gl.dll' 'OpenRA.Renderer.Null.dll' 'OpenRA.Irc.dll' \ -'FreeSans.ttf' 'FreeSansBold.ttf' 'titles.ttf' 'Dune2k.ttf' \ +'FreeSans.ttf' 'FreeSansBold.ttf' \ 'cg' 'glsl' 'mods/ra' 'mods/cnc' 'mods/d2k' \ 'AUTHORS' 'COPYING' 'HACKING' 'INSTALL' 'CHANGELOG' \ 'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' \ From d55ee5e037c399481497b4f7965ba3cfa5dddf49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 12 Oct 2013 10:54:57 +0200 Subject: [PATCH 2/2] remove unused icon --- soviet-logo.png | Bin 4729 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 soviet-logo.png diff --git a/soviet-logo.png b/soviet-logo.png deleted file mode 100644 index 96f770fa73a93151a29489f8a25af4befe7d69e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4729 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 Hu0mjfu*3vS