From b44a6f70bdfc009687116c7d51760d4ad040220b Mon Sep 17 00:00:00 2001 From: tobigun Date: Wed, 27 Aug 2008 20:46:25 +0000 Subject: With the current RC-file approach the fonts and the png-icon must be within the game/resources directory. They will be moved to a better location after the RC-stuff is removed. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1326 b956fd51-792f-4845-bead-9b4dfca2ff2c --- dists/debian/ultrastardx.control | 19 ++++++ dists/ultrastardx.desktop | 17 ++++++ game/fonts/Bold/Font 1024 Bold 16.png | Bin 36542 -> 0 bytes game/fonts/Bold/Font 1024 Bold.dat | Bin 256 -> 0 bytes game/fonts/Bold/eurostar_regular_bold.dat | Bin 256 -> 0 bytes game/fonts/Bold/eurostar_regular_bold.png | Bin 84067 -> 0 bytes game/fonts/Normal/eurostar_regular.dat | Bin 256 -> 0 bytes game/fonts/Normal/eurostar_regular.png | Bin 59609 -> 0 bytes game/fonts/Outline 1/Outline 1.dat | Bin 256 -> 0 bytes game/fonts/Outline 1/Outline 1.png | Bin 74739 -> 0 bytes game/fonts/Outline 2/Outline 2.dat | Bin 256 -> 0 bytes game/fonts/Outline 2/Outline 2.png | Bin 106020 -> 0 bytes game/resources/fonts/Bold/Font 1024 Bold 16.png | Bin 0 -> 36542 bytes game/resources/fonts/Bold/Font 1024 Bold.dat | Bin 0 -> 256 bytes .../resources/fonts/Bold/eurostar_regular_bold.dat | Bin 0 -> 256 bytes .../resources/fonts/Bold/eurostar_regular_bold.png | Bin 0 -> 84067 bytes game/resources/fonts/Normal/eurostar_regular.dat | Bin 0 -> 256 bytes game/resources/fonts/Normal/eurostar_regular.png | Bin 0 -> 59609 bytes game/resources/fonts/Outline 1/Outline 1.dat | Bin 0 -> 256 bytes game/resources/fonts/Outline 1/Outline 1.png | Bin 0 -> 74739 bytes game/resources/fonts/Outline 2/Outline 2.dat | Bin 0 -> 256 bytes game/resources/fonts/Outline 2/Outline 2.png | Bin 0 -> 106020 bytes game/resources/icons/ultrastardx-icon.png | Bin 0 -> 666 bytes icons/ultrastardx-icon.png | Bin 666 -> 0 bytes src/ultrastardx.control | 19 ------ src/ultrastardx.desktop | 17 ------ src/ultrastardx.rc | 66 ++++++++++----------- 27 files changed, 69 insertions(+), 69 deletions(-) create mode 100644 dists/debian/ultrastardx.control create mode 100644 dists/ultrastardx.desktop delete mode 100644 game/fonts/Bold/Font 1024 Bold 16.png delete mode 100644 game/fonts/Bold/Font 1024 Bold.dat delete mode 100644 game/fonts/Bold/eurostar_regular_bold.dat delete mode 100644 game/fonts/Bold/eurostar_regular_bold.png delete mode 100644 game/fonts/Normal/eurostar_regular.dat delete mode 100644 game/fonts/Normal/eurostar_regular.png delete mode 100644 game/fonts/Outline 1/Outline 1.dat delete mode 100644 game/fonts/Outline 1/Outline 1.png delete mode 100644 game/fonts/Outline 2/Outline 2.dat delete mode 100644 game/fonts/Outline 2/Outline 2.png create mode 100644 game/resources/fonts/Bold/Font 1024 Bold 16.png create mode 100644 game/resources/fonts/Bold/Font 1024 Bold.dat create mode 100644 game/resources/fonts/Bold/eurostar_regular_bold.dat create mode 100644 game/resources/fonts/Bold/eurostar_regular_bold.png create mode 100644 game/resources/fonts/Normal/eurostar_regular.dat create mode 100644 game/resources/fonts/Normal/eurostar_regular.png create mode 100644 game/resources/fonts/Outline 1/Outline 1.dat create mode 100644 game/resources/fonts/Outline 1/Outline 1.png create mode 100644 game/resources/fonts/Outline 2/Outline 2.dat create mode 100644 game/resources/fonts/Outline 2/Outline 2.png create mode 100644 game/resources/icons/ultrastardx-icon.png delete mode 100644 icons/ultrastardx-icon.png delete mode 100644 src/ultrastardx.control delete mode 100644 src/ultrastardx.desktop diff --git a/dists/debian/ultrastardx.control b/dists/debian/ultrastardx.control new file mode 100644 index 00000000..a1bb17f0 --- /dev/null +++ b/dists/debian/ultrastardx.control @@ -0,0 +1,19 @@ +Package: ultrastardx +Priority: optional +Section: games +Installed-Size: 18400 +Maintainer: Jay Binks +Architecture: i386 +Version: 1.1.1 +Depends: libc6 (>= 2.1), libsdl1.2debian-alsa, libportaudio2, libavcodec1d, libavformat1d, libsqlite3-0, libsdl-ttf2.0-0, libsdl-image1.2 +Description: + Karaoke Software for PC like Singstar for PS2. + It evaluates your singing by analyzing your voice pitch. + Songs can be created with integrated Editor. + . + This is a Fork of the UltraStar Project with many massive improvements. + . + http://www.ultrastardeluxe.org/ + + + diff --git a/dists/ultrastardx.desktop b/dists/ultrastardx.desktop new file mode 100644 index 00000000..d49f05ef --- /dev/null +++ b/dists/ultrastardx.desktop @@ -0,0 +1,17 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 + +Name=UltraStar Deluxe +Comment=Karaoke program that evaluates your performance +Comment[de]=Singe Karaoke und messe dich mit anderen Spielern + +Icon=ultrastardx + +TryExec=ultrastardx +Exec=ultrastardx +StartupNotify=false +Terminal=false + +Type=Application +Categories=Application;Game;ArcadeGame; diff --git a/game/fonts/Bold/Font 1024 Bold 16.png b/game/fonts/Bold/Font 1024 Bold 16.png deleted file mode 100644 index dc4f28e6..00000000 Binary files a/game/fonts/Bold/Font 1024 Bold 16.png and /dev/null differ diff --git a/game/fonts/Bold/Font 1024 Bold.dat b/game/fonts/Bold/Font 1024 Bold.dat deleted file mode 100644 index ea9f2484..00000000 Binary files a/game/fonts/Bold/Font 1024 Bold.dat and /dev/null differ diff --git a/game/fonts/Bold/eurostar_regular_bold.dat b/game/fonts/Bold/eurostar_regular_bold.dat deleted file mode 100644 index 1b2023e2..00000000 Binary files a/game/fonts/Bold/eurostar_regular_bold.dat and /dev/null differ diff --git a/game/fonts/Bold/eurostar_regular_bold.png b/game/fonts/Bold/eurostar_regular_bold.png deleted file mode 100644 index f2732e44..00000000 Binary files a/game/fonts/Bold/eurostar_regular_bold.png and /dev/null differ diff --git a/game/fonts/Normal/eurostar_regular.dat b/game/fonts/Normal/eurostar_regular.dat deleted file mode 100644 index f44ae7d8..00000000 Binary files a/game/fonts/Normal/eurostar_regular.dat and /dev/null differ diff --git a/game/fonts/Normal/eurostar_regular.png b/game/fonts/Normal/eurostar_regular.png deleted file mode 100644 index 21ef5ac4..00000000 Binary files a/game/fonts/Normal/eurostar_regular.png and /dev/null differ diff --git a/game/fonts/Outline 1/Outline 1.dat b/game/fonts/Outline 1/Outline 1.dat deleted file mode 100644 index ea9f2484..00000000 Binary files a/game/fonts/Outline 1/Outline 1.dat and /dev/null differ diff --git a/game/fonts/Outline 1/Outline 1.png b/game/fonts/Outline 1/Outline 1.png deleted file mode 100644 index a1af3cd2..00000000 Binary files a/game/fonts/Outline 1/Outline 1.png and /dev/null differ diff --git a/game/fonts/Outline 2/Outline 2.dat b/game/fonts/Outline 2/Outline 2.dat deleted file mode 100644 index 062f1629..00000000 Binary files a/game/fonts/Outline 2/Outline 2.dat and /dev/null differ diff --git a/game/fonts/Outline 2/Outline 2.png b/game/fonts/Outline 2/Outline 2.png deleted file mode 100644 index 9677d379..00000000 Binary files a/game/fonts/Outline 2/Outline 2.png and /dev/null differ diff --git a/game/resources/fonts/Bold/Font 1024 Bold 16.png b/game/resources/fonts/Bold/Font 1024 Bold 16.png new file mode 100644 index 00000000..dc4f28e6 Binary files /dev/null and b/game/resources/fonts/Bold/Font 1024 Bold 16.png differ diff --git a/game/resources/fonts/Bold/Font 1024 Bold.dat b/game/resources/fonts/Bold/Font 1024 Bold.dat new file mode 100644 index 00000000..ea9f2484 Binary files /dev/null and b/game/resources/fonts/Bold/Font 1024 Bold.dat differ diff --git a/game/resources/fonts/Bold/eurostar_regular_bold.dat b/game/resources/fonts/Bold/eurostar_regular_bold.dat new file mode 100644 index 00000000..1b2023e2 Binary files /dev/null and b/game/resources/fonts/Bold/eurostar_regular_bold.dat differ diff --git a/game/resources/fonts/Bold/eurostar_regular_bold.png b/game/resources/fonts/Bold/eurostar_regular_bold.png new file mode 100644 index 00000000..f2732e44 Binary files /dev/null and b/game/resources/fonts/Bold/eurostar_regular_bold.png differ diff --git a/game/resources/fonts/Normal/eurostar_regular.dat b/game/resources/fonts/Normal/eurostar_regular.dat new file mode 100644 index 00000000..f44ae7d8 Binary files /dev/null and b/game/resources/fonts/Normal/eurostar_regular.dat differ diff --git a/game/resources/fonts/Normal/eurostar_regular.png b/game/resources/fonts/Normal/eurostar_regular.png new file mode 100644 index 00000000..21ef5ac4 Binary files /dev/null and b/game/resources/fonts/Normal/eurostar_regular.png differ diff --git a/game/resources/fonts/Outline 1/Outline 1.dat b/game/resources/fonts/Outline 1/Outline 1.dat new file mode 100644 index 00000000..ea9f2484 Binary files /dev/null and b/game/resources/fonts/Outline 1/Outline 1.dat differ diff --git a/game/resources/fonts/Outline 1/Outline 1.png b/game/resources/fonts/Outline 1/Outline 1.png new file mode 100644 index 00000000..a1af3cd2 Binary files /dev/null and b/game/resources/fonts/Outline 1/Outline 1.png differ diff --git a/game/resources/fonts/Outline 2/Outline 2.dat b/game/resources/fonts/Outline 2/Outline 2.dat new file mode 100644 index 00000000..062f1629 Binary files /dev/null and b/game/resources/fonts/Outline 2/Outline 2.dat differ diff --git a/game/resources/fonts/Outline 2/Outline 2.png b/game/resources/fonts/Outline 2/Outline 2.png new file mode 100644 index 00000000..9677d379 Binary files /dev/null and b/game/resources/fonts/Outline 2/Outline 2.png differ diff --git a/game/resources/icons/ultrastardx-icon.png b/game/resources/icons/ultrastardx-icon.png new file mode 100644 index 00000000..1b13a6ee Binary files /dev/null and b/game/resources/icons/ultrastardx-icon.png differ diff --git a/icons/ultrastardx-icon.png b/icons/ultrastardx-icon.png deleted file mode 100644 index 1b13a6ee..00000000 Binary files a/icons/ultrastardx-icon.png and /dev/null differ diff --git a/src/ultrastardx.control b/src/ultrastardx.control deleted file mode 100644 index a1bb17f0..00000000 --- a/src/ultrastardx.control +++ /dev/null @@ -1,19 +0,0 @@ -Package: ultrastardx -Priority: optional -Section: games -Installed-Size: 18400 -Maintainer: Jay Binks -Architecture: i386 -Version: 1.1.1 -Depends: libc6 (>= 2.1), libsdl1.2debian-alsa, libportaudio2, libavcodec1d, libavformat1d, libsqlite3-0, libsdl-ttf2.0-0, libsdl-image1.2 -Description: - Karaoke Software for PC like Singstar for PS2. - It evaluates your singing by analyzing your voice pitch. - Songs can be created with integrated Editor. - . - This is a Fork of the UltraStar Project with many massive improvements. - . - http://www.ultrastardeluxe.org/ - - - diff --git a/src/ultrastardx.desktop b/src/ultrastardx.desktop deleted file mode 100644 index d49f05ef..00000000 --- a/src/ultrastardx.desktop +++ /dev/null @@ -1,17 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 - -Name=UltraStar Deluxe -Comment=Karaoke program that evaluates your performance -Comment[de]=Singe Karaoke und messe dich mit anderen Spielern - -Icon=ultrastardx - -TryExec=ultrastardx -Exec=ultrastardx -StartupNotify=false -Terminal=false - -Type=Application -Categories=Application;Game;ArcadeGame; diff --git a/src/ultrastardx.rc b/src/ultrastardx.rc index 07061d4d..a8c1aabd 100644 --- a/src/ultrastardx.rc +++ b/src/ultrastardx.rc @@ -1,38 +1,38 @@ -Font TEX "../Resources/Fonts/Normal/eurostar_regular.png" -Font FNT "../Resources/Fonts/Normal/eurostar_regular.dat" +Font TEX "../game/resources/fonts/Normal/eurostar_regular.png" +Font FNT "../game/resources/fonts/Normal/eurostar_regular.dat" -FontB TEX "../Resources/Fonts/Bold/eurostar_regular_bold.png" -FontB FNT "../Resources/Fonts/Bold/eurostar_regular_bold.dat" +FontB TEX "../game/resources/fonts/Bold/eurostar_regular_bold.png" +FontB FNT "../game/resources/fonts/Bold/eurostar_regular_bold.dat" -FontO TEX "../Resources/Fonts/Outline 1/Outline 1.png" -FontO FNT "../Resources/Fonts/Outline 1/Outline 1.dat" +FontO TEX "../game/resources/fonts/Outline 1/Outline 1.png" +FontO FNT "../game/resources/fonts/Outline 1/Outline 1.dat" -FontO2 TEX "../Resources/Fonts/Outline 2/Outline 2.png" -FontO2 FNT "../Resources/Fonts/Outline 2/Outline 2.dat" +FontO2 TEX "../game/resources/fonts/Outline 2/Outline 2.png" +FontO2 FNT "../game/resources/fonts/Outline 2/Outline 2.dat" -MAINICON ICON "../Resources/Graphics/ustar-icon_v01.ico" -WINDOWICON TEX "../Resources/Graphics/ustar-icon.png" +MAINICON ICON "../icons/ultrastardx.ico" +WINDOWICON TEX "../game/resources/icons/ultrastardx-icon.png" -CRDTS_BG TEX "../Resources/Graphics/credits_v5_bg.png" -CRDTS_OVL TEX "../Resources/Graphics/credits_v5_overlay.png" -CRDTS_blindguard TEX "../Resources/Graphics/names_blindguard.png" -CRDTS_blindy TEX "../Resources/Graphics/names_blindy.png" -CRDTS_canni TEX "../Resources/Graphics/names_canni.png" -CRDTS_commandio TEX "../Resources/Graphics/names_commandio.png" -CRDTS_lazyjoker TEX "../Resources/Graphics/names_lazyjoker.png" -CRDTS_mog TEX "../Resources/Graphics/names_mog.png" -CRDTS_mota TEX "../Resources/Graphics/names_mota.png" -CRDTS_skillmaster TEX "../Resources/Graphics/names_skillmaster.png" -CRDTS_whiteshark TEX "../Resources/Graphics/names_whiteshark.png" -INTRO_L01 TEX "../Resources/Graphics/intro-l-01.png" -INTRO_L02 TEX "../Resources/Graphics/intro-l-02.png" -INTRO_L03 TEX "../Resources/Graphics/intro-l-03.png" -INTRO_L04 TEX "../Resources/Graphics/intro-l-04.png" -INTRO_L05 TEX "../Resources/Graphics/intro-l-05.png" -INTRO_L06 TEX "../Resources/Graphics/intro-l-06.png" -INTRO_L07 TEX "../Resources/Graphics/intro-l-07.png" -INTRO_L08 TEX "../Resources/Graphics/intro-l-08.png" -INTRO_L09 TEX "../Resources/Graphics/intro-l-09.png" -OUTRO_BG TEX "../Resources/Graphics/outro-bg.png" -OUTRO_ESC TEX "../Resources/Graphics/outro-esc.png" -OUTRO_EXD TEX "../Resources/Graphics/outro-exit-dark.png" +CRDTS_BG TEX "../game/resources/credits/credits_v5_bg.png" +CRDTS_OVL TEX "../game/resources/credits/credits_v5_overlay.png" +CRDTS_blindguard TEX "../game/resources/credits/names_blindguard.png" +CRDTS_blindy TEX "../game/resources/credits/names_blindy.png" +CRDTS_canni TEX "../game/resources/credits/names_canni.png" +CRDTS_commandio TEX "../game/resources/credits/names_commandio.png" +CRDTS_lazyjoker TEX "../game/resources/credits/names_lazyjoker.png" +CRDTS_mog TEX "../game/resources/credits/names_mog.png" +CRDTS_mota TEX "../game/resources/credits/names_mota.png" +CRDTS_skillmaster TEX "../game/resources/credits/names_skillmaster.png" +CRDTS_whiteshark TEX "../game/resources/credits/names_whiteshark.png" +INTRO_L01 TEX "../game/resources/credits/intro-l-01.png" +INTRO_L02 TEX "../game/resources/credits/intro-l-02.png" +INTRO_L03 TEX "../game/resources/credits/intro-l-03.png" +INTRO_L04 TEX "../game/resources/credits/intro-l-04.png" +INTRO_L05 TEX "../game/resources/credits/intro-l-05.png" +INTRO_L06 TEX "../game/resources/credits/intro-l-06.png" +INTRO_L07 TEX "../game/resources/credits/intro-l-07.png" +INTRO_L08 TEX "../game/resources/credits/intro-l-08.png" +INTRO_L09 TEX "../game/resources/credits/intro-l-09.png" +OUTRO_BG TEX "../game/resources/credits/outro-bg.png" +OUTRO_ESC TEX "../game/resources/credits/outro-esc.png" +OUTRO_EXD TEX "../game/resources/credits/outro-exit-dark.png" -- cgit v1.2.3