Переглянути джерело

Merge branch 'gui' into dev. Filenames changes, build system addings (resource files)

Ivan Arkhipov 6 роки тому
батько
коміт
7603136207
100 змінених файлів з 6 додано та 1 видалено
  1. 6 1
      .gitignore
  2. BIN
      assets/hotseatpvp/attack_state.png
  3. BIN
      assets/hotseatpvp/battle_bg/CmBkCF.png
  4. BIN
      assets/hotseatpvp/battle_bg/CmBkCur.png
  5. BIN
      assets/hotseatpvp/battle_bg/CmBkDeck.png
  6. BIN
      assets/hotseatpvp/battle_bg/CmBkDes.png
  7. BIN
      assets/hotseatpvp/battle_bg/CmBkDrDd.png
  8. BIN
      assets/hotseatpvp/battle_bg/CmBkDrMt.png
  9. BIN
      assets/hotseatpvp/battle_bg/CmBkDrTr.png
  10. BIN
      assets/hotseatpvp/battle_bg/CmBkGrMt.png
  11. BIN
      assets/hotseatpvp/battle_bg/CmBkGrTr.png
  12. BIN
      assets/hotseatpvp/battle_bg/CmBkHG.png
  13. BIN
      assets/hotseatpvp/battle_bg/CmBkLava.png
  14. BIN
      assets/hotseatpvp/battle_bg/CmBkMag.png
  15. BIN
      assets/hotseatpvp/battle_bg/CmBkRK.png
  16. BIN
      assets/hotseatpvp/battle_bg/CmBkRgh.png
  17. BIN
      assets/hotseatpvp/battle_bg/CmBkSnMt.png
  18. BIN
      assets/hotseatpvp/battle_bg/CmBkSnTr.png
  19. BIN
      assets/hotseatpvp/battle_bg/CmBkSub.png
  20. BIN
      assets/hotseatpvp/battle_bg/CmBkSwmp.png
  21. BIN
      assets/hotseatpvp/battle_bg/OBBHL02.png
  22. BIN
      assets/hotseatpvp/battle_bg/OBBHL03.png
  23. BIN
      assets/hotseatpvp/battle_bg/OBBHL05.png
  24. BIN
      assets/hotseatpvp/battle_bg/OBBHL06.png
  25. BIN
      assets/hotseatpvp/battle_bg/OBBHL14.png
  26. BIN
      assets/hotseatpvp/battle_bg/OBBHL16.png
  27. BIN
      assets/hotseatpvp/battle_bg/OBLvL02.png
  28. BIN
      assets/hotseatpvp/battle_bg/OBRGL01.png
  29. BIN
      assets/hotseatpvp/battle_bg/OBRGL02.png
  30. BIN
      assets/hotseatpvp/battle_bg/OBRGL03.png
  31. BIN
      assets/hotseatpvp/battle_bg/OBRGL04.png
  32. BIN
      assets/hotseatpvp/battle_bg/OBRGL05.png
  33. BIN
      assets/hotseatpvp/battle_bg/OBRGL06.png
  34. BIN
      assets/hotseatpvp/battle_bg/OBSNL01.png
  35. BIN
      assets/hotseatpvp/battle_bg/OBSNL14.png
  36. BIN
      assets/hotseatpvp/battle_bg/OBSWL22.png
  37. BIN
      assets/hotseatpvp/battle_bg/ObBhS02.png
  38. BIN
      assets/hotseatpvp/battle_bg/ObBhS03.png
  39. BIN
      assets/hotseatpvp/battle_bg/ObBhS04.png
  40. BIN
      assets/hotseatpvp/battle_bg/ObBhS11a.png
  41. BIN
      assets/hotseatpvp/battle_bg/ObBhS12b.png
  42. BIN
      assets/hotseatpvp/battle_bg/ObBhS14b.png
  43. BIN
      assets/hotseatpvp/battle_bg/ObBhS16a.png
  44. BIN
      assets/hotseatpvp/battle_bg/ObBtS04.png
  45. BIN
      assets/hotseatpvp/battle_bg/ObCFL00.png
  46. BIN
      assets/hotseatpvp/battle_bg/ObCFs00.png
  47. BIN
      assets/hotseatpvp/battle_bg/ObCFs01.png
  48. BIN
      assets/hotseatpvp/battle_bg/ObCFs02.png
  49. BIN
      assets/hotseatpvp/battle_bg/ObCFs03.png
  50. BIN
      assets/hotseatpvp/battle_bg/ObDRk01.png
  51. BIN
      assets/hotseatpvp/battle_bg/ObDRk02.png
  52. BIN
      assets/hotseatpvp/battle_bg/ObDRk03.png
  53. BIN
      assets/hotseatpvp/battle_bg/ObDRk04.png
  54. BIN
      assets/hotseatpvp/battle_bg/ObDSM01.png
  55. BIN
      assets/hotseatpvp/battle_bg/ObDSM02.png
  56. BIN
      assets/hotseatpvp/battle_bg/ObDSS17.png
  57. BIN
      assets/hotseatpvp/battle_bg/ObDSh01.png
  58. BIN
      assets/hotseatpvp/battle_bg/ObDSs02.png
  59. BIN
      assets/hotseatpvp/battle_bg/ObDTF03.png
  60. BIN
      assets/hotseatpvp/battle_bg/ObDino1.png
  61. BIN
      assets/hotseatpvp/battle_bg/ObDino2.png
  62. BIN
      assets/hotseatpvp/battle_bg/ObDino3.png
  63. BIN
      assets/hotseatpvp/battle_bg/ObDtL02.png
  64. BIN
      assets/hotseatpvp/battle_bg/ObDtL03.png
  65. BIN
      assets/hotseatpvp/battle_bg/ObDtL04.png
  66. BIN
      assets/hotseatpvp/battle_bg/ObDtL06.png
  67. BIN
      assets/hotseatpvp/battle_bg/ObDtL10.png
  68. BIN
      assets/hotseatpvp/battle_bg/ObDtS03.png
  69. BIN
      assets/hotseatpvp/battle_bg/ObDtS04.png
  70. BIN
      assets/hotseatpvp/battle_bg/ObDtS14.png
  71. BIN
      assets/hotseatpvp/battle_bg/ObDtS15.png
  72. BIN
      assets/hotseatpvp/battle_bg/ObEFs00.png
  73. BIN
      assets/hotseatpvp/battle_bg/ObEFs01.png
  74. BIN
      assets/hotseatpvp/battle_bg/ObEFs02.png
  75. BIN
      assets/hotseatpvp/battle_bg/ObEFs03.png
  76. BIN
      assets/hotseatpvp/battle_bg/ObEFs04.png
  77. BIN
      assets/hotseatpvp/battle_bg/ObFFL00.png
  78. BIN
      assets/hotseatpvp/battle_bg/ObFFs00.png
  79. BIN
      assets/hotseatpvp/battle_bg/ObFFs01.png
  80. BIN
      assets/hotseatpvp/battle_bg/ObFFs02.png
  81. BIN
      assets/hotseatpvp/battle_bg/ObFFs03.png
  82. BIN
      assets/hotseatpvp/battle_bg/ObFFs04.png
  83. BIN
      assets/hotseatpvp/battle_bg/ObGLg01.png
  84. BIN
      assets/hotseatpvp/battle_bg/ObGRk01.png
  85. BIN
      assets/hotseatpvp/battle_bg/ObGRk02.png
  86. BIN
      assets/hotseatpvp/battle_bg/ObGSt01.png
  87. BIN
      assets/hotseatpvp/battle_bg/ObGrS01.png
  88. BIN
      assets/hotseatpvp/battle_bg/ObGrS02.png
  89. BIN
      assets/hotseatpvp/battle_bg/ObGrS03.png
  90. BIN
      assets/hotseatpvp/battle_bg/ObHGs00.png
  91. BIN
      assets/hotseatpvp/battle_bg/ObHGs01.png
  92. BIN
      assets/hotseatpvp/battle_bg/ObHGs02.png
  93. BIN
      assets/hotseatpvp/battle_bg/ObHGs03.png
  94. BIN
      assets/hotseatpvp/battle_bg/ObHGs04.png
  95. BIN
      assets/hotseatpvp/battle_bg/ObLPL00.png
  96. BIN
      assets/hotseatpvp/battle_bg/ObLPs00.png
  97. BIN
      assets/hotseatpvp/battle_bg/ObLPs01.png
  98. BIN
      assets/hotseatpvp/battle_bg/ObLPs02.png
  99. BIN
      assets/hotseatpvp/battle_bg/ObLPs03.png
  100. BIN
      assets/hotseatpvp/battle_bg/ObLvL01.png

+ 6 - 1
.gitignore

@@ -105,4 +105,9 @@ CMakeScripts
 Makefile
 cmake_install.cmake
 install_manifest.txt
-TestCellProject
+
+test
+deploy
+build
+debug
+release

BIN
assets/hotseatpvp/attack_state.png


BIN
assets/hotseatpvp/battle_bg/CmBkCF.png


BIN
assets/hotseatpvp/battle_bg/CmBkCur.png


BIN
assets/hotseatpvp/battle_bg/CmBkDeck.png


BIN
assets/hotseatpvp/battle_bg/CmBkDes.png


BIN
assets/hotseatpvp/battle_bg/CmBkDrDd.png


BIN
assets/hotseatpvp/battle_bg/CmBkDrMt.png


BIN
assets/hotseatpvp/battle_bg/CmBkDrTr.png


BIN
assets/hotseatpvp/battle_bg/CmBkGrMt.png


BIN
assets/hotseatpvp/battle_bg/CmBkGrTr.png


BIN
assets/hotseatpvp/battle_bg/CmBkHG.png


BIN
assets/hotseatpvp/battle_bg/CmBkLava.png


BIN
assets/hotseatpvp/battle_bg/CmBkMag.png


BIN
assets/hotseatpvp/battle_bg/CmBkRK.png


BIN
assets/hotseatpvp/battle_bg/CmBkRgh.png


BIN
assets/hotseatpvp/battle_bg/CmBkSnMt.png


BIN
assets/hotseatpvp/battle_bg/CmBkSnTr.png


BIN
assets/hotseatpvp/battle_bg/CmBkSub.png


BIN
assets/hotseatpvp/battle_bg/CmBkSwmp.png


BIN
assets/hotseatpvp/battle_bg/OBBHL02.png


BIN
assets/hotseatpvp/battle_bg/OBBHL03.png


BIN
assets/hotseatpvp/battle_bg/OBBHL05.png


BIN
assets/hotseatpvp/battle_bg/OBBHL06.png


BIN
assets/hotseatpvp/battle_bg/OBBHL14.png


BIN
assets/hotseatpvp/battle_bg/OBBHL16.png


BIN
assets/hotseatpvp/battle_bg/OBLvL02.png


BIN
assets/hotseatpvp/battle_bg/OBRGL01.png


BIN
assets/hotseatpvp/battle_bg/OBRGL02.png


BIN
assets/hotseatpvp/battle_bg/OBRGL03.png


BIN
assets/hotseatpvp/battle_bg/OBRGL04.png


BIN
assets/hotseatpvp/battle_bg/OBRGL05.png


BIN
assets/hotseatpvp/battle_bg/OBRGL06.png


BIN
assets/hotseatpvp/battle_bg/OBSNL01.png


BIN
assets/hotseatpvp/battle_bg/OBSNL14.png


BIN
assets/hotseatpvp/battle_bg/OBSWL22.png


BIN
assets/hotseatpvp/battle_bg/ObBhS02.png


BIN
assets/hotseatpvp/battle_bg/ObBhS03.png


BIN
assets/hotseatpvp/battle_bg/ObBhS04.png


BIN
assets/hotseatpvp/battle_bg/ObBhS11a.png


BIN
assets/hotseatpvp/battle_bg/ObBhS12b.png


BIN
assets/hotseatpvp/battle_bg/ObBhS14b.png


BIN
assets/hotseatpvp/battle_bg/ObBhS16a.png


BIN
assets/hotseatpvp/battle_bg/ObBtS04.png


BIN
assets/hotseatpvp/battle_bg/ObCFL00.png


BIN
assets/hotseatpvp/battle_bg/ObCFs00.png


BIN
assets/hotseatpvp/battle_bg/ObCFs01.png


BIN
assets/hotseatpvp/battle_bg/ObCFs02.png


BIN
assets/hotseatpvp/battle_bg/ObCFs03.png


BIN
assets/hotseatpvp/battle_bg/ObDRk01.png


BIN
assets/hotseatpvp/battle_bg/ObDRk02.png


BIN
assets/hotseatpvp/battle_bg/ObDRk03.png


BIN
assets/hotseatpvp/battle_bg/ObDRk04.png


BIN
assets/hotseatpvp/battle_bg/ObDSM01.png


BIN
assets/hotseatpvp/battle_bg/ObDSM02.png


BIN
assets/hotseatpvp/battle_bg/ObDSS17.png


BIN
assets/hotseatpvp/battle_bg/ObDSh01.png


BIN
assets/hotseatpvp/battle_bg/ObDSs02.png


BIN
assets/hotseatpvp/battle_bg/ObDTF03.png


BIN
assets/hotseatpvp/battle_bg/ObDino1.png


BIN
assets/hotseatpvp/battle_bg/ObDino2.png


BIN
assets/hotseatpvp/battle_bg/ObDino3.png


BIN
assets/hotseatpvp/battle_bg/ObDtL02.png


BIN
assets/hotseatpvp/battle_bg/ObDtL03.png


BIN
assets/hotseatpvp/battle_bg/ObDtL04.png


BIN
assets/hotseatpvp/battle_bg/ObDtL06.png


BIN
assets/hotseatpvp/battle_bg/ObDtL10.png


BIN
assets/hotseatpvp/battle_bg/ObDtS03.png


BIN
assets/hotseatpvp/battle_bg/ObDtS04.png


BIN
assets/hotseatpvp/battle_bg/ObDtS14.png


BIN
assets/hotseatpvp/battle_bg/ObDtS15.png


BIN
assets/hotseatpvp/battle_bg/ObEFs00.png


BIN
assets/hotseatpvp/battle_bg/ObEFs01.png


BIN
assets/hotseatpvp/battle_bg/ObEFs02.png


BIN
assets/hotseatpvp/battle_bg/ObEFs03.png


BIN
assets/hotseatpvp/battle_bg/ObEFs04.png


BIN
assets/hotseatpvp/battle_bg/ObFFL00.png


BIN
assets/hotseatpvp/battle_bg/ObFFs00.png


BIN
assets/hotseatpvp/battle_bg/ObFFs01.png


BIN
assets/hotseatpvp/battle_bg/ObFFs02.png


BIN
assets/hotseatpvp/battle_bg/ObFFs03.png


BIN
assets/hotseatpvp/battle_bg/ObFFs04.png


BIN
assets/hotseatpvp/battle_bg/ObGLg01.png


BIN
assets/hotseatpvp/battle_bg/ObGRk01.png


BIN
assets/hotseatpvp/battle_bg/ObGRk02.png


BIN
assets/hotseatpvp/battle_bg/ObGSt01.png


BIN
assets/hotseatpvp/battle_bg/ObGrS01.png


BIN
assets/hotseatpvp/battle_bg/ObGrS02.png


BIN
assets/hotseatpvp/battle_bg/ObGrS03.png


BIN
assets/hotseatpvp/battle_bg/ObHGs00.png


BIN
assets/hotseatpvp/battle_bg/ObHGs01.png


BIN
assets/hotseatpvp/battle_bg/ObHGs02.png


BIN
assets/hotseatpvp/battle_bg/ObHGs03.png


BIN
assets/hotseatpvp/battle_bg/ObHGs04.png


BIN
assets/hotseatpvp/battle_bg/ObLPL00.png


BIN
assets/hotseatpvp/battle_bg/ObLPs00.png


BIN
assets/hotseatpvp/battle_bg/ObLPs01.png


BIN
assets/hotseatpvp/battle_bg/ObLPs02.png


BIN
assets/hotseatpvp/battle_bg/ObLPs03.png


BIN
assets/hotseatpvp/battle_bg/ObLvL01.png


Деякі файли не було показано, через те що забагато файлів було змінено