Browse Source

Packaging/resources/assets -> assets

pull/6805/head
Gleb Mazovetskiy 2 years ago
parent
commit
b2fa87130f
  1. 4
      CMake/Assets.cmake
  2. 2
      CMakeLists.txt
  3. 0
      assets/arena/church.dun
  4. 0
      assets/arena/circle_of_death.dun
  5. 0
      assets/arena/hell.dun
  6. 0
      assets/data/boxleftend.clx
  7. 0
      assets/data/boxmiddle.clx
  8. 0
      assets/data/boxrightend.clx
  9. 0
      assets/data/charbg.clx
  10. 0
      assets/data/dirtybuc.clx
  11. 0
      assets/data/dirtybucp.clx
  12. 0
      assets/data/health.clx
  13. 0
      assets/data/healthbox.clx
  14. 0
      assets/data/hintbox.clx
  15. 0
      assets/data/hintboxbackground.clx
  16. 0
      assets/data/hinticons.clx
  17. 0
      assets/data/monstertags.clx
  18. 0
      assets/data/panel8buc.clx
  19. 0
      assets/data/panel8bucp.clx
  20. 0
      assets/data/resistance.clx
  21. 0
      assets/data/stash.clx
  22. 0
      assets/data/stashnavbtns.clx
  23. 0
      assets/data/talkbutton.clx
  24. 0
      assets/data/xpbar.clx
  25. 0
      assets/fonts/12-00.clx
  26. 0
      assets/fonts/12-01.clx
  27. 0
      assets/fonts/12-02.clx
  28. 0
      assets/fonts/12-03.clx
  29. 0
      assets/fonts/12-04.clx
  30. 0
      assets/fonts/12-1f1.clx
  31. 0
      assets/fonts/12-1f3.clx
  32. 0
      assets/fonts/12-1f4.clx
  33. 0
      assets/fonts/12-1f5.clx
  34. 0
      assets/fonts/12-1f6.clx
  35. 0
      assets/fonts/12-1f9.clx
  36. 0
      assets/fonts/12-20.clx
  37. 0
      assets/fonts/12-26.clx
  38. 0
      assets/fonts/12-e0.clx
  39. 0
      assets/fonts/22-00.clx
  40. 0
      assets/fonts/22-01.clx
  41. 0
      assets/fonts/22-02.clx
  42. 0
      assets/fonts/22-03.clx
  43. 0
      assets/fonts/22-04.clx
  44. 0
      assets/fonts/22-05.clx
  45. 0
      assets/fonts/22-20.clx
  46. 0
      assets/fonts/24-00.clx
  47. 0
      assets/fonts/24-01.clx
  48. 0
      assets/fonts/24-02.clx
  49. 0
      assets/fonts/24-03.clx
  50. 0
      assets/fonts/24-04.clx
  51. 0
      assets/fonts/24-1f1.clx
  52. 0
      assets/fonts/24-1f3.clx
  53. 0
      assets/fonts/24-1f4.clx
  54. 0
      assets/fonts/24-1f5.clx
  55. 0
      assets/fonts/24-1f6.clx
  56. 0
      assets/fonts/24-1f9.clx
  57. 0
      assets/fonts/24-20.clx
  58. 0
      assets/fonts/24-26.clx
  59. 0
      assets/fonts/24-e0.clx
  60. 0
      assets/fonts/30-00.clx
  61. 0
      assets/fonts/30-01.clx
  62. 0
      assets/fonts/30-02.clx
  63. 0
      assets/fonts/30-03.clx
  64. 0
      assets/fonts/30-04.clx
  65. 0
      assets/fonts/30-20.clx
  66. 0
      assets/fonts/42-00.clx
  67. 0
      assets/fonts/42-01.clx
  68. 0
      assets/fonts/42-02.clx
  69. 0
      assets/fonts/42-03.clx
  70. 0
      assets/fonts/42-04.clx
  71. 0
      assets/fonts/42-20.clx
  72. 0
      assets/fonts/46-00.clx
  73. 0
      assets/fonts/46-01.clx
  74. 0
      assets/fonts/46-02.clx
  75. 0
      assets/fonts/46-03.clx
  76. 0
      assets/fonts/46-04.clx
  77. 0
      assets/fonts/46-20.clx
  78. 0
      assets/fonts/black.trn
  79. 0
      assets/fonts/blue.trn
  80. 0
      assets/fonts/buttonface.trn
  81. 0
      assets/fonts/buttonpushed.trn
  82. 0
      assets/fonts/gamedialogred.trn
  83. 0
      assets/fonts/gamedialogwhite.trn
  84. 0
      assets/fonts/gamedialogyellow.trn
  85. 0
      assets/fonts/goldui.trn
  86. 0
      assets/fonts/golduis.trn
  87. 0
      assets/fonts/grayui.trn
  88. 0
      assets/fonts/grayuis.trn
  89. 0
      assets/fonts/orange.trn
  90. 0
      assets/fonts/red.trn
  91. 0
      assets/fonts/white.trn
  92. 0
      assets/fonts/whitegold.trn
  93. 0
      assets/fonts/yellow.trn
  94. 0
      assets/gendata/cut2w.clx
  95. 0
      assets/gendata/cut3w.clx
  96. 0
      assets/gendata/cut4w.clx
  97. 0
      assets/gendata/cutgatew.clx
  98. 0
      assets/gendata/cutl1dw.clx
  99. 0
      assets/gendata/cutportlw.clx
  100. 0
      assets/gendata/cutportrw.clx
  101. Some files were not shown because too many files have changed in this diff Show More

4
CMake/Assets.cmake

@ -182,7 +182,7 @@ endif()
if(APPLE)
foreach(asset_file ${devilutionx_assets})
set(src "${CMAKE_CURRENT_SOURCE_DIR}/Packaging/resources/assets/${asset_file}")
set(src "${CMAKE_CURRENT_SOURCE_DIR}/assets/${asset_file}")
get_filename_component(_asset_dir "${asset_file}" DIRECTORY)
set_source_files_properties("${src}" PROPERTIES
MACOSX_PACKAGE_LOCATION "Resources/${_asset_dir}"
@ -194,7 +194,7 @@ else()
# - If smpq is installed, devilutionx.mpq is built from these files.
# - If smpq is not installed, the game will load the assets directly from this directoy.
foreach(asset_file ${devilutionx_assets})
set(src "${CMAKE_CURRENT_SOURCE_DIR}/Packaging/resources/assets/${asset_file}")
set(src "${CMAKE_CURRENT_SOURCE_DIR}/assets/${asset_file}")
set(dst "${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}/${asset_file}")
list(APPEND DEVILUTIONX_MPQ_FILES "${asset_file}")
list(APPEND DEVILUTIONX_OUTPUT_ASSETS_FILES "${dst}")

2
CMakeLists.txt

@ -447,7 +447,7 @@ if(VITA)
VERSION ${VITA_VERSION}
NAME ${VITA_APP_NAME}
FILE Packaging/vita/sce_sys sce_sys
FILE Packaging/resources/assets assets
FILE assets assets
${VITA_TRANSLATIONS_LIST}
)
endif()

0
Packaging/resources/assets/arena/church.dun → assets/arena/church.dun

0
Packaging/resources/assets/arena/circle_of_death.dun → assets/arena/circle_of_death.dun

0
Packaging/resources/assets/arena/hell.dun → assets/arena/hell.dun

0
Packaging/resources/assets/data/boxleftend.clx → assets/data/boxleftend.clx

0
Packaging/resources/assets/data/boxmiddle.clx → assets/data/boxmiddle.clx

0
Packaging/resources/assets/data/boxrightend.clx → assets/data/boxrightend.clx

0
Packaging/resources/assets/data/charbg.clx → assets/data/charbg.clx

0
Packaging/resources/assets/data/dirtybuc.clx → assets/data/dirtybuc.clx

0
Packaging/resources/assets/data/dirtybucp.clx → assets/data/dirtybucp.clx

0
Packaging/resources/assets/data/health.clx → assets/data/health.clx

0
Packaging/resources/assets/data/healthbox.clx → assets/data/healthbox.clx

0
Packaging/resources/assets/data/hintbox.clx → assets/data/hintbox.clx

0
Packaging/resources/assets/data/hintboxbackground.clx → assets/data/hintboxbackground.clx

0
Packaging/resources/assets/data/hinticons.clx → assets/data/hinticons.clx

0
Packaging/resources/assets/data/monstertags.clx → assets/data/monstertags.clx

0
Packaging/resources/assets/data/panel8buc.clx → assets/data/panel8buc.clx

0
Packaging/resources/assets/data/panel8bucp.clx → assets/data/panel8bucp.clx

0
Packaging/resources/assets/data/resistance.clx → assets/data/resistance.clx

0
Packaging/resources/assets/data/stash.clx → assets/data/stash.clx

0
Packaging/resources/assets/data/stashnavbtns.clx → assets/data/stashnavbtns.clx

0
Packaging/resources/assets/data/talkbutton.clx → assets/data/talkbutton.clx

0
Packaging/resources/assets/data/xpbar.clx → assets/data/xpbar.clx

0
Packaging/resources/assets/fonts/12-00.clx → assets/fonts/12-00.clx

0
Packaging/resources/assets/fonts/12-01.clx → assets/fonts/12-01.clx

0
Packaging/resources/assets/fonts/12-02.clx → assets/fonts/12-02.clx

0
Packaging/resources/assets/fonts/12-03.clx → assets/fonts/12-03.clx

0
Packaging/resources/assets/fonts/12-04.clx → assets/fonts/12-04.clx

0
Packaging/resources/assets/fonts/12-1f1.clx → assets/fonts/12-1f1.clx

0
Packaging/resources/assets/fonts/12-1f3.clx → assets/fonts/12-1f3.clx

0
Packaging/resources/assets/fonts/12-1f4.clx → assets/fonts/12-1f4.clx

0
Packaging/resources/assets/fonts/12-1f5.clx → assets/fonts/12-1f5.clx

0
Packaging/resources/assets/fonts/12-1f6.clx → assets/fonts/12-1f6.clx

0
Packaging/resources/assets/fonts/12-1f9.clx → assets/fonts/12-1f9.clx

0
Packaging/resources/assets/fonts/12-20.clx → assets/fonts/12-20.clx

0
Packaging/resources/assets/fonts/12-26.clx → assets/fonts/12-26.clx

0
Packaging/resources/assets/fonts/12-e0.clx → assets/fonts/12-e0.clx

0
Packaging/resources/assets/fonts/22-00.clx → assets/fonts/22-00.clx

0
Packaging/resources/assets/fonts/22-01.clx → assets/fonts/22-01.clx

0
Packaging/resources/assets/fonts/22-02.clx → assets/fonts/22-02.clx

0
Packaging/resources/assets/fonts/22-03.clx → assets/fonts/22-03.clx

0
Packaging/resources/assets/fonts/22-04.clx → assets/fonts/22-04.clx

0
Packaging/resources/assets/fonts/22-05.clx → assets/fonts/22-05.clx

0
Packaging/resources/assets/fonts/22-20.clx → assets/fonts/22-20.clx

0
Packaging/resources/assets/fonts/24-00.clx → assets/fonts/24-00.clx

0
Packaging/resources/assets/fonts/24-01.clx → assets/fonts/24-01.clx

0
Packaging/resources/assets/fonts/24-02.clx → assets/fonts/24-02.clx

0
Packaging/resources/assets/fonts/24-03.clx → assets/fonts/24-03.clx

0
Packaging/resources/assets/fonts/24-04.clx → assets/fonts/24-04.clx

0
Packaging/resources/assets/fonts/24-1f1.clx → assets/fonts/24-1f1.clx

0
Packaging/resources/assets/fonts/24-1f3.clx → assets/fonts/24-1f3.clx

0
Packaging/resources/assets/fonts/24-1f4.clx → assets/fonts/24-1f4.clx

0
Packaging/resources/assets/fonts/24-1f5.clx → assets/fonts/24-1f5.clx

0
Packaging/resources/assets/fonts/24-1f6.clx → assets/fonts/24-1f6.clx

0
Packaging/resources/assets/fonts/24-1f9.clx → assets/fonts/24-1f9.clx

0
Packaging/resources/assets/fonts/24-20.clx → assets/fonts/24-20.clx

0
Packaging/resources/assets/fonts/24-26.clx → assets/fonts/24-26.clx

0
Packaging/resources/assets/fonts/24-e0.clx → assets/fonts/24-e0.clx

0
Packaging/resources/assets/fonts/30-00.clx → assets/fonts/30-00.clx

0
Packaging/resources/assets/fonts/30-01.clx → assets/fonts/30-01.clx

0
Packaging/resources/assets/fonts/30-02.clx → assets/fonts/30-02.clx

0
Packaging/resources/assets/fonts/30-03.clx → assets/fonts/30-03.clx

0
Packaging/resources/assets/fonts/30-04.clx → assets/fonts/30-04.clx

0
Packaging/resources/assets/fonts/30-20.clx → assets/fonts/30-20.clx

0
Packaging/resources/assets/fonts/42-00.clx → assets/fonts/42-00.clx

0
Packaging/resources/assets/fonts/42-01.clx → assets/fonts/42-01.clx

0
Packaging/resources/assets/fonts/42-02.clx → assets/fonts/42-02.clx

0
Packaging/resources/assets/fonts/42-03.clx → assets/fonts/42-03.clx

0
Packaging/resources/assets/fonts/42-04.clx → assets/fonts/42-04.clx

0
Packaging/resources/assets/fonts/42-20.clx → assets/fonts/42-20.clx

0
Packaging/resources/assets/fonts/46-00.clx → assets/fonts/46-00.clx

0
Packaging/resources/assets/fonts/46-01.clx → assets/fonts/46-01.clx

0
Packaging/resources/assets/fonts/46-02.clx → assets/fonts/46-02.clx

0
Packaging/resources/assets/fonts/46-03.clx → assets/fonts/46-03.clx

0
Packaging/resources/assets/fonts/46-04.clx → assets/fonts/46-04.clx

0
Packaging/resources/assets/fonts/46-20.clx → assets/fonts/46-20.clx

0
Packaging/resources/assets/fonts/black.trn → assets/fonts/black.trn

0
Packaging/resources/assets/fonts/blue.trn → assets/fonts/blue.trn

0
Packaging/resources/assets/fonts/buttonface.trn → assets/fonts/buttonface.trn

0
Packaging/resources/assets/fonts/buttonpushed.trn → assets/fonts/buttonpushed.trn

0
Packaging/resources/assets/fonts/gamedialogred.trn → assets/fonts/gamedialogred.trn

0
Packaging/resources/assets/fonts/gamedialogwhite.trn → assets/fonts/gamedialogwhite.trn

0
Packaging/resources/assets/fonts/gamedialogyellow.trn → assets/fonts/gamedialogyellow.trn

0
Packaging/resources/assets/fonts/goldui.trn → assets/fonts/goldui.trn

0
Packaging/resources/assets/fonts/golduis.trn → assets/fonts/golduis.trn

0
Packaging/resources/assets/fonts/grayui.trn → assets/fonts/grayui.trn

0
Packaging/resources/assets/fonts/grayuis.trn → assets/fonts/grayuis.trn

0
Packaging/resources/assets/fonts/orange.trn → assets/fonts/orange.trn

0
Packaging/resources/assets/fonts/red.trn → assets/fonts/red.trn

0
Packaging/resources/assets/fonts/white.trn → assets/fonts/white.trn

0
Packaging/resources/assets/fonts/whitegold.trn → assets/fonts/whitegold.trn

0
Packaging/resources/assets/fonts/yellow.trn → assets/fonts/yellow.trn

0
Packaging/resources/assets/gendata/cut2w.clx → assets/gendata/cut2w.clx

0
Packaging/resources/assets/gendata/cut3w.clx → assets/gendata/cut3w.clx

0
Packaging/resources/assets/gendata/cut4w.clx → assets/gendata/cut4w.clx

0
Packaging/resources/assets/gendata/cutgatew.clx → assets/gendata/cutgatew.clx

0
Packaging/resources/assets/gendata/cutl1dw.clx → assets/gendata/cutl1dw.clx

0
Packaging/resources/assets/gendata/cutportlw.clx → assets/gendata/cutportlw.clx

0
Packaging/resources/assets/gendata/cutportrw.clx → assets/gendata/cutportrw.clx

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save