Merge develop into feature/inventory-system

This commit is contained in:
VegaZ
2018-11-26 17:53:25 +01:00
66 changed files with 4533 additions and 1302 deletions

View File

@@ -4,20 +4,30 @@
* @copyright (c) 2008 - 2018 Life of German
*/
let globalData = {
InTuning: false,
HideGui: false
};
require('./CharCreator/index.js');
require('./Login/main.js');
require('./FactionManagement/main.js');
require('./Save/main.js');
require('./DoorManager/doormanager.js');
require('./Gui/deathscreen.js');
require('./Gui/infobox.js');
require('./Gui/nametags.js');
require('./Gui/playerlist.js');
require('./Gui/Inventory/inventory.js');
require('./Login/main.js');
require('./Player/dutycloth.js');
require('./Player/keys.js');
require('./FactionManagement/main.js');
require('./Save/main.js');
require('./Tuning/main.js');
require('./Speedometer/index.js');
require('./Tuning/main.js');