Merge branch 'develop' into 'master'

inventar revert

See merge request log-gtav/reallife-gamemode!25

ReallifeGamemode.Client/assets/html/inventory/inventory.html

@@ -54,7 +54,7 @@
                 <div class="titletext">Rucksack</div>
             </div>
             <div class="items">
-                <div id="List0"></div>
+                <ul id="List0"></ul>
             </div>
         </div>
     </div>
@@ -74,7 +74,7 @@
                 </div>
             </div>
             <div class="items">
-                <div id="List4"></div>
+                <ul id="List4"></ul>
             </div>
         </div>
     </div>

ReallifeGamemode.Client/index.ts

@@ -7,6 +7,9 @@
 import { IGame } from './game';
 import RageGame from './core/rage-mp/game';
 
+
+var inMenu: boolean = false;
+
 let globalData: IGlobalData = {
     InTuning: false,
     HideGui: false,
@@ -34,8 +37,6 @@ game.events.onPlayerCommand((cmd) => {
     game.events.callServer("Command", cmd.split(' '));
 });
 
-var inMenu = false;
-
 mp.game.vehicle.defaultEngineBehaviour = false;
 
 require('./Gui/house');