瀏覽代碼

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

Ivan Arkhipov 6 年之前
父節點
當前提交
7603136207
共有 100 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      .gitignore
  2. 二進制
      assets/hotseatpvp/attack_state.png
  3. 二進制
      assets/hotseatpvp/battle_bg/CmBkCF.png
  4. 二進制
      assets/hotseatpvp/battle_bg/CmBkCur.png
  5. 二進制
      assets/hotseatpvp/battle_bg/CmBkDeck.png
  6. 二進制
      assets/hotseatpvp/battle_bg/CmBkDes.png
  7. 二進制
      assets/hotseatpvp/battle_bg/CmBkDrDd.png
  8. 二進制
      assets/hotseatpvp/battle_bg/CmBkDrMt.png
  9. 二進制
      assets/hotseatpvp/battle_bg/CmBkDrTr.png
  10. 二進制
      assets/hotseatpvp/battle_bg/CmBkGrMt.png
  11. 二進制
      assets/hotseatpvp/battle_bg/CmBkGrTr.png
  12. 二進制
      assets/hotseatpvp/battle_bg/CmBkHG.png
  13. 二進制
      assets/hotseatpvp/battle_bg/CmBkLava.png
  14. 二進制
      assets/hotseatpvp/battle_bg/CmBkMag.png
  15. 二進制
      assets/hotseatpvp/battle_bg/CmBkRK.png
  16. 二進制
      assets/hotseatpvp/battle_bg/CmBkRgh.png
  17. 二進制
      assets/hotseatpvp/battle_bg/CmBkSnMt.png
  18. 二進制
      assets/hotseatpvp/battle_bg/CmBkSnTr.png
  19. 二進制
      assets/hotseatpvp/battle_bg/CmBkSub.png
  20. 二進制
      assets/hotseatpvp/battle_bg/CmBkSwmp.png
  21. 二進制
      assets/hotseatpvp/battle_bg/OBBHL02.png
  22. 二進制
      assets/hotseatpvp/battle_bg/OBBHL03.png
  23. 二進制
      assets/hotseatpvp/battle_bg/OBBHL05.png
  24. 二進制
      assets/hotseatpvp/battle_bg/OBBHL06.png
  25. 二進制
      assets/hotseatpvp/battle_bg/OBBHL14.png
  26. 二進制
      assets/hotseatpvp/battle_bg/OBBHL16.png
  27. 二進制
      assets/hotseatpvp/battle_bg/OBLvL02.png
  28. 二進制
      assets/hotseatpvp/battle_bg/OBRGL01.png
  29. 二進制
      assets/hotseatpvp/battle_bg/OBRGL02.png
  30. 二進制
      assets/hotseatpvp/battle_bg/OBRGL03.png
  31. 二進制
      assets/hotseatpvp/battle_bg/OBRGL04.png
  32. 二進制
      assets/hotseatpvp/battle_bg/OBRGL05.png
  33. 二進制
      assets/hotseatpvp/battle_bg/OBRGL06.png
  34. 二進制
      assets/hotseatpvp/battle_bg/OBSNL01.png
  35. 二進制
      assets/hotseatpvp/battle_bg/OBSNL14.png
  36. 二進制
      assets/hotseatpvp/battle_bg/OBSWL22.png
  37. 二進制
      assets/hotseatpvp/battle_bg/ObBhS02.png
  38. 二進制
      assets/hotseatpvp/battle_bg/ObBhS03.png
  39. 二進制
      assets/hotseatpvp/battle_bg/ObBhS04.png
  40. 二進制
      assets/hotseatpvp/battle_bg/ObBhS11a.png
  41. 二進制
      assets/hotseatpvp/battle_bg/ObBhS12b.png
  42. 二進制
      assets/hotseatpvp/battle_bg/ObBhS14b.png
  43. 二進制
      assets/hotseatpvp/battle_bg/ObBhS16a.png
  44. 二進制
      assets/hotseatpvp/battle_bg/ObBtS04.png
  45. 二進制
      assets/hotseatpvp/battle_bg/ObCFL00.png
  46. 二進制
      assets/hotseatpvp/battle_bg/ObCFs00.png
  47. 二進制
      assets/hotseatpvp/battle_bg/ObCFs01.png
  48. 二進制
      assets/hotseatpvp/battle_bg/ObCFs02.png
  49. 二進制
      assets/hotseatpvp/battle_bg/ObCFs03.png
  50. 二進制
      assets/hotseatpvp/battle_bg/ObDRk01.png
  51. 二進制
      assets/hotseatpvp/battle_bg/ObDRk02.png
  52. 二進制
      assets/hotseatpvp/battle_bg/ObDRk03.png
  53. 二進制
      assets/hotseatpvp/battle_bg/ObDRk04.png
  54. 二進制
      assets/hotseatpvp/battle_bg/ObDSM01.png
  55. 二進制
      assets/hotseatpvp/battle_bg/ObDSM02.png
  56. 二進制
      assets/hotseatpvp/battle_bg/ObDSS17.png
  57. 二進制
      assets/hotseatpvp/battle_bg/ObDSh01.png
  58. 二進制
      assets/hotseatpvp/battle_bg/ObDSs02.png
  59. 二進制
      assets/hotseatpvp/battle_bg/ObDTF03.png
  60. 二進制
      assets/hotseatpvp/battle_bg/ObDino1.png
  61. 二進制
      assets/hotseatpvp/battle_bg/ObDino2.png
  62. 二進制
      assets/hotseatpvp/battle_bg/ObDino3.png
  63. 二進制
      assets/hotseatpvp/battle_bg/ObDtL02.png
  64. 二進制
      assets/hotseatpvp/battle_bg/ObDtL03.png
  65. 二進制
      assets/hotseatpvp/battle_bg/ObDtL04.png
  66. 二進制
      assets/hotseatpvp/battle_bg/ObDtL06.png
  67. 二進制
      assets/hotseatpvp/battle_bg/ObDtL10.png
  68. 二進制
      assets/hotseatpvp/battle_bg/ObDtS03.png
  69. 二進制
      assets/hotseatpvp/battle_bg/ObDtS04.png
  70. 二進制
      assets/hotseatpvp/battle_bg/ObDtS14.png
  71. 二進制
      assets/hotseatpvp/battle_bg/ObDtS15.png
  72. 二進制
      assets/hotseatpvp/battle_bg/ObEFs00.png
  73. 二進制
      assets/hotseatpvp/battle_bg/ObEFs01.png
  74. 二進制
      assets/hotseatpvp/battle_bg/ObEFs02.png
  75. 二進制
      assets/hotseatpvp/battle_bg/ObEFs03.png
  76. 二進制
      assets/hotseatpvp/battle_bg/ObEFs04.png
  77. 二進制
      assets/hotseatpvp/battle_bg/ObFFL00.png
  78. 二進制
      assets/hotseatpvp/battle_bg/ObFFs00.png
  79. 二進制
      assets/hotseatpvp/battle_bg/ObFFs01.png
  80. 二進制
      assets/hotseatpvp/battle_bg/ObFFs02.png
  81. 二進制
      assets/hotseatpvp/battle_bg/ObFFs03.png
  82. 二進制
      assets/hotseatpvp/battle_bg/ObFFs04.png
  83. 二進制
      assets/hotseatpvp/battle_bg/ObGLg01.png
  84. 二進制
      assets/hotseatpvp/battle_bg/ObGRk01.png
  85. 二進制
      assets/hotseatpvp/battle_bg/ObGRk02.png
  86. 二進制
      assets/hotseatpvp/battle_bg/ObGSt01.png
  87. 二進制
      assets/hotseatpvp/battle_bg/ObGrS01.png
  88. 二進制
      assets/hotseatpvp/battle_bg/ObGrS02.png
  89. 二進制
      assets/hotseatpvp/battle_bg/ObGrS03.png
  90. 二進制
      assets/hotseatpvp/battle_bg/ObHGs00.png
  91. 二進制
      assets/hotseatpvp/battle_bg/ObHGs01.png
  92. 二進制
      assets/hotseatpvp/battle_bg/ObHGs02.png
  93. 二進制
      assets/hotseatpvp/battle_bg/ObHGs03.png
  94. 二進制
      assets/hotseatpvp/battle_bg/ObHGs04.png
  95. 二進制
      assets/hotseatpvp/battle_bg/ObLPL00.png
  96. 二進制
      assets/hotseatpvp/battle_bg/ObLPs00.png
  97. 二進制
      assets/hotseatpvp/battle_bg/ObLPs01.png
  98. 二進制
      assets/hotseatpvp/battle_bg/ObLPs02.png
  99. 二進制
      assets/hotseatpvp/battle_bg/ObLPs03.png
  100. 二進制
      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

二進制
assets/hotseatpvp/attack_state.png


二進制
assets/hotseatpvp/battle_bg/CmBkCF.png


二進制
assets/hotseatpvp/battle_bg/CmBkCur.png


二進制
assets/hotseatpvp/battle_bg/CmBkDeck.png


二進制
assets/hotseatpvp/battle_bg/CmBkDes.png


二進制
assets/hotseatpvp/battle_bg/CmBkDrDd.png


二進制
assets/hotseatpvp/battle_bg/CmBkDrMt.png


二進制
assets/hotseatpvp/battle_bg/CmBkDrTr.png


二進制
assets/hotseatpvp/battle_bg/CmBkGrMt.png


二進制
assets/hotseatpvp/battle_bg/CmBkGrTr.png


二進制
assets/hotseatpvp/battle_bg/CmBkHG.png


二進制
assets/hotseatpvp/battle_bg/CmBkLava.png


二進制
assets/hotseatpvp/battle_bg/CmBkMag.png


二進制
assets/hotseatpvp/battle_bg/CmBkRK.png


二進制
assets/hotseatpvp/battle_bg/CmBkRgh.png


二進制
assets/hotseatpvp/battle_bg/CmBkSnMt.png


二進制
assets/hotseatpvp/battle_bg/CmBkSnTr.png


二進制
assets/hotseatpvp/battle_bg/CmBkSub.png


二進制
assets/hotseatpvp/battle_bg/CmBkSwmp.png


二進制
assets/hotseatpvp/battle_bg/OBBHL02.png


二進制
assets/hotseatpvp/battle_bg/OBBHL03.png


二進制
assets/hotseatpvp/battle_bg/OBBHL05.png


二進制
assets/hotseatpvp/battle_bg/OBBHL06.png


二進制
assets/hotseatpvp/battle_bg/OBBHL14.png


二進制
assets/hotseatpvp/battle_bg/OBBHL16.png


二進制
assets/hotseatpvp/battle_bg/OBLvL02.png


二進制
assets/hotseatpvp/battle_bg/OBRGL01.png


二進制
assets/hotseatpvp/battle_bg/OBRGL02.png


二進制
assets/hotseatpvp/battle_bg/OBRGL03.png


二進制
assets/hotseatpvp/battle_bg/OBRGL04.png


二進制
assets/hotseatpvp/battle_bg/OBRGL05.png


二進制
assets/hotseatpvp/battle_bg/OBRGL06.png


二進制
assets/hotseatpvp/battle_bg/OBSNL01.png


二進制
assets/hotseatpvp/battle_bg/OBSNL14.png


二進制
assets/hotseatpvp/battle_bg/OBSWL22.png


二進制
assets/hotseatpvp/battle_bg/ObBhS02.png


二進制
assets/hotseatpvp/battle_bg/ObBhS03.png


二進制
assets/hotseatpvp/battle_bg/ObBhS04.png


二進制
assets/hotseatpvp/battle_bg/ObBhS11a.png


二進制
assets/hotseatpvp/battle_bg/ObBhS12b.png


二進制
assets/hotseatpvp/battle_bg/ObBhS14b.png


二進制
assets/hotseatpvp/battle_bg/ObBhS16a.png


二進制
assets/hotseatpvp/battle_bg/ObBtS04.png


二進制
assets/hotseatpvp/battle_bg/ObCFL00.png


二進制
assets/hotseatpvp/battle_bg/ObCFs00.png


二進制
assets/hotseatpvp/battle_bg/ObCFs01.png


二進制
assets/hotseatpvp/battle_bg/ObCFs02.png


二進制
assets/hotseatpvp/battle_bg/ObCFs03.png


二進制
assets/hotseatpvp/battle_bg/ObDRk01.png


二進制
assets/hotseatpvp/battle_bg/ObDRk02.png


二進制
assets/hotseatpvp/battle_bg/ObDRk03.png


二進制
assets/hotseatpvp/battle_bg/ObDRk04.png


二進制
assets/hotseatpvp/battle_bg/ObDSM01.png


二進制
assets/hotseatpvp/battle_bg/ObDSM02.png


二進制
assets/hotseatpvp/battle_bg/ObDSS17.png


二進制
assets/hotseatpvp/battle_bg/ObDSh01.png


二進制
assets/hotseatpvp/battle_bg/ObDSs02.png


二進制
assets/hotseatpvp/battle_bg/ObDTF03.png


二進制
assets/hotseatpvp/battle_bg/ObDino1.png


二進制
assets/hotseatpvp/battle_bg/ObDino2.png


二進制
assets/hotseatpvp/battle_bg/ObDino3.png


二進制
assets/hotseatpvp/battle_bg/ObDtL02.png


二進制
assets/hotseatpvp/battle_bg/ObDtL03.png


二進制
assets/hotseatpvp/battle_bg/ObDtL04.png


二進制
assets/hotseatpvp/battle_bg/ObDtL06.png


二進制
assets/hotseatpvp/battle_bg/ObDtL10.png


二進制
assets/hotseatpvp/battle_bg/ObDtS03.png


二進制
assets/hotseatpvp/battle_bg/ObDtS04.png


二進制
assets/hotseatpvp/battle_bg/ObDtS14.png


二進制
assets/hotseatpvp/battle_bg/ObDtS15.png


二進制
assets/hotseatpvp/battle_bg/ObEFs00.png


二進制
assets/hotseatpvp/battle_bg/ObEFs01.png


二進制
assets/hotseatpvp/battle_bg/ObEFs02.png


二進制
assets/hotseatpvp/battle_bg/ObEFs03.png


二進制
assets/hotseatpvp/battle_bg/ObEFs04.png


二進制
assets/hotseatpvp/battle_bg/ObFFL00.png


二進制
assets/hotseatpvp/battle_bg/ObFFs00.png


二進制
assets/hotseatpvp/battle_bg/ObFFs01.png


二進制
assets/hotseatpvp/battle_bg/ObFFs02.png


二進制
assets/hotseatpvp/battle_bg/ObFFs03.png


二進制
assets/hotseatpvp/battle_bg/ObFFs04.png


二進制
assets/hotseatpvp/battle_bg/ObGLg01.png


二進制
assets/hotseatpvp/battle_bg/ObGRk01.png


二進制
assets/hotseatpvp/battle_bg/ObGRk02.png


二進制
assets/hotseatpvp/battle_bg/ObGSt01.png


二進制
assets/hotseatpvp/battle_bg/ObGrS01.png


二進制
assets/hotseatpvp/battle_bg/ObGrS02.png


二進制
assets/hotseatpvp/battle_bg/ObGrS03.png


二進制
assets/hotseatpvp/battle_bg/ObHGs00.png


二進制
assets/hotseatpvp/battle_bg/ObHGs01.png


二進制
assets/hotseatpvp/battle_bg/ObHGs02.png


二進制
assets/hotseatpvp/battle_bg/ObHGs03.png


二進制
assets/hotseatpvp/battle_bg/ObHGs04.png


二進制
assets/hotseatpvp/battle_bg/ObLPL00.png


二進制
assets/hotseatpvp/battle_bg/ObLPs00.png


二進制
assets/hotseatpvp/battle_bg/ObLPs01.png


二進制
assets/hotseatpvp/battle_bg/ObLPs02.png


二進制
assets/hotseatpvp/battle_bg/ObLPs03.png


二進制
assets/hotseatpvp/battle_bg/ObLvL01.png


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