Merge pull request #25 from ultrastares/alfa

Version 19.12
ultrastares · Dec 6, 2019 · 5fdf8b5 · 5fdf8b5
2 parents 1d6b03b + 87c9af2
commit 5fdf8b5
Show file tree

Hide file tree

Showing 260 changed files with 13,536 additions and 49,791 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -1,4 +1,4 @@
-Ultrastar Deluxe WorldParty
+UltraStar WorldParty
 Copyright (C) 2010-2019 by the following:
 
 "Zup3r_vock"
@@ -11,7 +11,6 @@ Translations:
 ------------
 Hungarian: Warez^XTS
 Italian:   skream
-Slovenian: donkeyslo
 French:    ctariel
 
 If you have contributed to this project then you deserve to be on this
@@ -22,7 +21,7 @@ list.  Contact us and we'll add you.
  --> Support and contact: https://ultrastar-es.org
 
 ---------------------------------------------------------------------------------
-*Consider that Ultrastar Deluxe Worldparty is a fork of Ultrastar Deluxe.
+*Consider that UltraStar WorldParty is a fork of Ultrastar Deluxe.
 Some modifications could be related to their team which is impossible to merge
 with our project. So, please visit their repo to follow all modifications and
 the people who are involved. https://github.com/UltraStar-Deluxe/USDX/commits/master

diff --git a/README.md b/README.md
@@ -1,22 +1,22 @@
 [![PayPal Donation](https://github.com/Daniel20Ultrastar-es/WorldParty-testing/blob/master/promo/Donate-Paypal.svg)](https://www.paypal.com/cgi-bin/webscr?item_name=Ultrastar+Espa%f1a+&cmd=_donations&currency_code=EUR&business=donaciones%40ultrastar-es.org)
 
-# UltraStar Deluxe WorldParty
+# UltraStar WorldParty
 
 
 ![WorldParty logo](https://github.com/Daniel20Ultrastar-es/usdxworldparty/blob/master/promo/Worldparty%20logo.png)
 
-UltraStar Deluxe WorldParty is a free and open source karaoke game.  It allows
+UltraStar WorldParty is a free and open source karaoke game.  It allows
 up to six players to sing along with music using microphones in order to
 score points, depending on the pitch of the voice and the rhythm of
 singing.
 
-UltraStar Deluxe WorldParty is a fork of the original UltraStar deluxe 1.1
-We added new features such as new selection song, avatars, themes, 
-skins, font, improved camera and mouse support, thousands of new options 
+UltraStar WorldParty is a fork of the original UltraStar Deluxe 1.1
+We added new features such as new selection song, avatars, themes,
+skins, font, improved camera and mouse support, thousands of new options
 come with this new version. Check it out!
 
------------------ 
-Official Website:  https://ultrastar-es.org 
+-----------------
+Official Website:  https://ultrastar-es.org
 -----------------
 
 ## Documentation
@@ -25,7 +25,7 @@ Visit our [Wiki](https://github.com/ultrastares/usdxworldparty/wiki) to get help
 ## Support and contact
 Visit our [official website](https://ultrastar-es.org) where you can find tutorials, songs, contests and more
 
-also visit our [forum](https://ultrastar-es.org/foro) where you can ask any problem or doubt you get (we speak mainly in Spanish and English) 
+also visit our [forum](https://ultrastar-es.org/foro) where you can ask any problem or doubt you get (we speak mainly in Spanish and English)
 
 ## Screenshots
 ![WorldParty logo](https://github.com/Daniel20Ultrastar-es/usdxworldparty/blob/master/promo/promocion1.gif)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-19.2
+19.12
diff --git a/WorldParty.desktop b/WorldParty.desktop
@@ -1,6 +1,6 @@
 #Generate a launcher in desktop
 [Desktop Entry]
-Name=Ultrastar Deluxe WorldParty
+Name=UltraStar WorldParty
 Comment=Karaoke game
 Exec=/usr/local/bin/WorldParty
 Icon=/usr/local/share/WorldParty/resources/icons/WorldParty.png

diff --git a/autogen.sh b/autogen.sh
@@ -5,6 +5,6 @@ set -e
 srcdir=`dirname $0`
 test -n "$srcdir" && cd "$srcdir"
 
-echo "Updating build configuration files for Ultrastar Deluxe WorldParty, please wait..."
+echo "Updating build configuration files for UltraStar WorldParty, please wait..."
 
 autoreconf -isf
diff --git a/dists/atom/README.md b/dists/atom/README.md
@@ -1,4 +1,4 @@
-UltraStar Deluxe WorldParty with Atom (by Github)
+UltraStar WorldParty with Atom (by Github)
 =================================================
 
 To compile USDX WorldParty using Atom editor developed by Github (https://atom.io) you must install in it at least this two packages:

diff --git a/dists/lazarus/ultrastardx-unix.lpi b/dists/lazarus/ultrastardx-unix.lpi
@@ -295,7 +295,7 @@
         <IsPartOfProject Value="True"/>
       </Unit70>
       <Unit71>
-        <Filename Value="screens/UScreenName.pas"/>
+        <Filename Value="screens/UScreenPlayerSelector.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit71>
       <Unit72>

diff --git a/dists/lazarus/ultrastardx-win.lpi b/dists/lazarus/ultrastardx-win.lpi
@@ -269,7 +269,7 @@
         <IsPartOfProject Value="True"/>
       </Unit62>
       <Unit63>
-        <Filename Value="screens\UScreenName.pas"/>
+        <Filename Value="screens\UScreenPlayerSelector.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit63>
       <Unit64>

diff --git a/dists/linux/README.md b/dists/linux/README.md
@@ -1,4 +1,4 @@
-UltraStar Deluxe WorldParty builder for Linux 
+UltraStar WorldParty builder for Linux 
 =============================================
 
 These scripts builds WorldParty and its dependencies. It copies the required dynamic libraries and outputs a distro-independent package that can be extracted and launched. 

diff --git a/dists/linux/WorldParty.desktop b/dists/linux/WorldParty.desktop
@@ -1,6 +1,6 @@
 #Generate a launcher in desktop
 [Desktop Entry]
-Name=Ultrastar Deluxe WorldParty
+Name=UltraStar WorldParty
 Comment=Karaoke game
 Exec=/usr/local/bin/WorldParty
 Icon=/usr/local/share/WorldParty/resources/icons/WorldParty.png

diff --git a/dists/linux/build.sh b/dists/linux/build.sh
@@ -12,7 +12,7 @@ export PATH="$PREFIX/bin:$PATH"
 export LD_LIBRARY_PATH="$PREFIX/lib:$LD_LIBRARY_PATH"
 PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
 
-echo "Building UltraStar Deluxe WorldParty"
+echo "Building UltraStar WorldParty"
 cd "$root/../.."
 bash ./autogen.sh
 ./configure --prefix="$PREFIX" PKG_CONFIG_PATH="$PKG_CONFIG_PATH" # --with-libprojectM

diff --git a/dists/linux/launch.sh b/dists/linux/launch.sh
@@ -14,7 +14,7 @@ LIBPATH=./lib
 LD_LIBRARY_PATH="$LIBPATH:$LD_LIBRARY_PATH" $DEBUGGER $BIN $@
 
 #Generate a launcher in desktop
-cat prueba > "/usr/share/applications/Ultrastar Deluxe WorldParty.Desktop"
+cat prueba > "/usr/share/applications/UltraStar WorldParty.Desktop"
 
 # Get the game's exit code, and return it.
 e=$?

diff --git a/game/README.txt b/game/README.txt
@@ -1,4 +1,4 @@
-Ultrastar Deluxe WorldParty comes under license GPL 3.0
+UltraStar WorldParty comes under license GPL 3.0
 
 
 
@@ -35,6 +35,6 @@ https://ultrastar-es.org
 
 
 
-Have fun, 
+Have fun,
 
-Ultrastar Espa�a Team.
+UltraStar España Team.
diff --git a/game/covers/Common/CommonÀ.jpg b/game/covers/Common/CommonÀ.jpg
diff --git a/game/covers/Common/CommonÁ.jpg b/game/covers/Common/CommonÁ.jpg
diff --git a/game/covers/Common/CommonÃ.jpg b/game/covers/Common/CommonÃ.jpg
diff --git a/game/covers/Common/CommonÄ.jpg b/game/covers/Common/CommonÄ.jpg
diff --git a/game/covers/Common/CommonÈ.jpg b/game/covers/Common/CommonÈ.jpg
diff --git a/game/covers/Common/CommonÉ.jpg b/game/covers/Common/CommonÉ.jpg
diff --git a/game/covers/Common/CommonÌ.jpg b/game/covers/Common/CommonÌ.jpg
diff --git a/game/covers/Common/CommonÍ.jpg b/game/covers/Common/CommonÍ.jpg
diff --git a/game/covers/Common/CommonÒ.jpg b/game/covers/Common/CommonÒ.jpg
diff --git a/game/covers/Common/CommonÓ.jpg b/game/covers/Common/CommonÓ.jpg
diff --git a/game/covers/Common/CommonÖ.jpg b/game/covers/Common/CommonÖ.jpg
diff --git a/game/covers/Common/CommonÙ.jpg b/game/covers/Common/CommonÙ.jpg
diff --git a/game/covers/Common/CommonÚ.jpg b/game/covers/Common/CommonÚ.jpg
diff --git a/game/covers/Common/CommonÜ.jpg b/game/covers/Common/CommonÜ.jpg
diff --git a/game/covers/Covers.ini b/game/covers/Covers.ini
@@ -87,19 +87,6 @@ W=.\Common\CommonW.jpg
 X=.\Common\CommonX.jpg
 Y=.\Common\CommonY.jpg
 Z=.\Common\CommonZ.jpg
-Ä=.\Common\CommonÄ.jpg
-Ö=.\Common\CommonÖ.jpg
-Ü=.\Common\CommonÜ.jpg
-Á=.\Common\CommonÁ.jpg
-É=.\Common\CommonÉ.jpg
-Í=.\Common\CommonÍ.jpg
-Ó=.\Common\CommonÓ.jpg
-Ú=.\Common\CommonÚ.jpg
-À=.\Common\CommonÀ.jpg
-È=.\Common\CommonÈ.jpg
-Ì=.\Common\CommonÌ.jpg
-Ò=.\Common\CommonÒ.jpg
-Ù=.\Common\CommonÙ.jpg
 
 [Title]
 #=.\Common\Common#.jpg
@@ -139,20 +126,6 @@ W=.\Common\CommonW.jpg
 X=.\Common\CommonX.jpg
 Y=.\Common\CommonY.jpg
 Z=.\Common\CommonZ.jpg
-Ä=.\Common\CommonÄ.jpg
-Ö=.\Common\CommonÖ.jpg
-Ü=.\Common\CommonÜ.jpg
-Á=.\Common\CommonÁ.jpg
-É=.\Common\CommonÉ.jpg
-Í=.\Common\CommonÍ.jpg
-Ó=.\Common\CommonÓ.jpg
-Ú=.\Common\CommonÚ.jpg
-À=.\Common\CommonÀ.jpg
-È=.\Common\CommonÈ.jpg
-Ì=.\Common\CommonÌ.jpg
-Ò=.\Common\CommonÒ.jpg
-Ù=.\Common\CommonÙ.jpg
 
 [Year]
 [Decade]
-
diff --git a/game/fonts/NotoSans/LICENSE_OFL.txt b/game/fonts/NotoSans/LICENSE_OFL.txt
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/game/fonts/NotoSans/NotoSans-Regular.ttf b/game/fonts/NotoSans/NotoSans-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansArabic-Regular.ttf b/game/fonts/NotoSans/NotoSansArabic-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansArmenian-Regular.ttf b/game/fonts/NotoSans/NotoSansArmenian-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansBengali-Regular.ttf b/game/fonts/NotoSans/NotoSansBengali-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansCJK-Regular.ttc b/game/fonts/NotoSans/NotoSansCJK-Regular.ttc
diff --git a/game/fonts/NotoSans/NotoSansDevanagari-Regular.ttf b/game/fonts/NotoSans/NotoSansDevanagari-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansGeorgian-Regular.ttf b/game/fonts/NotoSans/NotoSansGeorgian-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansGujarati-Regular.ttf b/game/fonts/NotoSans/NotoSansGujarati-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansGurmukhi-Regular.ttf b/game/fonts/NotoSans/NotoSansGurmukhi-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansHebrew-Regular.ttf b/game/fonts/NotoSans/NotoSansHebrew-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansKannada-Regular.ttf b/game/fonts/NotoSans/NotoSansKannada-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansLao-Regular.ttf b/game/fonts/NotoSans/NotoSansLao-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansMalayalam-Regular.ttf b/game/fonts/NotoSans/NotoSansMalayalam-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansMyanmar-Regular.ttf b/game/fonts/NotoSans/NotoSansMyanmar-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansOriya-Regular.ttf b/game/fonts/NotoSans/NotoSansOriya-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansTamil-Regular.ttf b/game/fonts/NotoSans/NotoSansTamil-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansTelugu-Regular.ttf b/game/fonts/NotoSans/NotoSansTelugu-Regular.ttf
diff --git a/game/fonts/NotoSans/NotoSansThai-Regular.ttf b/game/fonts/NotoSans/NotoSansThai-Regular.ttf
diff --git a/game/fonts/fonts.ini b/game/fonts/fonts.ini
@@ -6,7 +6,7 @@
 ;[Font_XYZ]
 ;# the font file
 ;File=Filename
-; 
+;
 ;# space between glyphs (default: 0.0)
 ;GlyphSpacing=float
 ;
@@ -47,10 +47,6 @@ File=Roboto/Roboto-Regular.ttf
 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.06
@@ -61,8 +57,32 @@ File=Roboto/Roboto-Bold.ttf
 Outline=0.09
 Stretch=0.8
 
+[Font_Bold]
+File=Roboto/Roboto-Bold.ttf
+;Embolden=0.06
+
 [Font_BoldHighRes]
 File=Roboto/Roboto-Bold.ttf
 MaxResolution=256
 PreCache=0
-Outline=0.02
+Outline=0.02
+
+[Fallbacks]
+File=NotoSans/NotoSans-Regular.ttf
+File1=NotoSans/NotoSansArabic-Regular.ttf
+File2=NotoSans/NotoSansArmenian-Regular.ttf
+File3=NotoSans/NotoSansBengali-Regular.ttf
+File4=NotoSans/NotoSansCJK-Regular.ttc
+File5=NotoSans/NotoSansDevanagari-Regular.ttf
+File6=NotoSans/NotoSansGeorgian-Regular.ttf
+File7=NotoSans/NotoSansGujarati-Regular.ttf
+File8=NotoSans/NotoSansGurmukhi-Regular.ttf
+File9=NotoSans/NotoSansHebrew-Regular.ttf
+File10=NotoSans/NotoSansKannada-Regular.ttf
+File11=NotoSans/NotoSansLao-Regular.ttf
+File12=NotoSans/NotoSansMalayalam-Regular.ttf
+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