Merge branch 'alfa' into beta

COPYRIGHT.txt

@@ -1,5 +1,5 @@
 UltraStar WorldParty
-Copyright (C) 2010-2019 by the following:
+Copyright (C) 2010-2020 by the following:
 
 "Zup3r_vock"
 "Daniel20"
@@ -16,7 +16,7 @@ French:    ctariel
 If you have contributed to this project then you deserve to be on this
 list.  Contact us and we'll add you.
 
- --> Follow the project at https://github.com/ultrastares/usdxworldparty
+ --> Follow the project at https://github.com/ultrastares/ultrastar-worldparty/
 
  --> Support and contact: https://ultrastar-es.org
 

VERSION

@@ -1 +1 @@
-19.12
+20.12

configure.ac

@@ -74,12 +74,6 @@ AC_DEFUN([AC_SUBST_DEFINE],
 AC_ARG_WITH([cfg-dummy1], [
 External Libraries:])
 
-# add portmixer option
-AC_ARG_WITH([portmixer],
-    [AS_HELP_STRING([--with-portmixer],
-      [enable portmixer audio-mixer support @<:@default=check@:>@])],
-    [with_portmixer=$withval], [with_portmixer="check"])
-
 # add projectM option
 AC_ARG_WITH([libprojectM], 
     [AS_HELP_STRING([--with-libprojectM],
@@ -364,15 +358,6 @@ else
 fi
 AC_SUBST(USE_PROJECTM_CWRAPPER, $libprojectM_USE_CWRAPPER)
 
-# find portaudio
-PKG_HAVE([portaudio], [portaudio-2.0], yes)
-PKG_VERSION([portaudio], [portaudio-2.0])
-AC_SUBST_DEFINE(HAVE_PORTAUDIO, $portaudio_HAVE)
-
-# find portmixer
-PKG_HAVE([portmixer], [portmixer], no)
-AC_SUBST_DEFINE(HAVE_PORTMIXER, $portmixer_HAVE)
-
 # determine linker-flags
 if test x$FPC_PLATFORM = xdarwin; then
   LDFLAGS="-macosx_version_min 10.4 -undefined dynamic_lookup -headerpad_max_install_names -L/usr/X11/lib"
@@ -421,5 +406,3 @@ if test x$FPC_PLATFORM = xdarwin; then
 !!! Selected packaging: $USE_OSX_PACKAGING with libdir $USE_OSX_PACKAGING_LIBDIR
                    ])
 fi
-
-

dists/atom/linux/compile.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 cd "$1/src"
+if [ $2 == "compile-so" ]
+then
+    echo "Not implemented"
+    exit
+fi
 if [ $2 != "execute" ]
 then
     processor=$(uname -m)
@@ -9,7 +14,7 @@ then
     mkdir -p $target
     if [ $2 == "compile-debug" ] || [ $2 == "compile-debug-execute" ]
     then
-        fpc WorldParty.dpr -FE../game -FU$target -g -gh -gl -dDEBUG_MODE -Si -Sg -Sc -v0Binwe
+        fpc WorldParty.dpr -FE../game -FU$target -g -gl -dDEBUG_MODE -Si -Sg -Sc -v0Binwe
     else
         fpc WorldParty.dpr -FE../game -FU$target -O4 -Xs
     fi
@@ -18,12 +23,7 @@ then
         mv $target/link.res ../res/
     fi
 fi
-if [ -f ../game/WorldParty ] && [ $2 != "compile-debug" ] && [ $2 != "compile" ]
+if [ -f ../game/WorldParty ]
 then
-    if [ $2 == "compile-debug-execute" ]
-    then
-        ../game/WorldParty -Benchmark -Debug
-    else
-        ../game/WorldParty -Benchmark
-    fi
+    ../game/WorldParty -Benchmark if [ $2 == "compile-debug-execute" ] then -Debug fi
 fi

dists/atom/windows/compile.bat

@@ -13,7 +13,7 @@ if not %2==execute (
         fpc WorldParty.dpr -FE..\game -FU..\build -O4 -Xs
     )
     if not %2==compile if not %2==compile-execute (
-        fpc WorldParty.dpr -FE..\game -FU..\build -g -gl -gh -dDEBUG_MODE
+        fpc WorldParty.dpr -FE..\game -FU..\build -g -gl -dDEBUG_MODE
     )
     if exist ..\build\link.res (
         move /Y ..\build\link.res ..\res\link.res

dists/linux/build-deps.sh

@@ -64,13 +64,6 @@ make $makearg
 make install
 make distclean
 
-echo "Building PortAudio"
-cd "$SRC/portaudio"
-./configure --prefix="$PREFIX" PKG_CONFIG_PATH="$PKG_CONFIG_PATH" --disable-static
-make $makearg
-make install
-make distclean
-
 echo "Building Yasm"
 cd "$SRC/yasm"
 ./configure --prefix="$PREFIX" PKG_CONFIG_PATH="$PKG_CONFIG_PATH" --disable-static

dists/linux/dl.sh

@@ -8,7 +8,6 @@ deps+=('SDL2_image,https://www.libsdl.org/projects/SDL_image/release/SDL2_image-
 deps+=('sqlite,https://sqlite.org/2017/sqlite-autoconf-3170000.tar.gz')
 deps+=('yasm,http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz')
 deps+=('ffmpeg,https://ffmpeg.org/releases/ffmpeg-3.2.2.tar.gz')
-deps+=('portaudio,http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz')
 deps+=('freetype,http://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.gz')
 deps+=('libpng,https://sourceforge.net/projects/libpng/files/libpng16/older-releases/1.6.28/libpng-1.6.28.tar.gz/download')
 

dists/vscode/tasks.json

@@ -2,14 +2,17 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Compile",
+            "label": "Compile DLL",
             "type": "shell",
             "windows": {
                 "command": "dists/atom/windows/compile.bat . compile-dll"
             },
+            "linux": {
+                "command": "dists/atom/linux/compile.sh . compile-so"
+            },
             "presentation": {
                 "reveal": "always",
-                "panel": "new"
+                "panel": "shared"
             },
             "problemMatcher": {
                 "owner": "external",
@@ -37,7 +40,7 @@
             },
             "presentation": {
                 "reveal": "always",
-                "panel": "new"
+                "panel": "shared"
             },
             "problemMatcher": {
                 "owner": "external",
@@ -65,7 +68,7 @@
             },
             "presentation": {
                 "reveal": "always",
-                "panel": "new"
+                "panel": "shared"
             },
             "problemMatcher": {
                 "owner": "external",
@@ -93,7 +96,7 @@
             },
             "presentation": {
                 "reveal": "always",
-                "panel": "new"
+                "panel": "shared"
             },
             "problemMatcher": {
                 "owner": "external",
@@ -121,7 +124,7 @@
             },
             "presentation": {
                 "reveal": "always",
-                "panel": "new"
+                "panel": "shared"
             },
             "problemMatcher": {
                 "owner": "external",
@@ -149,7 +152,7 @@
             },
             "presentation": {
                 "reveal": "always",
-                "panel": "new"
+                "panel": "shared"
             },
             "problemMatcher": {
                 "owner": "external",
@@ -167,4 +170,4 @@
             }
         }
     ]
-}
+}

game/README.txt

@@ -6,11 +6,11 @@ Due to huge amount of changes, we focus all documentation at our repository.
 
 
 
-----------------------------------------------
+---------------------------------------------------
 
-https://github.com/ultrastares/usdxworldparty
+https://github.com/ultrastares/ultrastar-worldparty
 
-----------------------------------------------
+---------------------------------------------------
 
 
 

game/fonts/fonts.ini

@@ -46,26 +46,31 @@
 File=Roboto/Roboto-Regular.ttf
 GlyphSpacing=1.1
 Stretch=0.8
+LineSpacing=0.85
 
 [Font_Outline1]
 File=Roboto/Roboto-Bold.ttf
 Outline=0.06
 Stretch=0.8
+LineSpacing=0.85
 
 [Font_Outline2]
 File=Roboto/Roboto-Bold.ttf
 Outline=0.09
 Stretch=0.8
+LineSpacing=0.85
 
 [Font_Bold]
 File=Roboto/Roboto-Bold.ttf
 ;Embolden=0.06
+LineSpacing=0.85
 
 [Font_BoldHighRes]
 File=Roboto/Roboto-Bold.ttf
 MaxResolution=256
 PreCache=0
 Outline=0.02
+LineSpacing=0.85
 
 [Fallbacks]
 File=NotoSans/NotoSans-Regular.ttf
@@ -85,4 +90,4 @@ File13=NotoSans/NotoSansMyanmar-Regular.ttf
 File14=NotoSans/NotoSansOriya-Regular.ttf
 File15=NotoSans/NotoSansTamil-Regular.ttf
 File16=NotoSans/NotoSansTelugu-Regular.ttf
-File17=NotoSans/NotoSansThai-Regular.ttf
+File17=NotoSans/NotoSansThai-Regular.ttf