Merge develop into feature/inventory-system

Client/Player/keys.js

@@ -7,7 +7,11 @@
 //https://docs.microsoft.com/de-de/windows/desktop/inputdev/virtual-key-codes
 
 var chat = false;
+<<<<<<< HEAD
 var showInventory = false;
+=======
+var showGui = true;
+>>>>>>> develop
 
 //ENTER
 mp.keys.bind(0x0D, false, function () {
@@ -16,7 +20,32 @@ mp.keys.bind(0x0D, false, function () {
     }
 });
 
-//I
+
+//F7 //Unshowalles
+mp.keys.bind(0x76, false, function () {
+    if (showGui === true) {
+        showGui = false;
+        mp.events.call("toggleUi", false);
+    } else {
+        showGui = true;
+        mp.events.call("toggleUi", true);
+    }
+});
+
+//NUM2 //Save Blips in Edit Mode
+mp.keys.bind(0x62, false, function () {
+    mp.events.callRemote("keyPress:NUM2");
+});
+
+//E
+mp.keys.bind(0x45, false, function () {
+    if (!chat) {
+        mp.events.callRemote("keyPress:E");
+    }
+});
+
+
+//I //Spielerliste
 mp.keys.bind(0x49, false, function () {
     if (!chat) {
         mp.events.callRemote("keyPress:I");
@@ -24,6 +53,7 @@ mp.keys.bind(0x49, false, function () {
     }
 });
 
+<<<<<<< HEAD
 //J
 mp.keys.bind(0x4A, false, function () {
     if (showInventory === false) {
@@ -36,6 +66,23 @@ mp.keys.bind(0x4A, false, function () {
 });
 
 //N
+=======
+//K //Dienstkleidung
+mp.keys.bind(0x4B, false, function () {
+    if (!chat) {
+        mp.events.callRemote("keyPress:K");
+    }
+});
+
+//L //Türen auf / zuschließen
+mp.keys.bind(0x4C, false, function () {
+    if (!chat) {
+        mp.events.callRemote("keyPress:L");
+    }
+});
+
+//N //Motor Starten
+>>>>>>> develop
 mp.keys.bind(0x4E, false, function () {
     if (!chat) {
         mp.events.callRemote("keyPress:N");
@@ -49,9 +96,10 @@ mp.keys.bind(0x54, false, function () {
     }
 });
 
-//X
+//X //Anschnallen 
 mp.keys.bind(0x58, false, function () {
     if (!chat) {
         mp.events.callRemote("keyPress:X");
     }
 });
+