Merge branch 'develop' into 'master'

inventar revert

See merge request log-gtav/reallife-gamemode!25
This commit is contained in:
hydrant
2021-04-03 15:56:48 +00:00
2 changed files with 5 additions and 4 deletions

View File

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

View File

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