sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:azerothcore/azerothcore-wotlk.git into gh-master

Browse Source
This commit is contained in:
Yehonal
2016-08-08 13:01:22 +02:00
parent e54bfb31e4 ce20864257
commit 6f7a046575
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/db_assembler/db_assembler.sh
+6 -1
View File
@@ -1,6 +1,11 @@
#!/bin/bash #!/bin/bash
SRCPATH=$(readlink -f "../../") unamestr=`uname`
if [[ "$unamestr" == 'Darwin' ]]; then
SRCPATH=$(greadlink -f "../../")
else
SRCPATH=$(readlink -f "../../")
fi
source $SRCPATH"/bin/bash_shared/includes.sh" source $SRCPATH"/bin/bash_shared/includes.sh"
modules/dep/recastnavigation/Detour/DetourNavMesh.h
+1 -1
View File
@@ -30,7 +30,7 @@
#include <linux/types.h> #include <linux/types.h>
#endif #endif
#endif #endif
typedef uint64_t uint64; typedef unsigned long uint64;
#endif #endif
// Note: If you want to use 64-bit refs, change the types of both dtPolyRef & dtTileRef. // Note: If you want to use 64-bit refs, change the types of both dtPolyRef & dtTileRef.
src/server/authserver/authserver.conf.dist
+2 -2
View File
@@ -244,9 +244,9 @@ WrongPass.BanType = 0
# section my.ini) # section my.ini)
# ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on # ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on
# Unix/Linux) # Unix/Linux)
# Default: "127.0.0.1;3306;trinity;trinity;auth" # Default: "127.0.0.1;3306;root;root;auth"
LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth" LoginDatabaseInfo = "127.0.0.1;3306;root;root;auth"
# #
# LoginDatabase.WorkerThreads # LoginDatabase.WorkerThreads
src/server/game/World/World.cpp
+1 -1
View File
@@ -444,7 +444,7 @@ void World::LoadConfigSettings(bool reload)
///- Read the player limit and the Message of the day from the config file ///- Read the player limit and the Message of the day from the config file
if (!reload) if (!reload)
SetPlayerAmountLimit(sConfigMgr->GetIntDefault("PlayerLimit", 100)); SetPlayerAmountLimit(sConfigMgr->GetIntDefault("PlayerLimit", 100));
SetMotd(sConfigMgr->GetStringDefault("Motd", "Welcome to a Sunwell Core Server.")); SetMotd(sConfigMgr->GetStringDefault("Motd", "Welcome to an AzerothCore server"));
///- Read ticket system setting from the config file ///- Read ticket system setting from the config file
m_bool_configs[CONFIG_ALLOW_TICKETS] = sConfigMgr->GetBoolDefault("AllowTickets", true); m_bool_configs[CONFIG_ALLOW_TICKETS] = sConfigMgr->GetBoolDefault("AllowTickets", true);
src/server/worldserver/worldserver.conf.dist
+6 -6
View File
@@ -83,13 +83,13 @@ LogsDir = ""
# section my.ini) # section my.ini)
# ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on # ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on
# Unix/Linux) # Unix/Linux)
# Default: "127.0.0.1;3306;trinity;trinity;auth" - (LoginDatabaseInfo) # Default: "127.0.0.1;3306;root;root;auth" - (LoginDatabaseInfo)
# "127.0.0.1;3306;trinity;trinity;world" - (WorldDatabaseInfo) # "127.0.0.1;3306;root;root;world" - (WorldDatabaseInfo)
# "127.0.0.1;3306;trinity;trinity;characters" - (CharacterDatabaseInfo) # "127.0.0.1;3306;root;root;characters" - (CharacterDatabaseInfo)
LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth" LoginDatabaseInfo = "127.0.0.1;3306;root;root;auth"
WorldDatabaseInfo = "127.0.0.1;3306;trinity;trinity;world" WorldDatabaseInfo = "127.0.0.1;3306;root;root;world"
CharacterDatabaseInfo = "127.0.0.1;3306;trinity;trinity;characters" CharacterDatabaseInfo = "127.0.0.1;3306;root;root;characters"
# #
# LoginDatabase.WorkerThreads # LoginDatabase.WorkerThreads