Browse Source

release.bat zum automatischen veröffentlichen einer neuen clientversion in der console hinzugefügt

Kolja Strohm 5 years ago
parent
commit
b836681e1a

+ 1 - 1
Allgemein/Framework

@@ -1 +1 @@
-Subproject commit 21bf06e339242c283a21d30bde329f030775b4f2
+Subproject commit bf71f34867e1fcc439ec2dd8d85a0ddb215ea6fe

+ 1 - 1
Allgemein/GSL

@@ -1 +1 @@
-Subproject commit 8af39cd3744395456b3161a1377be8b65ebe3a2b
+Subproject commit 73c3332fbbf304532bef4dc44da1cd225998db1e

+ 1 - 1
Allgemein/Network

@@ -1 +1 @@
-Subproject commit 5fc322cad6f1ad790f9c2763ed2024a241a4ba39
+Subproject commit 707331a727fd8eb5a19ccdb4f264ef93eab28510

+ 0 - 0
Spiele Platform/Klient/Fertig/Debug/Minigames/x64/test.txt


+ 66 - 0
Spiele Platform/Klient/Fertig/Debug/x64/debugWindow/Eula.txt

@@ -0,0 +1,66 @@
+SYSINTERNALS SOFTWARE LICENSE TERMS
+
+These license terms are an agreement between Sysinternals (a wholly owned subsidiary of Microsoft Corporation) and you.  Please read them.  They apply to the software you are downloading from Systinternals.com, which includes the media on which you received it, if any.  The terms also apply to any Sysinternals
+
+* updates,
+* supplements,
+* Internet-based services, and 
+* support services
+
+for this software, unless other terms accompany those items.  If so, those terms apply.
+
+BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS.  IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.
+
+If you comply with these license terms, you have the rights below.
+
+1. INSTALLATION AND USE RIGHTS.  You may install and use any number of copies of the software on your devices.
+
+2. SCOPE OF LICENSE.  The software is licensed, not sold. This agreement only gives you some rights to use the software.  Sysinternals reserves all other rights.  Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement.  In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways.
+
+You may not:
+
+* work around any technical limitations in the binary versions of the software;
+* reverse engineer, decompile or disassemble the binary versions of the software, except and only to the extent that 
+applicable law expressly permits, despite this limitation;
+* make more copies of the software than specified in this agreement or allowed by applicable law, despite this limitation;
+* publish the software for others to copy;
+* rent, lease or lend the software;
+* transfer the software or this agreement to any third party; or
+* use the software for commercial software hosting services.
+
+3. DOCUMENTATION.  Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.
+
+4. EXPORT RESTRICTIONS.  The software is subject to United States export laws and regulations.  You must comply with all domestic and international export laws and regulations that apply to the software.  These laws include restrictions on destinations, end users and end use.  For additional information, see www.microsoft.com/exporting.
+
+5. SUPPORT SERVICES. Because this software is “as is,” we may not provide support services for it.
+
+6. ENTIRE AGREEMENT.  This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.
+
+7. APPLICABLE LAW.
+a. United States.  If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles.  The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.
+b. Outside the United States.  If you acquired the software in any other country, the laws of that country apply.
+
+8. LEGAL EFFECT.  This agreement describes certain legal rights.  You may have other rights under the laws of your country.  You may also have rights with respect to the party from whom you acquired the software.  This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.
+
+9. DISCLAIMER OF WARRANTY.   THE SOFTWARE IS LICENSED “AS-IS.”  YOU BEAR THE RISK OF USING IT.  SYSINTERNALS GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS.  YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE.  TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, SYSINTERNALS EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+10. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES.  YOU CAN RECOVER FROM SYSINTERNALS AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00.  YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
+
+This limitation applies to
+* anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and
+* claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.
+It also applies even if Sysinternals knew or should have known about the possibility of the damages.  The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.
+
+Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.
+
+Remarque : Ce logiciel étant distribué au Québec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en français.
+
+EXONÉRATION DE GARANTIE. Le logiciel visé par une licence est offert « tel quel ». Toute utilisation de ce logiciel est à votre seule risque et péril. Sysinternals n’accorde aucune autre garantie expresse. Vous pouvez bénéficier de droits additionnels en vertu du droit local sur la protection dues consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualité marchande, d’adéquation à un usage particulier et d’absence de contrefaçon sont exclues.
+
+LIMITATION DES DOMMAGES-INTÉRÊTS ET EXCLUSION DE RESPONSABILITÉ POUR LES DOMMAGES.  Vous pouvez obtenir de Sysinternals et de ses fournisseurs une indemnisation en cas de dommages directs uniquement à hauteur de 5,00 $ US. Vous ne pouvez prétendre à aucune indemnisation pour les autres dommages, y compris les dommages spéciaux, indirects ou accessoires et pertes de bénéfices.
+Cette limitation concerne :
+* tout  ce qui est relié au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et
+* les réclamations au titre de violation de contrat ou de garantie, ou au titre de responsabilité stricte, de négligence ou d’une autre faute dans la limite autorisée par la loi en vigueur.
+Elle s’applique également, même si Sysinternals connaissait ou devrait connaître l’éventualité d’un tel dommage.  Si votre pays n’autorise pas l’exclusion ou la limitation de responsabilité pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l’exclusion ci-dessus ne s’appliquera pas à votre égard.
+
+EFFET JURIDIQUE.  Le présent contrat décrit certains droits juridiques. Vous pourriez avoir d’autres droits prévus par les lois de votre pays.  Le présent contrat ne modifie pas les droits que vous confèrent les lois de votre pays si celles-ci ne le permettent pas.

BIN
Spiele Platform/Klient/Fertig/Debug/x64/debugWindow/dbgview.chm


+ 17 - 26
Spiele Platform/Klient/Include/BilderV.h

@@ -1,27 +1,18 @@
-#ifndef BilderV_H
-#define BilderV_H
-
-#include <Text.h>
-#include <Bild.h>
-
-using namespace Framework;
-
-class BilderV
-{
-public:
-	// nicht constant
-	virtual bool add( const char *name, Bild *bild ) = 0;
-	virtual bool set( const char *name, Bild *bild ) = 0;
-	virtual bool remove( const char *name ) = 0;
-	virtual void setNext( BilderV *next ) = 0;
-	virtual void deleteAll() = 0;
-	virtual void release() = 0;
-	// constant
-	virtual Bild *get( const char *name ) const = 0;
-	virtual Bild *z( const char *name ) const = 0;
-	virtual Bild *zThis() const = 0;
-	virtual BilderV *zNext() const = 0;
-	virtual char *getName() const = 0;
-};
-
+#ifndef BilderV_H
+#define BilderV_H
+
+#include <Text.h>
+#include <Bild.h>
+
+using namespace Framework;
+
+class BilderV
+{
+public:
+	// nicht constant
+    virtual Bild *get( const char *path ) = 0;
+    virtual BilderV *getThis() = 0;
+	virtual BilderV *release() = 0;
+};
+
 #endif

+ 45 - 42
Spiele Platform/Klient/Include/MiniGameV.h

@@ -1,43 +1,46 @@
-#ifndef MiniGameV_H
-#define MiniGameV_H
-
-#include <MausEreignis.h>
-#include <TastaturEreignis.h>
-#include <Bildschirm.h>
-#include <Schrift.h>
-
-using namespace Framework;
-
-namespace KSGClient
-{
-    class MinigameServerClient;
-}
-
-class MinigameAPI
-{
-public:
-    // legt fest ob das spiel im Vollbildmodus ausgeführt werden soll
-    virtual void setFullScreenMode( bool enabled ) = 0;
-};
-
-class MiniGameV
-{
-public:
-	// nicht constant
-	virtual bool laden() = 0;
-    virtual void setMinigameClientZ( KSGClient::MinigameServerClient *client ) = 0;
-    virtual void setMinigameAPI( MinigameAPI *api ) = 0;
-	virtual void doMausEreignis( MausEreignis &me ) = 0;
-	virtual void doTastaturEreignis( TastaturEreignis &te ) = 0;
-	virtual bool tick( double zeit ) = 0;
-	virtual void render( Bild &zRObj ) = 0;
-	virtual void setSchriftZ( Schrift *schrift ) = 0;
-	virtual void setBildschirmZ( Bildschirm *zScreen ) = 0;
-	// constant
-	virtual bool istEnde() const = 0;
-	// Reference Counting
-	virtual MiniGameV *getThis() = 0;
-	virtual MiniGameV *release() = 0;
-};
-
+#ifndef MiniGameV_H
+#define MiniGameV_H
+
+#include <MausEreignis.h>
+#include <TastaturEreignis.h>
+#include <Bildschirm.h>
+#include <Schrift.h>
+
+using namespace Framework;
+
+namespace KSGClient
+{
+    class MinigameServerClient;
+}
+
+class MinigameAPI
+{
+public:
+    // legt fest ob das spiel im Vollbildmodus ausgeführt werden soll
+    virtual void setFullScreenMode( bool enabled ) = 0;
+    virtual void showLoadingOverlay( unsigned char minAlpha ) = 0;
+    virtual void hideLoadingOverlay() = 0;
+    virtual Bild *loadBild( const char *path ) = 0;
+};
+
+class MiniGameV
+{
+public:
+	// nicht constant
+	virtual bool laden() = 0;
+    virtual void setMinigameClientZ( KSGClient::MinigameServerClient *client ) = 0;
+    virtual void setMinigameAPI( MinigameAPI *api ) = 0;
+	virtual void doMausEreignis( MausEreignis &me ) = 0;
+	virtual void doTastaturEreignis( TastaturEreignis &te ) = 0;
+	virtual bool tick( double zeit ) = 0;
+	virtual void render( Bild &zRObj ) = 0;
+	virtual void setSchriftZ( Schrift *schrift ) = 0;
+	virtual void setBildschirmZ( Bildschirm *zScreen ) = 0;
+	// constant
+	virtual bool istEnde() const = 0;
+	// Reference Counting
+	virtual MiniGameV *getThis() = 0;
+	virtual MiniGameV *release() = 0;
+};
+
 #endif

+ 1 - 1
Spiele Platform/Klient/KSGClient

@@ -1 +1 @@
-Subproject commit 8dde06fa63a640b4457de8d6838ea40a63c87ac1
+Subproject commit 87fd7f9339c5a953e0e8b58d543ea74a0bce3a4c

+ 1 - 1
Spiele Platform/Klient/KSGNetwork

@@ -1 +1 @@
-Subproject commit 55ac9c6a096cdb8f7ecb578bce059a64090730e8
+Subproject commit 94f67e5c92aba308cd6ff214736bfc58e1d761a5

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

@@ -1 +1 @@
-Subproject commit 878313adde30e28a2fb8bd74e6fa62a8966218dc
+Subproject commit 16631614e6200d1e09bed45963535fe3e35a9454

+ 1 - 1
Spiele Platform/Klient/Start

@@ -1 +1 @@
-Subproject commit ce34501a2311b2c2ffa51f65d2e2c40bedf48cfe
+Subproject commit 4a2a93ef34a6c0b3a0410a2f9c91aedaf7bab24b

+ 1 - 1
Spiele Platform/Klient/patcher

@@ -1 +1 @@
-Subproject commit eb94942630f897bce96aab3da1903d1a07426629
+Subproject commit adb6ed7bf5a8924523f7de480af6772153e1ba6a

+ 1 - 1
Spiele Platform/SMP

@@ -1 +1 @@
-Subproject commit 74bc6977b03db6388c43ca1d243d37fb9b5a7fb5
+Subproject commit e97b04efe0ed902b950619b08f2fdd32e19eb0f4

+ 1 - 1
Spiele Platform/Server/Historie Server

@@ -1 +1 @@
-Subproject commit e9e3ddc24c66ecd0b902ade9fcdd33cae347128c
+Subproject commit c01ab797b346d3b56175843323205803206c67b8

+ 1 - 1
Spiele Platform/Server/Minigame Server

@@ -1 +1 @@
-Subproject commit 5ada7f29f993ac80601f68dbc5e09a3b829dc2ab
+Subproject commit 7fe5c9e8019ab81e6e7953b994063c1125765676

+ 1 - 1
Spiele Platform/Server/Patch Server

@@ -1 +1 @@
-Subproject commit 16a65e6b43bb90dd5660e2c7ef9bb83e10f4d002
+Subproject commit 4f0999a6217c22fb4b18565b653f319477430587

+ 1 - 1
Spiele Platform/Server/Spiel Server

@@ -1 +1 @@
-Subproject commit 56baa85906a4cc91a166c8d410ae8a965009a4c1
+Subproject commit 0feb42436e8541776c2ae7ca6d0c13085c418a86

+ 1 - 1
Spiele Platform/Spiele/Klient/Asteroids

@@ -1 +1 @@
-Subproject commit cdb1371f198a7a9b9f89e81ccc387ac89890742d
+Subproject commit db90bae0415387c82a2a2c2a14780498ff456a36

+ 1 - 1
Spiele Platform/Spiele/Klient/Linie

@@ -1 +1 @@
-Subproject commit 41065ff70599caa33572e1089f0bfe066fac05a9
+Subproject commit d888559eab1aa00344d60fae26371f39850a04ef

+ 1 - 1
Spiele Platform/Spiele/Server/Asteroids

@@ -1 +1 @@
-Subproject commit 1dc1a3de9260535c60b4067266ac9a2a925e8e60
+Subproject commit 8c1743b04e2de9e28f5552b2a5f0eaef4502b325

+ 5 - 0
release.bat

@@ -0,0 +1,5 @@
+@echo off
+
+cd "Spiele Platform/SMP/Fertig/x64"
+smph.exe
+cd "../../../.."