Merge pull request #17 from ultrastares/alfa

Version 18.11
ultrastares · Nov 22, 2018 · 158fa26 · 158fa26
2 parents 28f2800 + 2497906
commit 158fa26
Show file tree

Hide file tree

Showing 428 changed files with 50,632 additions and 15,212 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,7 +34,7 @@ ppaslink.sh
 /src/**/*.identcache
 /src/config-linux.inc
 /src/paths.inc
-/src/WorldParty-*.lps
+/src/*.lps
 /src/WorldParty.res
 /scr/backup/
 

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -1,5 +1,5 @@
 Ultrastar Deluxe WorldParty
-Copyright (C) 2010-2017 by the following:
+Copyright (C) 2010-2018 by the following:
 
 "Zup3r_vock"
 "Daniel20"

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-18.2
+18.11
diff --git a/configure.ac b/configure.ac
@@ -276,7 +276,10 @@ AC_SUBST_DEFINE(HAVE_SWRESAMPLE, $libswresample_HAVE)
 
 # map avutil library version to ffmpeg version
 AC_MSG_CHECKING([version of ffmpeg])
-if   FFMPEG_LIBS_COMPATIBLE([55078100], [57107100], [57083100], [4008100], [2009100]); then
+# the order is ([avutil], [avcodec], [avformat], [swscale], [swresample])
+if   FFMPEG_LIBS_COMPATIBLE([56014100], [58018100], [58012100], [5001100], [3001100]); then
+    FFMPEG_VERSION="4.0"
+elif FFMPEG_LIBS_COMPATIBLE([55078100], [57107100], [57083100], [4008100], [2009100]); then
     FFMPEG_VERSION="3.4"
 elif FFMPEG_LIBS_COMPATIBLE([55034100], [57064100,57093100], [57056100], [4002100], [2003100]); then
     FFMPEG_VERSION="3.2" # and 3.3

diff --git a/dists/lazarus/ultrastardx-win.lpi b/dists/lazarus/ultrastardx-win.lpi
@@ -526,11 +526,6 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="LazUtils"/>
       </Unit126>
-      <Unit127>
-        <Filename Value="base\uunicodestringhelper.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="UUnicodeStringHelper"/>
-      </Unit127>
       <Unit128>
         <Filename Value="base\UFilesystem.pas"/>
         <IsPartOfProject Value="True"/>

diff --git a/game/fonts/Roboto/Roboto-Black.ttf b/game/fonts/Roboto/Roboto-Black.ttf
diff --git a/game/fonts/Roboto/Roboto-Medium.ttf b/game/fonts/Roboto/Roboto-Medium.ttf
diff --git a/game/fonts/fonts.ini b/game/fonts/fonts.ini
@@ -44,29 +44,25 @@
 
 [Font_Normal]
 File=Roboto/Roboto-Regular.ttf
-;GlyphSpacing=0.2
-Stretch=0.81
+GlyphSpacing=1.1
+Stretch=0.8
 
 [Font_Bold]
 File=Roboto/Roboto-Bold.ttf
 ;Embolden=0.06
 
 [Font_Outline1]
 File=Roboto/Roboto-Bold.ttf
-Outline=0.05
-Stretch=0.86
+Outline=0.06
+Stretch=0.8
 
 [Font_Outline2]
 File=Roboto/Roboto-Bold.ttf
-Outline=0.08
-Stretch=0.89
+Outline=0.09
+Stretch=0.8
 
 [Font_BoldHighRes]
 File=Roboto/Roboto-Bold.ttf
 MaxResolution=256
 PreCache=0
-Outline=0.02
-
-[Fallbacks]
-File1=Roboto/Roboto-Regular.ttf
-;File2=C:/Windows/Fonts/simsun.ttc
+Outline=0.02