Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@
*.app

build*/
Build*/
.vs/
.vscode/
.idea/
out/
CMakeSettings.json

# Exceptions
.cache/
*.patch
*.patch
6 changes: 3 additions & 3 deletions Premake/ProjectUtil.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ end

systemToExecutableExtensionMap =
{
windows = "exe",
linux = "sh"
windows = ".exe",
linux = ""
}

systemToDynamicLibExtensionMap =
Expand Down Expand Up @@ -491,4 +491,4 @@ if InitBuildSettings == nil then

BuildSettings:SetSilentFailOnDuplicateSetting(silentFailOnDuplicateSetting)
end
end
end
4 changes: 2 additions & 2 deletions Source/Server-Game/Server-Game/ECS/Systems/DatabaseSetup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace ECS::Systems
{ "password", "postgres" }
};

if (!JsonUtils::LoadFromPathOrCreate(gameCache.config, fallback, "Data/config/Database.json"))
if (!JsonUtils::LoadFromPathOrCreate(gameCache.config, fallback, "Data/Config/Database.json"))
{
NC_LOG_CRITICAL("[Database] : Failed to create config file");
}
Expand Down Expand Up @@ -101,4 +101,4 @@ namespace ECS::Systems
{
entt::registry::context& ctx = registry.ctx();
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Itemhandler.h"
#include "ItemHandler.h"
#include "Server-Game/Scripting/Game/Item.h"
#include "Server-Game/Scripting/Game/ItemTemplate.h"
#include "Server-Game/Scripting/Game/ItemWeaponTemplate.h"
Expand Down