Ver código fonte

Merge branch 'master' of https://koljastrohm-games.com:3000/kolja/Kolja-Strohm-Games

Eren Yilmaz 5 anos atrás
pai
commit
67e95bb59e
21 arquivos alterados com 22 adições e 22 exclusões
  1. BIN
      Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/barrel.png
  2. BIN
      Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/gateh.png
  3. BIN
      Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/gatev.png
  4. BIN
      Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/ground.png
  5. BIN
      Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/wallb.png
  6. BIN
      Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/wallh.png
  7. BIN
      Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/walll.png
  8. BIN
      Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/wallr.png
  9. BIN
      Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/wallt.png
  10. BIN
      Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/wallv.png
  11. BIN
      Spiele Platform/Bilder/Konverter/x64/assets.ltdb
  12. BIN
      Spiele Platform/Klient/Fertig/Debug/Minigames/x64/DungeonGame/bilder/assets.ltdb
  13. 6 6
      Spiele Platform/Klient/Fertig/Debug/Minigames/x64/DungeonGame/views/town.uiml
  14. BIN
      Spiele Platform/Klient/Fertig/Minigames/x32/DungeonGame/bilder/assets.ltdb
  15. 6 6
      Spiele Platform/Klient/Fertig/Minigames/x32/DungeonGame/views/town.uiml
  16. BIN
      Spiele Platform/Klient/Fertig/Minigames/x64/DungeonGame/bilder/assets.ltdb
  17. 6 6
      Spiele Platform/Klient/Fertig/Minigames/x64/DungeonGame/views/town.uiml
  18. 1 1
      Spiele Platform/Klient/Icon
  19. 1 1
      Spiele Platform/Klient/Minigames/DungeonGame
  20. 1 1
      Spiele Platform/Klient/Start
  21. 1 1
      Spiele Platform/SMP

BIN
Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/barrel.png


BIN
Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/gateh.png


BIN
Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/gatev.png


BIN
Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/ground.png


BIN
Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/wallb.png


BIN
Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/wallh.png


BIN
Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/walll.png


BIN
Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/wallr.png


BIN
Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/wallt.png


BIN
Spiele Platform/Bilder/Bilder/Client/data.Minigames.DungeonGame.bilder.assets.ltdb/wallv.png


BIN
Spiele Platform/Bilder/Konverter/x64/assets.ltdb


BIN
Spiele Platform/Klient/Fertig/Debug/Minigames/x64/DungeonGame/bilder/assets.ltdb


+ 6 - 6
Spiele Platform/Klient/Fertig/Debug/Minigames/x64/DungeonGame/views/town.uiml

@@ -1,13 +1,13 @@
 <view>
   <button id="back" width="150" height="26" align-top="start" align-left="start" margin="5">ZURÜCK</button>
-  <text id="title" width="75%" height="100" font-size="24" text-align="center">TOWN</text>
-  <text id="heroesTitle" align-left="start" align-top="title" margin="5" width="25%" height="26">YOUR HEROES</text>
+  <text id="title" width="75%" height="100" font-size="24" text-align="center">STADT</text>
+  <text id="heroesTitle" align-left="start" align-top="title" margin="5" width="25%" height="26">DEINE HELDEN</text>
   <table id="heroes" align-left="start" align-top="heroesTitle" margin="5" width="25%" height="35%">
     <tr>
       <text width="100%">NAME</text>
     </tr>
   </table>
-  <text id="ownDungeonsTitle" align-left="start" align-top="heroes" margin="5" width="25%" height="26">YOUR OWN DUNGEONS</text>
+  <text id="ownDungeonsTitle" align-left="start" align-top="heroes" margin="5" width="25%" height="26">DEINE DUNGEONS</text>
   <table id="ownDungeons" align-left="start" align-top="ownDungeonsTitle" margin="5" width="25%" height="35%">
     <tr>
       <text width="100%">NAME</text>
@@ -15,19 +15,19 @@
   </table>
   <button id="createDungeon" align-left="start" align-top="ownDungeons" width="250" height="30" margin="5">DUNGEON ERSTELLEN</button>
   <text id="money" align-left="heroes" align-bottom="inventoryTitle" margin="5" width="25%" height="26"></text>
-  <text id="inventoryTitle" align-left="heroes" align-top="title" margin="5" width="25%" height="26">YOUR INVENTORY</text>
+  <text id="inventoryTitle" align-left="heroes" align-top="title" margin="5" width="25%" height="26">DEIN INVENTAR</text>
   <table id="inventory" align-left="heroes" align-top="inventoryTitle" margin="5" width="25%" height="80%">
     <tr>
       <text width="100%">NAME</text>
     </tr>
   </table>
   <button id="openTavern" align-right="inventoryTitle" align-bottom="heroes" width="150" height="30" margin="5">TAVERNE</button>
-  <text id="dungeonsTitle" align-left="inventory" align-top="title" margin="5" width="25%" height="26">ALL DUNGEONS</text>
+  <text id="dungeonsTitle" align-left="inventory" align-top="title" margin="5" width="25%" height="26">ALLE DUNGEONS</text>
   <button id="openShop" align-right="dungeonsTitle" align-bottom="heroes" width="100" height="30" margin="5">SHOP</button>
   <table id="dungeons" align-left="inventory" align-top="dungeonsTitle" margin="5" width="25%" height="80%">
     <tr>
       <text width="50%">NAME</text>
-      <text width="50%">OWNER</text>
+      <text width="50%">BESITZER</text>
     </tr>
   </table>
 </view>

BIN
Spiele Platform/Klient/Fertig/Minigames/x32/DungeonGame/bilder/assets.ltdb


+ 6 - 6
Spiele Platform/Klient/Fertig/Minigames/x32/DungeonGame/views/town.uiml

@@ -1,13 +1,13 @@
 <view>
   <button id="back" width="150" height="26" align-top="start" align-left="start" margin="5">ZURÜCK</button>
-  <text id="title" width="75%" height="100" font-size="24" text-align="center">TOWN</text>
-  <text id="heroesTitle" align-left="start" align-top="title" margin="5" width="25%" height="26">YOUR HEROES</text>
+  <text id="title" width="75%" height="100" font-size="24" text-align="center">STADT</text>
+  <text id="heroesTitle" align-left="start" align-top="title" margin="5" width="25%" height="26">DEINE HELDEN</text>
   <table id="heroes" align-left="start" align-top="heroesTitle" margin="5" width="25%" height="35%">
     <tr>
       <text width="100%">NAME</text>
     </tr>
   </table>
-  <text id="ownDungeonsTitle" align-left="start" align-top="heroes" margin="5" width="25%" height="26">YOUR OWN DUNGEONS</text>
+  <text id="ownDungeonsTitle" align-left="start" align-top="heroes" margin="5" width="25%" height="26">DEINE DUNGEONS</text>
   <table id="ownDungeons" align-left="start" align-top="ownDungeonsTitle" margin="5" width="25%" height="35%">
     <tr>
       <text width="100%">NAME</text>
@@ -15,19 +15,19 @@
   </table>
   <button id="createDungeon" align-left="start" align-top="ownDungeons" width="250" height="30" margin="5">DUNGEON ERSTELLEN</button>
   <text id="money" align-left="heroes" align-bottom="inventoryTitle" margin="5" width="25%" height="26"></text>
-  <text id="inventoryTitle" align-left="heroes" align-top="title" margin="5" width="25%" height="26">YOUR INVENTORY</text>
+  <text id="inventoryTitle" align-left="heroes" align-top="title" margin="5" width="25%" height="26">DEIN INVENTAR</text>
   <table id="inventory" align-left="heroes" align-top="inventoryTitle" margin="5" width="25%" height="80%">
     <tr>
       <text width="100%">NAME</text>
     </tr>
   </table>
   <button id="openTavern" align-right="inventoryTitle" align-bottom="heroes" width="150" height="30" margin="5">TAVERNE</button>
-  <text id="dungeonsTitle" align-left="inventory" align-top="title" margin="5" width="25%" height="26">ALL DUNGEONS</text>
+  <text id="dungeonsTitle" align-left="inventory" align-top="title" margin="5" width="25%" height="26">ALLE DUNGEONS</text>
   <button id="openShop" align-right="dungeonsTitle" align-bottom="heroes" width="100" height="30" margin="5">SHOP</button>
   <table id="dungeons" align-left="inventory" align-top="dungeonsTitle" margin="5" width="25%" height="80%">
     <tr>
       <text width="50%">NAME</text>
-      <text width="50%">OWNER</text>
+      <text width="50%">BESITZER</text>
     </tr>
   </table>
 </view>

BIN
Spiele Platform/Klient/Fertig/Minigames/x64/DungeonGame/bilder/assets.ltdb


+ 6 - 6
Spiele Platform/Klient/Fertig/Minigames/x64/DungeonGame/views/town.uiml

@@ -1,13 +1,13 @@
 <view>
   <button id="back" width="150" height="26" align-top="start" align-left="start" margin="5">ZURÜCK</button>
-  <text id="title" width="75%" height="100" font-size="24" text-align="center">TOWN</text>
-  <text id="heroesTitle" align-left="start" align-top="title" margin="5" width="25%" height="26">YOUR HEROES</text>
+  <text id="title" width="75%" height="100" font-size="24" text-align="center">STADT</text>
+  <text id="heroesTitle" align-left="start" align-top="title" margin="5" width="25%" height="26">DEINE HELDEN</text>
   <table id="heroes" align-left="start" align-top="heroesTitle" margin="5" width="25%" height="35%">
     <tr>
       <text width="100%">NAME</text>
     </tr>
   </table>
-  <text id="ownDungeonsTitle" align-left="start" align-top="heroes" margin="5" width="25%" height="26">YOUR OWN DUNGEONS</text>
+  <text id="ownDungeonsTitle" align-left="start" align-top="heroes" margin="5" width="25%" height="26">DEINE DUNGEONS</text>
   <table id="ownDungeons" align-left="start" align-top="ownDungeonsTitle" margin="5" width="25%" height="35%">
     <tr>
       <text width="100%">NAME</text>
@@ -15,19 +15,19 @@
   </table>
   <button id="createDungeon" align-left="start" align-top="ownDungeons" width="250" height="30" margin="5">DUNGEON ERSTELLEN</button>
   <text id="money" align-left="heroes" align-bottom="inventoryTitle" margin="5" width="25%" height="26"></text>
-  <text id="inventoryTitle" align-left="heroes" align-top="title" margin="5" width="25%" height="26">YOUR INVENTORY</text>
+  <text id="inventoryTitle" align-left="heroes" align-top="title" margin="5" width="25%" height="26">DEIN INVENTAR</text>
   <table id="inventory" align-left="heroes" align-top="inventoryTitle" margin="5" width="25%" height="80%">
     <tr>
       <text width="100%">NAME</text>
     </tr>
   </table>
   <button id="openTavern" align-right="inventoryTitle" align-bottom="heroes" width="150" height="30" margin="5">TAVERNE</button>
-  <text id="dungeonsTitle" align-left="inventory" align-top="title" margin="5" width="25%" height="26">ALL DUNGEONS</text>
+  <text id="dungeonsTitle" align-left="inventory" align-top="title" margin="5" width="25%" height="26">ALLE DUNGEONS</text>
   <button id="openShop" align-right="dungeonsTitle" align-bottom="heroes" width="100" height="30" margin="5">SHOP</button>
   <table id="dungeons" align-left="inventory" align-top="dungeonsTitle" margin="5" width="25%" height="80%">
     <tr>
       <text width="50%">NAME</text>
-      <text width="50%">OWNER</text>
+      <text width="50%">BESITZER</text>
     </tr>
   </table>
 </view>

+ 1 - 1
Spiele Platform/Klient/Icon

@@ -1 +1 @@
-Subproject commit 3e25bdb7bca207a365df68938bf5deede2d05719
+Subproject commit 1842cbec905cf87277b044af7cd31e6e61b97f85

+ 1 - 1
Spiele Platform/Klient/Minigames/DungeonGame

@@ -1 +1 @@
-Subproject commit 65658fb1f067e3f4135e9c3a30b79a8e9ee50331
+Subproject commit 008318cc1884678b97c4fc4bf8a2badb76a5bf68

+ 1 - 1
Spiele Platform/Klient/Start

@@ -1 +1 @@
-Subproject commit a2459cdab3dd17e2eabe7617377f571bbae71f16
+Subproject commit 8510f702106ccb603db8a09956b5408579364953

+ 1 - 1
Spiele Platform/SMP

@@ -1 +1 @@
-Subproject commit f398a483d8fa7b397299e6295c19dfad24750220
+Subproject commit a9566263091d663822b39269d0630425f075a684