Merge branch 'main' into logic

# Conflicts:
#	public/js/game.js
This commit is contained in:
Thorsten Rausch
2021-06-15 17:42:42 +02:00
18 changed files with 7328 additions and 610 deletions

View File

@@ -16,7 +16,10 @@
</head>
<body>
<header>
<div class="title">Projektmanagement Game</div>
<div></div>
<div class="title">PM-Game</div>
<div class="build"><span>DATE_TO_BE_REPLACED</span><span><a href="COMMIT_LINK_TO_BE_REPLACED" target="_blank">COMMIT_TO_BE_REPLACED</a></span>
</div>
</header>
<main>
<div id="login">
@@ -50,8 +53,8 @@
</footer>
<script crossorigin="anonymous" referrerpolicy="no-referrer"
src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pixi.js/6.0.2/browser/pixi.js"></script>
src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.1.2/socket.io.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pixi.js/6.0.4/browser/pixi.js"></script>
<script src="js/Card.js"></script>
<script src="js/Button.js"></script>
<script src="js/Sprite.js"></script>