diff --git a/.circleci/config.yml b/.circleci/config.yml index 03540b8bf..9a0351b91 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: - checkout - run: echo deb http://deb.debian.org/debian stretch-backports-sloppy main >> /etc/apt/sources.list.d/debian-backports.list - run: apt update -y - - run: apt install -y g++ libsdl2-dev libsdl2-ttf-dev git rpm wget + - run: apt install -y g++ libsdl2-dev libsdl2-ttf-dev git rpm wget smpq - run: apt install -y -t 'stretch-backports*' cmake libsodium-dev libpng-dev - run: cmake -S. -Bbuild .. -DNIGHTLY_BUILD=ON -DCMAKE_INSTALL_PREFIX=/usr - run: cmake --build build -j 2 --target package @@ -47,7 +47,7 @@ jobs: steps: - checkout - run: sudo apt update -y - - run: sudo apt install -y g++ cmake ninja-build + - run: sudo apt install -y g++ cmake ninja-build smpq - run: cd android-project && ./gradlew assembleDebug - store_artifacts: {path: ./android-project/app/build/outputs/apk/debug/app-debug.apk, destination: devilutionx-debug.apk} 3ds: @@ -57,7 +57,7 @@ jobs: steps: - checkout - run: apt-get update -y - - run: apt-get install -y ffmpeg gettext + - run: apt-get install -y ffmpeg gettext smpq - run: wget https://github.com/Steveice10/bannertool/releases/download/1.2.0/bannertool.zip - run: unzip -j "bannertool.zip" "linux-x86_64/bannertool" -d "/opt/devkitpro/tools/bin" - run: wget https://github.com/jakcron/Project_CTR/releases/download/v0.16/makerom_016_ctrtool.zip diff --git a/.github/workflows/Linux_x86.yml b/.github/workflows/Linux_x86.yml index 86349f6e7..07b920fac 100644 --- a/.github/workflows/Linux_x86.yml +++ b/.github/workflows/Linux_x86.yml @@ -20,7 +20,7 @@ jobs: run: > sudo dpkg --add-architecture i386 && sudo apt update -y && - sudo apt install -y cmake file g++-multilib git libfmt-dev:i386 libsdl2-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev:i386 libpng-dev:i386 rpm wget + sudo apt install -y cmake file g++-multilib git libfmt-dev:i386 libsdl2-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev:i386 libpng-dev:i386 rpm wget smpq - name: Cache CMake build folder uses: actions/cache@v2 diff --git a/.github/workflows/Linux_x86_64_SDL1.yml b/.github/workflows/Linux_x86_64_SDL1.yml index 6f1cc5d48..6b389aa11 100644 --- a/.github/workflows/Linux_x86_64_SDL1.yml +++ b/.github/workflows/Linux_x86_64_SDL1.yml @@ -19,7 +19,7 @@ jobs: - name: Create Build Environment run: > sudo apt update && - sudo apt install -y cmake file g++ git libfmt-dev libsdl-dev libsdl-ttf2.0-dev libsodium-dev libpng-dev rpm + sudo apt install -y cmake file g++ git libfmt-dev libsdl-dev libsdl-ttf2.0-dev libsodium-dev libpng-dev rpm smpq - name: Cache CMake build folder uses: actions/cache@v2 diff --git a/.github/workflows/Windows_x64.yml b/.github/workflows/Windows_x64.yml index ee886767c..750af76fc 100644 --- a/.github/workflows/Windows_x64.yml +++ b/.github/workflows/Windows_x64.yml @@ -19,7 +19,7 @@ jobs: - name: Create Build Environment run: > sudo apt update && - sudo apt install -y cmake gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 pkg-config-mingw-w64-x86-64 wget git sudo && + sudo apt install -y cmake gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 pkg-config-mingw-w64-x86-64 wget git sudo smpq && sudo Packaging/windows/mingw-prep64.sh - name: Cache CMake build folder diff --git a/.github/workflows/Windows_x86.yml b/.github/workflows/Windows_x86.yml index aa353afec..618cfc8ce 100644 --- a/.github/workflows/Windows_x86.yml +++ b/.github/workflows/Windows_x86.yml @@ -19,7 +19,7 @@ jobs: - name: Create Build Environment run: > sudo apt update && - sudo apt install -y cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 pkg-config-mingw-w64-i686 wget git sudo && + sudo apt install -y cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 pkg-config-mingw-w64-i686 wget git sudo smpq && sudo Packaging/windows/mingw-prep.sh - name: Cache CMake build folder diff --git a/CMakeLists.txt b/CMakeLists.txt index 55e64b934..3d0474a06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -600,10 +600,6 @@ else() endif() target_link_libraries(${BIN_TARGET} PRIVATE libdevilutionx) -# Copy the font and devilutionx.mpq to the build directory to it works from the build directory -file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") -file(COPY "Packaging/resources/devilutionx.mpq" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") - # Use file GENERATE instead of configure_file because configure_file # does not support generator expressions. get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) @@ -675,6 +671,102 @@ if (Gettext_FOUND) endif() endif() +set(devilutionx_assets + data/boxleftend.pcx + data/boxmiddle.pcx + data/boxrightend.pcx + data/charbg.pcx + data/dirtybuc.pcx + data/dirtybucp.pcx + data/healthbox.pcx + data/health.pcx + data/panel8buc.pcx + data/panel8bucp.pcx + data/resistance.pcx + data/talkbutton.pcx + data/xpbar.pcx + fonts/12-00.bin + fonts/12-00.pcx + fonts/12-01.bin + fonts/12-01.pcx + fonts/12-02.bin + fonts/12-02.pcx + fonts/12-03.bin + fonts/12-03.pcx + fonts/12-04.bin + fonts/12-04.pcx + fonts/24-00.bin + fonts/24-00.pcx + fonts/24-01.bin + fonts/24-01.pcx + fonts/24-02.bin + fonts/24-02.pcx + fonts/24-03.bin + fonts/24-03.pcx + fonts/24-04.bin + fonts/24-04.pcx + fonts/30-00.bin + fonts/30-00.pcx + fonts/30-01.bin + fonts/30-01.pcx + fonts/30-02.bin + fonts/30-02.pcx + fonts/30-03.bin + fonts/30-03.pcx + fonts/30-04.bin + fonts/30-04.pcx + fonts/42-00.bin + fonts/42-00.pcx + fonts/42-01.bin + fonts/42-01.pcx + fonts/42-02.bin + fonts/42-02.pcx + fonts/42-03.bin + fonts/42-03.pcx + fonts/42-04.bin + fonts/42-04.pcx + fonts/46-00.bin + fonts/46-00.pcx + fonts/46-01.bin + fonts/46-01.pcx + fonts/46-02.bin + fonts/46-02.pcx + fonts/46-03.bin + fonts/46-03.pcx + fonts/46-04.bin + fonts/46-04.pcx + fonts/black.trn + fonts/blue.trn + fonts/buttonface.trn + fonts/buttonpushed.trn + fonts/golduis.trn + fonts/goldui.trn + fonts/grayuis.trn + fonts/grayui.trn + fonts/red.trn + fonts/whitegold.trn + fonts/white.trn + gendata/cutportlw.pcx + gendata/cutportrw.pcx + gendata/cutstartw.pcx + ui_art/creditsw.pcx + ui_art/hf_titlew.pcx + ui_art/mainmenuw.pcx + ui_art/supportw.pcx) + +find_program(SMPQ smpq) +if(SMPQ) + file(REMOVE "Packaging/resources/devilutionx.mpq") + execute_process( + WORKING_DIRECTORY "${DevilutionX_SOURCE_DIR}/Packaging/resources/assets" + COMMAND ${SMPQ} -M 1 -C PKWARE -c "../devilutionx.mpq" ${devilutionx_assets}) + # Copy devilutionx.mpq to the build directory so the game can run from the build directory + file(COPY "Packaging/resources/devilutionx.mpq" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") +endif() + +# Copy CharisSILB.ttf to the build directory so the game can run from the build directory +file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") + target_include_directories(libdevilutionx PUBLIC Source ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/Packaging/resources/assets/data/boxleftend.pcx b/Packaging/resources/assets/data/boxleftend.pcx new file mode 100644 index 000000000..0e45fbdb2 Binary files /dev/null and b/Packaging/resources/assets/data/boxleftend.pcx differ diff --git a/Packaging/resources/assets/data/boxmiddle.pcx b/Packaging/resources/assets/data/boxmiddle.pcx new file mode 100644 index 000000000..274a781e9 Binary files /dev/null and b/Packaging/resources/assets/data/boxmiddle.pcx differ diff --git a/Packaging/resources/assets/data/boxrightend.pcx b/Packaging/resources/assets/data/boxrightend.pcx new file mode 100644 index 000000000..dda897390 Binary files /dev/null and b/Packaging/resources/assets/data/boxrightend.pcx differ diff --git a/Packaging/resources/assets/data/charbg.pcx b/Packaging/resources/assets/data/charbg.pcx new file mode 100644 index 000000000..aa4be8eca Binary files /dev/null and b/Packaging/resources/assets/data/charbg.pcx differ diff --git a/Packaging/resources/assets/data/dirtybuc.pcx b/Packaging/resources/assets/data/dirtybuc.pcx new file mode 100644 index 000000000..3b61d560a Binary files /dev/null and b/Packaging/resources/assets/data/dirtybuc.pcx differ diff --git a/Packaging/resources/assets/data/dirtybucp.pcx b/Packaging/resources/assets/data/dirtybucp.pcx new file mode 100644 index 000000000..a67529fd1 Binary files /dev/null and b/Packaging/resources/assets/data/dirtybucp.pcx differ diff --git a/Packaging/resources/assets/data/health.pcx b/Packaging/resources/assets/data/health.pcx new file mode 100644 index 000000000..196e20c03 Binary files /dev/null and b/Packaging/resources/assets/data/health.pcx differ diff --git a/Packaging/resources/assets/data/healthbox.pcx b/Packaging/resources/assets/data/healthbox.pcx new file mode 100644 index 000000000..233e3cbd5 Binary files /dev/null and b/Packaging/resources/assets/data/healthbox.pcx differ diff --git a/Packaging/resources/assets/data/panel8buc.pcx b/Packaging/resources/assets/data/panel8buc.pcx new file mode 100644 index 000000000..a0fd004e5 Binary files /dev/null and b/Packaging/resources/assets/data/panel8buc.pcx differ diff --git a/Packaging/resources/assets/data/panel8bucp.pcx b/Packaging/resources/assets/data/panel8bucp.pcx new file mode 100644 index 000000000..dccff98d6 Binary files /dev/null and b/Packaging/resources/assets/data/panel8bucp.pcx differ diff --git a/Packaging/resources/assets/data/resistance.pcx b/Packaging/resources/assets/data/resistance.pcx new file mode 100644 index 000000000..c6b2e3bb1 Binary files /dev/null and b/Packaging/resources/assets/data/resistance.pcx differ diff --git a/Packaging/resources/assets/data/talkbutton.pcx b/Packaging/resources/assets/data/talkbutton.pcx new file mode 100644 index 000000000..a611f69c6 Binary files /dev/null and b/Packaging/resources/assets/data/talkbutton.pcx differ diff --git a/Packaging/resources/assets/data/xpbar.pcx b/Packaging/resources/assets/data/xpbar.pcx new file mode 100644 index 000000000..085fc8f43 Binary files /dev/null and b/Packaging/resources/assets/data/xpbar.pcx differ diff --git a/Packaging/resources/assets/fonts/12-00.bin b/Packaging/resources/assets/fonts/12-00.bin new file mode 100644 index 000000000..b695e311c Binary files /dev/null and b/Packaging/resources/assets/fonts/12-00.bin differ diff --git a/Packaging/resources/assets/fonts/12-00.pcx b/Packaging/resources/assets/fonts/12-00.pcx new file mode 100644 index 000000000..fcf20bda5 Binary files /dev/null and b/Packaging/resources/assets/fonts/12-00.pcx differ diff --git a/Packaging/resources/assets/fonts/12-01.bin b/Packaging/resources/assets/fonts/12-01.bin new file mode 100644 index 000000000..584ba42ea --- /dev/null +++ b/Packaging/resources/assets/fonts/12-01.bin @@ -0,0 +1,38 @@ +           +    + + +     + + + + + + + + + +     + +  + + + + +   + + + + +  +  +  + + + +   + +  +    + + \ No newline at end of file diff --git a/Packaging/resources/assets/fonts/12-01.pcx b/Packaging/resources/assets/fonts/12-01.pcx new file mode 100644 index 000000000..73256f1b5 Binary files /dev/null and b/Packaging/resources/assets/fonts/12-01.pcx differ diff --git a/Packaging/resources/assets/fonts/12-02.bin b/Packaging/resources/assets/fonts/12-02.bin new file mode 100644 index 000000000..6c19587a8 Binary files /dev/null and b/Packaging/resources/assets/fonts/12-02.bin differ diff --git a/Packaging/resources/assets/fonts/12-02.pcx b/Packaging/resources/assets/fonts/12-02.pcx new file mode 100644 index 000000000..254c0f397 Binary files /dev/null and b/Packaging/resources/assets/fonts/12-02.pcx differ diff --git a/Packaging/resources/assets/fonts/12-03.bin b/Packaging/resources/assets/fonts/12-03.bin new file mode 100644 index 000000000..e287f6838 Binary files /dev/null and b/Packaging/resources/assets/fonts/12-03.bin differ diff --git a/Packaging/resources/assets/fonts/12-03.pcx b/Packaging/resources/assets/fonts/12-03.pcx new file mode 100644 index 000000000..5a8312298 Binary files /dev/null and b/Packaging/resources/assets/fonts/12-03.pcx differ diff --git a/Packaging/resources/assets/fonts/12-04.bin b/Packaging/resources/assets/fonts/12-04.bin new file mode 100644 index 000000000..e5db1b6fc --- /dev/null +++ b/Packaging/resources/assets/fonts/12-04.bin @@ -0,0 +1,38 @@ +    +  +  +   + + + +  +    +     +  +   + + +    +   + + +  + +  + + +  + +  +  +     + + + + + +  + + +  + \ No newline at end of file diff --git a/Packaging/resources/assets/fonts/12-04.pcx b/Packaging/resources/assets/fonts/12-04.pcx new file mode 100644 index 000000000..f4ce5e8f6 Binary files /dev/null and b/Packaging/resources/assets/fonts/12-04.pcx differ diff --git a/Packaging/resources/assets/fonts/24-00.bin b/Packaging/resources/assets/fonts/24-00.bin new file mode 100644 index 000000000..08f95ce7d Binary files /dev/null and b/Packaging/resources/assets/fonts/24-00.bin differ diff --git a/Packaging/resources/assets/fonts/24-00.pcx b/Packaging/resources/assets/fonts/24-00.pcx new file mode 100644 index 000000000..503606d35 Binary files /dev/null and b/Packaging/resources/assets/fonts/24-00.pcx differ diff --git a/Packaging/resources/assets/fonts/24-01.bin b/Packaging/resources/assets/fonts/24-01.bin new file mode 100644 index 000000000..c85564c8b --- /dev/null +++ b/Packaging/resources/assets/fonts/24-01.bin @@ -0,0 +1,12 @@ +     + + +      + + + + +             +       +  +        \ No newline at end of file diff --git a/Packaging/resources/assets/fonts/24-01.pcx b/Packaging/resources/assets/fonts/24-01.pcx new file mode 100644 index 000000000..e194bf957 Binary files /dev/null and b/Packaging/resources/assets/fonts/24-01.pcx differ diff --git a/Packaging/resources/assets/fonts/24-02.bin b/Packaging/resources/assets/fonts/24-02.bin new file mode 100644 index 000000000..8cb1a333c Binary files /dev/null and b/Packaging/resources/assets/fonts/24-02.bin differ diff --git a/Packaging/resources/assets/fonts/24-02.pcx b/Packaging/resources/assets/fonts/24-02.pcx new file mode 100644 index 000000000..a841d15cc Binary files /dev/null and b/Packaging/resources/assets/fonts/24-02.pcx differ diff --git a/Packaging/resources/assets/fonts/24-03.bin b/Packaging/resources/assets/fonts/24-03.bin new file mode 100644 index 000000000..33fbf829a Binary files /dev/null and b/Packaging/resources/assets/fonts/24-03.bin differ diff --git a/Packaging/resources/assets/fonts/24-03.pcx b/Packaging/resources/assets/fonts/24-03.pcx new file mode 100644 index 000000000..10c29a7ae Binary files /dev/null and b/Packaging/resources/assets/fonts/24-03.pcx differ diff --git a/Packaging/resources/assets/fonts/24-04.bin b/Packaging/resources/assets/fonts/24-04.bin new file mode 100644 index 000000000..8a17a69ae --- /dev/null +++ b/Packaging/resources/assets/fonts/24-04.bin @@ -0,0 +1,17 @@ +               +  +     +  +    + +  + + +  + +        +     + +     + + \ No newline at end of file diff --git a/Packaging/resources/assets/fonts/24-04.pcx b/Packaging/resources/assets/fonts/24-04.pcx new file mode 100644 index 000000000..f55d40d77 Binary files /dev/null and b/Packaging/resources/assets/fonts/24-04.pcx differ diff --git a/Packaging/resources/assets/fonts/30-00.bin b/Packaging/resources/assets/fonts/30-00.bin new file mode 100644 index 000000000..24bdc42ad Binary files /dev/null and b/Packaging/resources/assets/fonts/30-00.bin differ diff --git a/Packaging/resources/assets/fonts/30-00.pcx b/Packaging/resources/assets/fonts/30-00.pcx new file mode 100644 index 000000000..5e7652654 Binary files /dev/null and b/Packaging/resources/assets/fonts/30-00.pcx differ diff --git a/Packaging/resources/assets/fonts/30-01.bin b/Packaging/resources/assets/fonts/30-01.bin new file mode 100644 index 000000000..1ad6ecc49 --- /dev/null +++ b/Packaging/resources/assets/fonts/30-01.bin @@ -0,0 +1,4 @@ +                    + +   +  \ No newline at end of file diff --git a/Packaging/resources/assets/fonts/30-01.pcx b/Packaging/resources/assets/fonts/30-01.pcx new file mode 100644 index 000000000..8d45c53d9 Binary files /dev/null and b/Packaging/resources/assets/fonts/30-01.pcx differ diff --git a/Packaging/resources/assets/fonts/30-02.bin b/Packaging/resources/assets/fonts/30-02.bin new file mode 100644 index 000000000..ce1e92d8e Binary files /dev/null and b/Packaging/resources/assets/fonts/30-02.bin differ diff --git a/Packaging/resources/assets/fonts/30-02.pcx b/Packaging/resources/assets/fonts/30-02.pcx new file mode 100644 index 000000000..4579f7cdc Binary files /dev/null and b/Packaging/resources/assets/fonts/30-02.pcx differ diff --git a/Packaging/resources/assets/fonts/30-03.bin b/Packaging/resources/assets/fonts/30-03.bin new file mode 100644 index 000000000..682d70a93 Binary files /dev/null and b/Packaging/resources/assets/fonts/30-03.bin differ diff --git a/Packaging/resources/assets/fonts/30-03.pcx b/Packaging/resources/assets/fonts/30-03.pcx new file mode 100644 index 000000000..0338685b3 Binary files /dev/null and b/Packaging/resources/assets/fonts/30-03.pcx differ diff --git a/Packaging/resources/assets/fonts/30-04.bin b/Packaging/resources/assets/fonts/30-04.bin new file mode 100644 index 000000000..3c0749c55 --- /dev/null +++ b/Packaging/resources/assets/fonts/30-04.bin @@ -0,0 +1 @@ +                      !                   \ No newline at end of file diff --git a/Packaging/resources/assets/fonts/30-04.pcx b/Packaging/resources/assets/fonts/30-04.pcx new file mode 100644 index 000000000..756977d47 Binary files /dev/null and b/Packaging/resources/assets/fonts/30-04.pcx differ diff --git a/Packaging/resources/assets/fonts/42-00.bin b/Packaging/resources/assets/fonts/42-00.bin new file mode 100644 index 000000000..d1fec6c76 Binary files /dev/null and b/Packaging/resources/assets/fonts/42-00.bin differ diff --git a/Packaging/resources/assets/fonts/42-00.pcx b/Packaging/resources/assets/fonts/42-00.pcx new file mode 100644 index 000000000..a50340996 Binary files /dev/null and b/Packaging/resources/assets/fonts/42-00.pcx differ diff --git a/Packaging/resources/assets/fonts/42-01.bin b/Packaging/resources/assets/fonts/42-01.bin new file mode 100644 index 000000000..d1ff37973 --- /dev/null +++ b/Packaging/resources/assets/fonts/42-01.bin @@ -0,0 +1,7 @@ + + + +  +% )" !  !#)'"!! + +)'"! \ No newline at end of file diff --git a/Packaging/resources/assets/fonts/42-01.pcx b/Packaging/resources/assets/fonts/42-01.pcx new file mode 100644 index 000000000..e8947f0c7 Binary files /dev/null and b/Packaging/resources/assets/fonts/42-01.pcx differ diff --git a/Packaging/resources/assets/fonts/42-02.bin b/Packaging/resources/assets/fonts/42-02.bin new file mode 100644 index 000000000..58c8d60c6 Binary files /dev/null and b/Packaging/resources/assets/fonts/42-02.bin differ diff --git a/Packaging/resources/assets/fonts/42-02.pcx b/Packaging/resources/assets/fonts/42-02.pcx new file mode 100644 index 000000000..2affd3995 Binary files /dev/null and b/Packaging/resources/assets/fonts/42-02.pcx differ diff --git a/Packaging/resources/assets/fonts/42-03.bin b/Packaging/resources/assets/fonts/42-03.bin new file mode 100644 index 000000000..85df440dd Binary files /dev/null and b/Packaging/resources/assets/fonts/42-03.bin differ diff --git a/Packaging/resources/assets/fonts/42-03.pcx b/Packaging/resources/assets/fonts/42-03.pcx new file mode 100644 index 000000000..56a036b0d Binary files /dev/null and b/Packaging/resources/assets/fonts/42-03.pcx differ diff --git a/Packaging/resources/assets/fonts/42-04.bin b/Packaging/resources/assets/fonts/42-04.bin new file mode 100644 index 000000000..c4365f00b --- /dev/null +++ b/Packaging/resources/assets/fonts/42-04.bin @@ -0,0 +1,3 @@ + + ! # '"$"!.('!'%"%!!! +! \ No newline at end of file diff --git a/Packaging/resources/assets/fonts/42-04.pcx b/Packaging/resources/assets/fonts/42-04.pcx new file mode 100644 index 000000000..81633bf6e Binary files /dev/null and b/Packaging/resources/assets/fonts/42-04.pcx differ diff --git a/Packaging/resources/assets/fonts/46-00.bin b/Packaging/resources/assets/fonts/46-00.bin new file mode 100644 index 000000000..0a3cffd74 Binary files /dev/null and b/Packaging/resources/assets/fonts/46-00.bin differ diff --git a/Packaging/resources/assets/fonts/46-00.pcx b/Packaging/resources/assets/fonts/46-00.pcx new file mode 100644 index 000000000..9234ebe33 Binary files /dev/null and b/Packaging/resources/assets/fonts/46-00.pcx differ diff --git a/Packaging/resources/assets/fonts/46-01.bin b/Packaging/resources/assets/fonts/46-01.bin new file mode 100644 index 000000000..21caf184b --- /dev/null +++ b/Packaging/resources/assets/fonts/46-01.bin @@ -0,0 +1,3 @@ +"##  +  #!!!,& %%% $%% 1)##"!"!''!!% ! +$!&  + 1/)('!# %% %% %###!!! 1/)'#!! \ No newline at end of file diff --git a/Packaging/resources/assets/fonts/46-01.pcx b/Packaging/resources/assets/fonts/46-01.pcx new file mode 100644 index 000000000..7fc572980 Binary files /dev/null and b/Packaging/resources/assets/fonts/46-01.pcx differ diff --git a/Packaging/resources/assets/fonts/46-02.bin b/Packaging/resources/assets/fonts/46-02.bin new file mode 100644 index 000000000..24342db25 Binary files /dev/null and b/Packaging/resources/assets/fonts/46-02.bin differ diff --git a/Packaging/resources/assets/fonts/46-02.pcx b/Packaging/resources/assets/fonts/46-02.pcx new file mode 100644 index 000000000..6e25212a1 Binary files /dev/null and b/Packaging/resources/assets/fonts/46-02.pcx differ diff --git a/Packaging/resources/assets/fonts/46-03.bin b/Packaging/resources/assets/fonts/46-03.bin new file mode 100644 index 000000000..f50d1eb12 Binary files /dev/null and b/Packaging/resources/assets/fonts/46-03.bin differ diff --git a/Packaging/resources/assets/fonts/46-03.pcx b/Packaging/resources/assets/fonts/46-03.pcx new file mode 100644 index 000000000..38935aac0 Binary files /dev/null and b/Packaging/resources/assets/fonts/46-03.pcx differ diff --git a/Packaging/resources/assets/fonts/46-04.bin b/Packaging/resources/assets/fonts/46-04.bin new file mode 100644 index 000000000..05c8d97f4 --- /dev/null +++ b/Packaging/resources/assets/fonts/46-04.bin @@ -0,0 +1,3 @@ +#  $"%!# %")!! "$& *" # + +/!%")"!+%"!)#("70!.'.!#$!!.)-%("# ""#%)"(" % ")" "#!!!&!!! ! "# \ No newline at end of file diff --git a/Packaging/resources/assets/fonts/46-04.pcx b/Packaging/resources/assets/fonts/46-04.pcx new file mode 100644 index 000000000..f5190be35 Binary files /dev/null and b/Packaging/resources/assets/fonts/46-04.pcx differ diff --git a/Packaging/resources/assets/fonts/black.trn b/Packaging/resources/assets/fonts/black.trn new file mode 100644 index 000000000..5242b1a65 Binary files /dev/null and b/Packaging/resources/assets/fonts/black.trn differ diff --git a/Packaging/resources/assets/fonts/blue.trn b/Packaging/resources/assets/fonts/blue.trn new file mode 100644 index 000000000..eece88d36 Binary files /dev/null and b/Packaging/resources/assets/fonts/blue.trn differ diff --git a/Packaging/resources/assets/fonts/buttonface.trn b/Packaging/resources/assets/fonts/buttonface.trn new file mode 100644 index 000000000..432927aed Binary files /dev/null and b/Packaging/resources/assets/fonts/buttonface.trn differ diff --git a/Packaging/resources/assets/fonts/buttonpushed.trn b/Packaging/resources/assets/fonts/buttonpushed.trn new file mode 100644 index 000000000..6f0d3ddf4 Binary files /dev/null and b/Packaging/resources/assets/fonts/buttonpushed.trn differ diff --git a/Packaging/resources/assets/fonts/goldui.trn b/Packaging/resources/assets/fonts/goldui.trn new file mode 100644 index 000000000..a8d5a0d08 Binary files /dev/null and b/Packaging/resources/assets/fonts/goldui.trn differ diff --git a/Packaging/resources/assets/fonts/golduis.trn b/Packaging/resources/assets/fonts/golduis.trn new file mode 100644 index 000000000..fbdc5486e Binary files /dev/null and b/Packaging/resources/assets/fonts/golduis.trn differ diff --git a/Packaging/resources/assets/fonts/grayui.trn b/Packaging/resources/assets/fonts/grayui.trn new file mode 100644 index 000000000..29b6f37be Binary files /dev/null and b/Packaging/resources/assets/fonts/grayui.trn differ diff --git a/Packaging/resources/assets/fonts/grayuis.trn b/Packaging/resources/assets/fonts/grayuis.trn new file mode 100644 index 000000000..7cbdbc193 Binary files /dev/null and b/Packaging/resources/assets/fonts/grayuis.trn differ diff --git a/Packaging/resources/assets/fonts/red.trn b/Packaging/resources/assets/fonts/red.trn new file mode 100644 index 000000000..ff7341c93 Binary files /dev/null and b/Packaging/resources/assets/fonts/red.trn differ diff --git a/Packaging/resources/assets/fonts/white.trn b/Packaging/resources/assets/fonts/white.trn new file mode 100644 index 000000000..38dd4bb93 Binary files /dev/null and b/Packaging/resources/assets/fonts/white.trn differ diff --git a/Packaging/resources/assets/fonts/whitegold.trn b/Packaging/resources/assets/fonts/whitegold.trn new file mode 100644 index 000000000..3506be856 Binary files /dev/null and b/Packaging/resources/assets/fonts/whitegold.trn differ diff --git a/Packaging/resources/assets/gendata/cutportlw.pcx b/Packaging/resources/assets/gendata/cutportlw.pcx new file mode 100644 index 000000000..b9f050123 Binary files /dev/null and b/Packaging/resources/assets/gendata/cutportlw.pcx differ diff --git a/Packaging/resources/assets/gendata/cutportrw.pcx b/Packaging/resources/assets/gendata/cutportrw.pcx new file mode 100644 index 000000000..70143b48b Binary files /dev/null and b/Packaging/resources/assets/gendata/cutportrw.pcx differ diff --git a/Packaging/resources/assets/gendata/cutstartw.pcx b/Packaging/resources/assets/gendata/cutstartw.pcx new file mode 100644 index 000000000..683474cc2 Binary files /dev/null and b/Packaging/resources/assets/gendata/cutstartw.pcx differ diff --git a/Packaging/resources/ui_art/button.png b/Packaging/resources/assets/ui_art/button.png similarity index 100% rename from Packaging/resources/ui_art/button.png rename to Packaging/resources/assets/ui_art/button.png diff --git a/Packaging/resources/assets/ui_art/creditsw.pcx b/Packaging/resources/assets/ui_art/creditsw.pcx new file mode 100644 index 000000000..ebd3cf7df Binary files /dev/null and b/Packaging/resources/assets/ui_art/creditsw.pcx differ diff --git a/Packaging/resources/ui_art/directions.png b/Packaging/resources/assets/ui_art/directions.png similarity index 100% rename from Packaging/resources/ui_art/directions.png rename to Packaging/resources/assets/ui_art/directions.png diff --git a/Packaging/resources/assets/ui_art/directions2.png b/Packaging/resources/assets/ui_art/directions2.png new file mode 100644 index 000000000..8a59bb9e0 Binary files /dev/null and b/Packaging/resources/assets/ui_art/directions2.png differ diff --git a/Packaging/resources/assets/ui_art/hf_titlew.pcx b/Packaging/resources/assets/ui_art/hf_titlew.pcx new file mode 100644 index 000000000..fee1590ae Binary files /dev/null and b/Packaging/resources/assets/ui_art/hf_titlew.pcx differ diff --git a/Packaging/resources/assets/ui_art/mainmenuw.pcx b/Packaging/resources/assets/ui_art/mainmenuw.pcx new file mode 100644 index 000000000..2d77c4690 Binary files /dev/null and b/Packaging/resources/assets/ui_art/mainmenuw.pcx differ diff --git a/Packaging/resources/assets/ui_art/supportw.pcx b/Packaging/resources/assets/ui_art/supportw.pcx new file mode 100644 index 000000000..6f9968d57 Binary files /dev/null and b/Packaging/resources/assets/ui_art/supportw.pcx differ diff --git a/Packaging/resources/devilutionx.mpq b/Packaging/resources/devilutionx.mpq deleted file mode 100644 index 28665ffd9..000000000 Binary files a/Packaging/resources/devilutionx.mpq and /dev/null differ diff --git a/Packaging/resources/ui_art/directions2.png b/Packaging/resources/ui_art/directions2.png deleted file mode 100644 index 024c5b47e..000000000 Binary files a/Packaging/resources/ui_art/directions2.png and /dev/null differ diff --git a/android-project/CMake/android_defs.cmake b/android-project/CMake/android_defs.cmake index ee0ccc3d0..ff272e37e 100644 --- a/android-project/CMake/android_defs.cmake +++ b/android-project/CMake/android_defs.cmake @@ -18,5 +18,5 @@ file( COPY "${DevilutionX_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf" DESTINATION "${DevilutionX_SOURCE_DIR}/android-project/app/src/main/assets") -file(GLOB VirtualGamepadArt "${DevilutionX_SOURCE_DIR}/Packaging/resources/ui_art/*") +file(GLOB VirtualGamepadArt "${DevilutionX_SOURCE_DIR}/Packaging/resources/assets/ui_art/*") file(COPY ${VirtualGamepadArt} DESTINATION "${DevilutionX_SOURCE_DIR}/android-project/app/src/main/assets/ui_art")