Merge branch 'develop' into 'feature/atm-system'
# Conflicts: # ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
This commit is contained in:
@@ -11,6 +11,9 @@ let globalData: GlobalData = {
|
||||
InChat: false,
|
||||
};
|
||||
|
||||
import handMoney from './Gui/handmoney'
|
||||
handMoney();
|
||||
|
||||
import business from './Business/main';
|
||||
business();
|
||||
|
||||
@@ -53,6 +56,9 @@ interiors(globalData);
|
||||
import factionInteraction from './Interaction/factioninteraction';
|
||||
factionInteraction(globalData);
|
||||
|
||||
import worldInteraction from './Interaction/worldinteraction';
|
||||
worldInteraction();
|
||||
|
||||
import playerInteraction from './Interaction/playerinteraction';
|
||||
playerInteraction(globalData);
|
||||
|
||||
@@ -68,8 +74,8 @@ keys(globalData);
|
||||
import quitHandler from './Player/quit';
|
||||
quitHandler();
|
||||
|
||||
import freecam from './Player/freecam';
|
||||
freecam();
|
||||
import freeCam from './Player/freecam';
|
||||
freeCam();
|
||||
|
||||
import saveManager from './Save/main';
|
||||
saveManager();
|
||||
|
||||
Reference in New Issue
Block a user