Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

2019-10-30 19:27:24 +01:00
parent 36a4af4948 96afbca36d
commit 5274fa654f
41 changed files with 3682 additions and 138 deletions
--- a/ReallifeGamemode.Client/index.ts
+++ b/ReallifeGamemode.Client/index.ts
@@ -80,7 +80,7 @@ Infobox(globalData);
 //nametags();

 import playerList from './Gui/playerlist';
-playerList();
+playerList(globalData);