Merge branch '4.3.4' into Gitlab434_4.3.4
This commit is contained in:
commit
bc8f5194c4
859 files changed
+97668
-87701
No files matched your search
@@ -16,3 +16,4 @@ CMakeLists.txt.user
|
||||
*.BACKUP.*
|
||||
*.BASE.*
|
||||
*.LOCAL.*
|
||||
nbproject/*
|
||||
+2
-2
@@ -12,13 +12,13 @@ before_install:
|
||||
- sudo apt-get -qq update
|
||||
- sudo apt-get -qq install build-essential libtool gcc-4.8 g++-4.8 make cmake openssl
|
||||
- sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libzmq3-dev
|
||||
- sudo apt-get -qq install libboost1.55-dev libboost-thread1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev
|
||||
- sudo apt-get -qq install libboost1.55-dev libboost-thread1.55-dev libboost-filesystem1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev libboost-iostreams1.55-dev
|
||||
|
||||
install:
|
||||
- mysql -uroot -e 'create database test_mysql;'
|
||||
- mkdir bin
|
||||
- cd bin
|
||||
- cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=1 -DSERVERS=1 -DNOJEM=1 -DCMAKE_BUILD_TYPE=Release
|
||||
- cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=1 -DSERVERS=1 -DNOJEM=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror"
|
||||
|
||||
script:
|
||||
- cd ..
|
||||
|
||||
+3
-1
@@ -50,6 +50,8 @@ endif()
|
||||
|
||||
include(CheckPlatform)
|
||||
|
||||
include(GroupSources)
|
||||
|
||||
# basic packagesearching and setup (further support will be needed, this is a preliminary release!)
|
||||
set(OPENSSL_EXPECTED_VERSION 1.0.0)
|
||||
|
||||
@@ -81,4 +83,4 @@ include(cmake/showoptions.cmake)
|
||||
add_subdirectory(dep)
|
||||
|
||||
# add core sources
|
||||
add_subdirectory(src)
|
||||
add_subdirectory(src)
|
||||
+1
-1
@@ -20,4 +20,4 @@
|
||||
# set(CMAKE_INSTALL_PREFIX
|
||||
# "" CACHE PATH "Default install path")
|
||||
# endif()
|
||||
#endif()
|
||||
#endif()
|
||||
@@ -4,10 +4,10 @@
|
||||
|
||||
## Build Status
|
||||
|
||||
6.x | 4.3.4 | 3.3.5
|
||||
:------------: | :------------: | :------------:
|
||||
[](https://travis-ci.org/TrinityCore/TrinityCore) | [](https://travis-ci.org/TrinityCore/TrinityCore) | [](https://travis-ci.org/TrinityCore/TrinityCore)
|
||||
[](https://scan.coverity.com/projects/435) | | [](https://scan.coverity.com/projects/4656)
|
||||
6.x | 3.3.5
|
||||
:------------: | :------------:
|
||||
[](https://travis-ci.org/TrinityCore/TrinityCore) | [](https://travis-ci.org/TrinityCore/TrinityCore)
|
||||
[](https://scan.coverity.com/projects/435) | [](https://scan.coverity.com/projects/4656)
|
||||
|
||||
## Introduction
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
add_definitions(-D_BUILD_DIRECTIVE='"$(CONFIGURATION)"')
|
||||
|
||||
if(WITH_WARNINGS)
|
||||
set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors")
|
||||
set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors -Wno-mismatched-tags")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual")
|
||||
message(STATUS "Clang: All warnings enabled")
|
||||
@@ -17,3 +17,4 @@ endif()
|
||||
# -Wno-narrowing needed to suppress a warning in g3d
|
||||
# -Wno-deprecated-register is needed to suppress 185 gsoap warnings on Unix systems.
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1")
|
||||
+7
-9
@@ -12,21 +12,19 @@
|
||||
# This is done EACH compile so they can be alerted about the consequences.
|
||||
|
||||
if(NOT BUILDDIR)
|
||||
# Workaround for funny MSVC behaviour - this segment only run during compile
|
||||
set(NO_GIT ${WITHOUT_GIT})
|
||||
set(GIT_EXEC ${GIT_EXECUTABLE})
|
||||
# Workaround for funny MSVC behaviour - this segment is only used when using cmake gui
|
||||
set(BUILDDIR ${CMAKE_BINARY_DIR})
|
||||
endif()
|
||||
|
||||
if(NO_GIT)
|
||||
if(WITHOUT_GIT)
|
||||
set(rev_date "1970-01-01 00:00:00 +0000")
|
||||
set(rev_hash "unknown")
|
||||
set(rev_branch "Archived")
|
||||
else()
|
||||
if(GIT_EXEC)
|
||||
if(GIT_EXECUTABLE)
|
||||
# Create a revision-string that we can use
|
||||
execute_process(
|
||||
COMMAND "${GIT_EXEC}" describe --match init --dirty=+ --abbrev=12
|
||||
COMMAND "${GIT_EXECUTABLE}" describe --match init --dirty=+ --abbrev=12
|
||||
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
|
||||
OUTPUT_VARIABLE rev_info
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
@@ -35,7 +33,7 @@ else()
|
||||
|
||||
# And grab the commits timestamp
|
||||
execute_process(
|
||||
COMMAND "${GIT_EXEC}" show -s --format=%ci
|
||||
COMMAND "${GIT_EXECUTABLE}" show -s --format=%ci
|
||||
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
|
||||
OUTPUT_VARIABLE rev_date
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
@@ -44,7 +42,7 @@ else()
|
||||
|
||||
# Also retrieve branch name
|
||||
execute_process(
|
||||
COMMAND "${GIT_EXEC}" rev-parse --abbrev-ref HEAD
|
||||
COMMAND "${GIT_EXECUTABLE}" rev-parse --abbrev-ref HEAD
|
||||
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
|
||||
OUTPUT_VARIABLE rev_branch
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
@@ -69,7 +67,7 @@ else()
|
||||
endif()
|
||||
|
||||
# Create the actual revision.h file from the above params
|
||||
if(NOT "${rev_hash_cached}" MATCHES "${rev_hash}" OR NOT "${rev_branch_cached}" MATCHES "${rev_branch}")
|
||||
if(NOT "${rev_hash_cached}" MATCHES "${rev_hash}" OR NOT "${rev_branch_cached}" MATCHES "${rev_branch}" OR NOT EXISTS "${BUILDDIR}/revision.h")
|
||||
configure_file(
|
||||
"${CMAKE_SOURCE_DIR}/revision.h.in.cmake"
|
||||
"${BUILDDIR}/revision.h"
|
||||
|
||||
@@ -7,8 +7,6 @@ else()
|
||||
MESSAGE(STATUS "Detected 32-bit platform")
|
||||
endif()
|
||||
|
||||
include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.cmake")
|
||||
|
||||
if(WIN32)
|
||||
include("${CMAKE_SOURCE_DIR}/cmake/platform/win/settings.cmake")
|
||||
elseif(UNIX)
|
||||
|
||||
@@ -1,35 +1,60 @@
|
||||
macro(get_WIN32_WINNT version)
|
||||
if (WIN32 AND CMAKE_SYSTEM_VERSION)
|
||||
set(ver ${CMAKE_SYSTEM_VERSION})
|
||||
string(REPLACE "." "" ver ${ver})
|
||||
string(REGEX REPLACE "([0-9])" "0\\1" ver ${ver})
|
||||
|
||||
set(${version} "0x${ver}")
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
if(WIN32)
|
||||
set(BOOST_DEBUG ON)
|
||||
if(DEFINED ENV{BOOST_ROOT})
|
||||
set(BOOST_ROOT $ENV{BOOST_ROOT})
|
||||
set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0)
|
||||
else()
|
||||
message(FATAL_ERROR "No BOOST_ROOT environment variable could be found! Please make sure it is set and the points to your Boost installation.")
|
||||
endif()
|
||||
|
||||
set(Boost_USE_STATIC_LIBS ON)
|
||||
set(Boost_USE_MULTITHREADED ON)
|
||||
set(Boost_USE_STATIC_RUNTIME OFF)
|
||||
|
||||
get_WIN32_WINNT(ver)
|
||||
add_definitions(-D_WIN32_WINNT=${ver})
|
||||
endif()
|
||||
|
||||
find_package(Boost 1.49 REQUIRED system thread program_options)
|
||||
add_definitions(-DBOOST_DATE_TIME_NO_LIB)
|
||||
add_definitions(-DBOOST_REGEX_NO_LIB)
|
||||
add_definitions(-DBOOST_CHRONO_NO_LIB)
|
||||
|
||||
if(Boost_FOUND)
|
||||
include_directories(${Boost_INCLUDE_DIRS})
|
||||
endif()
|
||||
macro(get_WIN32_WINNT version)
|
||||
if (WIN32 AND CMAKE_SYSTEM_VERSION)
|
||||
set(ver ${CMAKE_SYSTEM_VERSION})
|
||||
string(REPLACE "." "" ver ${ver})
|
||||
string(REGEX REPLACE "([0-9])" "0\\1" ver ${ver})
|
||||
|
||||
set(${version} "0x${ver}")
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
if(WIN32)
|
||||
set(BOOST_DEBUG ON)
|
||||
if(DEFINED ENV{BOOST_ROOT})
|
||||
set(BOOST_ROOT $ENV{BOOST_ROOT})
|
||||
set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0)
|
||||
else()
|
||||
message(FATAL_ERROR "No BOOST_ROOT environment variable could be found! Please make sure it is set and the points to your Boost installation.")
|
||||
endif()
|
||||
|
||||
set(Boost_USE_STATIC_LIBS ON)
|
||||
set(Boost_USE_MULTITHREADED ON)
|
||||
set(Boost_USE_STATIC_RUNTIME OFF)
|
||||
|
||||
get_WIN32_WINNT(ver)
|
||||
add_definitions(-D_WIN32_WINNT=${ver})
|
||||
endif()
|
||||
|
||||
find_package(Boost 1.49 REQUIRED system filesystem thread program_options iostreams)
|
||||
add_definitions(-DBOOST_DATE_TIME_NO_LIB)
|
||||
add_definitions(-DBOOST_REGEX_NO_LIB)
|
||||
add_definitions(-DBOOST_CHRONO_NO_LIB)
|
||||
|
||||
# Find if Boost was compiled in C++03 mode because it requires -DBOOST_NO_CXX11_SCOPED_ENUMS
|
||||
|
||||
include (CheckCXXSourceCompiles)
|
||||
|
||||
set(CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIR})
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_IOSTREAMS_LIBRARY})
|
||||
set(CMAKE_REQUIRED_FLAGS "-std=c++11")
|
||||
unset(boost_filesystem_copy_links_without_NO_SCOPED_ENUM CACHE)
|
||||
check_cxx_source_compiles("
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
int main() { boost::filesystem::copy_file(boost::filesystem::path(), boost::filesystem::path()); }"
|
||||
boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
|
||||
unset(CMAKE_REQUIRED_INCLUDES CACHE)
|
||||
unset(CMAKE_REQUIRED_LIBRARIES CACHE)
|
||||
unset(CMAKE_REQUIRED_FLAGS CACHE)
|
||||
|
||||
if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
|
||||
if (Boost_VERSION LESS 105100) # 1.51
|
||||
add_definitions(-DBOOST_NO_SCOPED_ENUMS)
|
||||
else()
|
||||
add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(Boost_FOUND)
|
||||
include_directories(${Boost_INCLUDE_DIRS})
|
||||
endif()
|
||||
+1235
-1166
File diff suppressed because it is too large.
Load diff
@@ -5,6 +5,7 @@
|
||||
# This module defines
|
||||
# MYSQL_INCLUDE_DIR, where to find mysql.h
|
||||
# MYSQL_LIBRARIES, the libraries to link against to connect to MySQL
|
||||
# MYSQL_EXECUTABLE, the MySQL executable.
|
||||
# MYSQL_FOUND, if false, you cannot build anything that requires MySQL.
|
||||
|
||||
# also defined, but not for general use are
|
||||
@@ -62,6 +63,19 @@ if( UNIX )
|
||||
endif( MYSQL_CONFIG )
|
||||
endif( UNIX )
|
||||
|
||||
if( WIN32 )
|
||||
# read environment variables and change \ to /
|
||||
SET(PROGRAM_FILES_32 $ENV{ProgramFiles})
|
||||
if (${PROGRAM_FILES_32})
|
||||
STRING(REPLACE "\\\\" "/" PROGRAM_FILES_32 ${PROGRAM_FILES_32})
|
||||
endif(${PROGRAM_FILES_32})
|
||||
|
||||
SET(PROGRAM_FILES_64 $ENV{ProgramW6432})
|
||||
if (${PROGRAM_FILES_64})
|
||||
STRING(REPLACE "\\\\" "/" PROGRAM_FILES_64 ${PROGRAM_FILES_64})
|
||||
endif(${PROGRAM_FILES_64})
|
||||
endif ( WIN32 )
|
||||
|
||||
find_path(MYSQL_INCLUDE_DIR
|
||||
NAMES
|
||||
mysql.h
|
||||
@@ -72,28 +86,17 @@ find_path(MYSQL_INCLUDE_DIR
|
||||
/usr/local/include
|
||||
/usr/local/include/mysql
|
||||
/usr/local/mysql/include
|
||||
"C:/Program Files/MySQL/MySQL Server 5.6/include"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.5/include"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.1/include"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.0/include"
|
||||
"C:/Program Files/MySQL/include"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.6/include"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.5/include"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.1/include"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.0/include"
|
||||
"C:/Program Files (x86)/MySQL/include"
|
||||
"${PROGRAM_FILES_64}/MySQL/*/include"
|
||||
"${PROGRAM_FILES_64}/MySQL/include"
|
||||
"${PROGRAM_FILES_32}/MySQL/*/include"
|
||||
"${PROGRAM_FILES_32}/MySQL/include"
|
||||
"C:/MySQL/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/include"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/include"
|
||||
"$ENV{ProgramFiles}/MySQL/*/include"
|
||||
"$ENV{SystemDrive}/MySQL/*/include"
|
||||
"c:/msys/local/include"
|
||||
"$ENV{MYSQL_ROOT}/include"
|
||||
DOC
|
||||
"Specify the directory containing mysql.h."
|
||||
)
|
||||
@@ -121,44 +124,21 @@ if( WIN32 )
|
||||
libmysql
|
||||
PATHS
|
||||
${MYSQL_ADD_LIBRARIES_PATH}
|
||||
"C:/Program Files/MySQL/MySQL Server 5.6/lib"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.6/lib/opt"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.5/lib"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.5/lib/opt"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.1/lib"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.1/lib/opt"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.0/lib"
|
||||
"C:/Program Files/MySQL/MySQL Server 5.0/lib/opt"
|
||||
"C:/Program Files/MySQL/lib"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.6/lib"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.6/lib/opt"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.5/lib"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.5/lib/opt"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.1/lib"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.1/lib/opt"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.0/lib"
|
||||
"C:/Program Files (x86)/MySQL/MySQL Server 5.0/lib/opt"
|
||||
"C:/Program Files (x86)/MySQL/lib"
|
||||
"${PROGRAM_FILES_64}/MySQL/*/lib"
|
||||
"${PROGRAM_FILES_64}/MySQL/*/lib/opt"
|
||||
"${PROGRAM_FILES_64}/MySQL/lib"
|
||||
"${PROGRAM_FILES_32}/MySQL/*/lib"
|
||||
"${PROGRAM_FILES_32}/MySQL/*/lib/opt"
|
||||
"${PROGRAM_FILES_32}/MySQL/lib"
|
||||
"C:/MySQL/lib/debug"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/lib/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/lib"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/lib/opt"
|
||||
"$ENV{ProgramFiles}/MySQL/*/lib/opt"
|
||||
"$ENV{SystemDrive}/MySQL/*/lib/opt"
|
||||
"c:/msys/local/include"
|
||||
"$ENV{MYSQL_ROOT}/lib"
|
||||
DOC "Specify the location of the mysql library here."
|
||||
)
|
||||
endif( WIN32 )
|
||||
@@ -180,6 +160,41 @@ else( NOT WIN32 )
|
||||
set( MYSQL_EXTRA_LIBRARIES "" )
|
||||
endif( NOT WIN32 )
|
||||
|
||||
if( UNIX )
|
||||
find_program(MYSQL_EXECUTABLE mysql
|
||||
PATHS
|
||||
${MYSQL_CONFIG_PREFER_PATH}
|
||||
/usr/local/mysql/bin/
|
||||
/usr/local/bin/
|
||||
/usr/bin/
|
||||
DOC
|
||||
"path to your mysql binary."
|
||||
)
|
||||
endif( UNIX )
|
||||
|
||||
if( WIN32 )
|
||||
find_program(MYSQL_EXECUTABLE mysql
|
||||
PATHS
|
||||
"${PROGRAM_FILES_64}/MySQL/*/bin"
|
||||
"${PROGRAM_FILES_64}/MySQL/*/bin/opt"
|
||||
"${PROGRAM_FILES_64}/MySQL/bin"
|
||||
"${PROGRAM_FILES_32}/MySQL/*/bin"
|
||||
"${PROGRAM_FILES_32}/MySQL/*/bin/opt"
|
||||
"${PROGRAM_FILES_32}/MySQL/bin"
|
||||
"C:/MySQL/bin/debug"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/bin/opt"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/bin/opt"
|
||||
"$ENV{ProgramFiles}/MySQL/*/bin/opt"
|
||||
"$ENV{SystemDrive}/MySQL/*/bin/opt"
|
||||
"c:/msys/local/include"
|
||||
"$ENV{MYSQL_ROOT}/bin"
|
||||
DOC
|
||||
"path to your mysql binary."
|
||||
)
|
||||
endif( WIN32 )
|
||||
|
||||
if( MYSQL_LIBRARY )
|
||||
if( MYSQL_INCLUDE_DIR )
|
||||
set( MYSQL_FOUND 1 )
|
||||
@@ -188,7 +203,10 @@ if( MYSQL_LIBRARY )
|
||||
else( MYSQL_INCLUDE_DIR )
|
||||
message(FATAL_ERROR "Could not find MySQL headers! Please install the development libraries and headers")
|
||||
endif( MYSQL_INCLUDE_DIR )
|
||||
mark_as_advanced( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR )
|
||||
if( MYSQL_EXECUTABLE )
|
||||
message(STATUS "Found MySQL executable: ${MYSQL_EXECUTABLE}")
|
||||
endif( MYSQL_EXECUTABLE )
|
||||
mark_as_advanced( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIR MYSQL_EXECUTABLE)
|
||||
else( MYSQL_LIBRARY )
|
||||
message(FATAL_ERROR "Could not find the MySQL libraries! Please install the development libraries and headers")
|
||||
endif( MYSQL_LIBRARY )
|
||||
@@ -0,0 +1,46 @@
|
||||
# Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/>
|
||||
#
|
||||
# This file is free software; as a special exception the author gives
|
||||
# unlimited permission to copy and/or distribute it, with or without
|
||||
# modifications, as long as this notice is preserved.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
macro(GroupSources dir)
|
||||
# Skip this if WITH_SOURCE_TREE is not set (empty string).
|
||||
if (NOT ${_WITH_SOURCE_TREE} STREQUAL "")
|
||||
# Include all header and c files
|
||||
file(GLOB_RECURSE elements RELATIVE ${dir} *.h *.hpp *.c *.cpp *.cc)
|
||||
|
||||
foreach(element ${elements})
|
||||
# Extract filename and directory
|
||||
get_filename_component(element_name ${element} NAME)
|
||||
get_filename_component(element_dir ${element} DIRECTORY)
|
||||
|
||||
if (NOT ${element_dir} STREQUAL "")
|
||||
# If the file is in a subdirectory use it as source group.
|
||||
if (${_WITH_SOURCE_TREE} STREQUAL "flat")
|
||||
# Build flat structure by using only the first subdirectory.
|
||||
string(FIND ${element_dir} "/" delemiter_pos)
|
||||
if (NOT ${delemiter_pos} EQUAL -1)
|
||||
string(SUBSTRING ${element_dir} 0 ${delemiter_pos} group_name)
|
||||
source_group("${group_name}" FILES ${dir}/${element})
|
||||
else()
|
||||
# Build hierarchical structure.
|
||||
# File is in root directory.
|
||||
source_group("${element_dir}" FILES ${dir}/${element})
|
||||
endif()
|
||||
else()
|
||||
# Use the full hierarchical structure to build source_groups.
|
||||
string(REPLACE "/" "\\" group_name ${element_dir})
|
||||
source_group("${group_name}" FILES ${dir}/${element})
|
||||
endif()
|
||||
else()
|
||||
# If the file is in the root directory, place it in the root source_group.
|
||||
source_group("\\" FILES ${dir}/${element})
|
||||
endif()
|
||||
endforeach()
|
||||
endif()
|
||||
endmacro()
|
||||
@@ -15,4 +15,6 @@ option(USE_SCRIPTPCH "Use precompiled headers when compiling scripts"
|
||||
option(USE_COREPCH "Use precompiled headers when compiling servers" 1)
|
||||
option(WITH_WARNINGS "Show all warnings during compile" 0)
|
||||
option(WITH_COREDEBUG "Include additional debug-code in core" 0)
|
||||
set(WITH_SOURCE_TREE "no" CACHE STRING "Build the source tree for IDE's.")
|
||||
set_property(CACHE WITH_SOURCE_TREE PROPERTY STRINGS no flat hierarchical)
|
||||
option(WITHOUT_GIT "Disable the GIT testing routines" 0)
|
||||
@@ -1,5 +0,0 @@
|
||||
# set installation prefix
|
||||
if( PREFIX )
|
||||
set(CMAKE_INSTALL_PREFIX "${PREFIX}")
|
||||
endif()
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
if (NOT NOJEM)
|
||||
set(JEMALLOC_LIBRARY "jemalloc")
|
||||
add_definitions(-DNO_BUFFERPOOL)
|
||||
message(STATUS "UNIX: Using jemalloc")
|
||||
endif()
|
||||
endif()
|
||||
@@ -37,8 +38,8 @@ if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
|
||||
include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
|
||||
elseif(CMAKE_C_COMPILER MATCHES "icc")
|
||||
include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake)
|
||||
elseif(CMAKE_C_COMPILER MATCHES "clang")
|
||||
elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
|
||||
include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
|
||||
else()
|
||||
add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
|
||||
add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
|
||||
endif()
|
||||
+27
-5
@@ -62,13 +62,28 @@ else()
|
||||
message("* Use coreside debug : No (default)")
|
||||
endif()
|
||||
|
||||
if( WIN32 )
|
||||
if( USE_MYSQL_SOURCES )
|
||||
message("* Use MySQL sourcetree : Yes (default)")
|
||||
if( WITH_SOURCE_TREE STREQUAL "flat" OR WITH_SOURCE_TREE STREQUAL "hierarchical" )
|
||||
# TODO: Remove this after Debian 8 is released and set general required version to 2.8.12
|
||||
# Debian 7 is shipped with CMake 2.8.9 . But DIRECTORY flag of get_filename_component requires 2.8.12 .
|
||||
if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
|
||||
message("* Show source tree : Yes - ${WITH_SOURCE_TREE}")
|
||||
set(_WITH_SOURCE_TREE ${WITH_SOURCE_TREE} CACHE INTERNAL "WITH_SOURCE_TREE support enabled.")
|
||||
else()
|
||||
message("* Use MySQL sourcetree : No")
|
||||
message("* Show source tree : No (default)")
|
||||
|
||||
message("")
|
||||
message(" *** WITH_SOURCE_TREE - WARNING!")
|
||||
message(" *** This functionality is ONLY supported on CMake 2.8.12 or higher.")
|
||||
message(" *** You are running ${CMAKE_VERSION}, which does not have the functions needed")
|
||||
message(" *** to create a sourcetree - this option is thus forced to disabled!")
|
||||
message("")
|
||||
|
||||
set(_WITH_SOURCE_TREE "" CACHE INTERNAL "WITH_SOURCE_TREE support disabled.")
|
||||
endif()
|
||||
endif( WIN32 )
|
||||
else()
|
||||
message("* Show source tree : No (default)")
|
||||
set(_WITH_SOURCE_TREE "" CACHE INTERNAL "WITH_SOURCE_TREE support disabled.")
|
||||
endif()
|
||||
|
||||
if ( WITHOUT_GIT )
|
||||
message("* Use GIT revision hash : No")
|
||||
@@ -91,6 +106,13 @@ if ( NOJEM )
|
||||
message(" *** jemalloc linking has been disabled!")
|
||||
message(" *** Please note that this is for DEBUGGING WITH VALGRIND only!")
|
||||
message(" *** DO NOT DISABLE IT UNLESS YOU KNOW WHAT YOU'RE DOING!")
|
||||
elseif ( VALGRIND )
|
||||
message("")
|
||||
message(" *** VALGRIND - WARNING!")
|
||||
message(" *** jemalloc will be configured to support Valgrind")
|
||||
message(" *** Please specify the valgrind include directory in VALGRIND_INCLUDE_DIR option if you get build errors")
|
||||
message(" *** Please note that this is for DEBUGGING WITH VALGRIND only!")
|
||||
add_definitions(-DJEMALLOC_VALGRIND)
|
||||
endif()
|
||||
|
||||
if ( HELGRIND )
|
||||
|
||||
@@ -45,3 +45,92 @@
|
||||
fun:_ZNKSt13__atomic_baseIjE4loadESt12memory_order
|
||||
fun:_ZNKSt13__atomic_baseIjEcvjEv
|
||||
}
|
||||
{
|
||||
[1] std::atomic
|
||||
Helgrind:Race
|
||||
fun:load
|
||||
fun:_ZNKSt13__atomic_baseIjEcvjEv
|
||||
}
|
||||
{
|
||||
[1] std::atomic
|
||||
Helgrind:Race
|
||||
fun:store
|
||||
fun:_ZNSt13__atomic_baseIiEaSEi
|
||||
}
|
||||
{
|
||||
[1] std::atomic
|
||||
Helgrind:Race
|
||||
fun:store
|
||||
fun:_ZNSt13__atomic_baseIbEaSEb
|
||||
}
|
||||
{
|
||||
[1] std::atomic
|
||||
Helgrind:Race
|
||||
fun:load
|
||||
fun:_ZNKSt11atomic_boolcvbEv
|
||||
}
|
||||
{
|
||||
[1] std::atomic
|
||||
Helgrind:Race
|
||||
fun:store
|
||||
fun:_ZNSt13__atomic_baseIjEaSEj
|
||||
}
|
||||
{
|
||||
[2] integer counters
|
||||
Helgrind:Race
|
||||
fun:_ZN4MMAP11MMapManager7loadMapERKSsjii
|
||||
fun:_ZN3Map8LoadMMapEii
|
||||
}
|
||||
{
|
||||
[2] integer counters
|
||||
Helgrind:Race
|
||||
fun:_ZN8Movement7counterIjLj4294967295EE8IncreaseEv
|
||||
}
|
||||
{
|
||||
[2] integer counters
|
||||
Helgrind:Race
|
||||
fun:_ZN3G3D10BufferPool6mallocEm
|
||||
}
|
||||
{
|
||||
[3] System libraries
|
||||
Helgrind:Race
|
||||
fun:__GI_mempcpy
|
||||
fun:_IO_file_xsputn@@GLIBC_2.2.5
|
||||
fun:vfprintf
|
||||
}
|
||||
{
|
||||
[3] System libraries
|
||||
Helgrind:Race
|
||||
fun:__GI_mempcpy
|
||||
fun:_IO_file_xsputn@@GLIBC_2.2.5
|
||||
fun:fwrite
|
||||
}
|
||||
{
|
||||
[4] integer assignments
|
||||
Helgrind:Race
|
||||
fun:_ZN3Log14LoadFromConfigEv
|
||||
fun:_ZN5World18LoadConfigSettingsEb
|
||||
}
|
||||
{
|
||||
[4] integer assignments
|
||||
Helgrind:Race
|
||||
fun:_ZN3Log22CreateLoggerFromConfigERKSs
|
||||
fun:_ZN3Log21ReadLoggersFromConfigEv
|
||||
fun:_ZN3Log14LoadFromConfigEv
|
||||
fun:_ZN5World18LoadConfigSettingsEb
|
||||
}
|
||||
{
|
||||
[4] integer assignments
|
||||
Helgrind:Race
|
||||
fun:_ZN5World18LoadConfigSettingsEb
|
||||
}
|
||||
{
|
||||
[4] integer assignments
|
||||
Helgrind:Race
|
||||
fun:_ZNK5World12getIntConfigE15WorldIntConfigs
|
||||
}
|
||||
{
|
||||
[4] integer assignments
|
||||
Helgrind:Race
|
||||
fun:_ZNK3Log9ShouldLogERKSs8LogLevel
|
||||
}
|
||||
+4
-3
@@ -8,10 +8,10 @@
|
||||
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
if( CMAKE_COMPILER_IS_GNUCXX )
|
||||
add_definitions(--no-warnings)
|
||||
elseif( MSVC )
|
||||
if( MSVC )
|
||||
add_definitions(/W0)
|
||||
else()
|
||||
add_definitions(-w)
|
||||
endif()
|
||||
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
@@ -35,6 +35,7 @@ if(SERVERS OR TOOLS)
|
||||
endif()
|
||||
|
||||
if(SERVERS)
|
||||
add_subdirectory(cppformat)
|
||||
add_subdirectory(gsoap)
|
||||
add_subdirectory(zmqpp)
|
||||
endif()
|
||||
|
||||
+10
-2
@@ -4,10 +4,18 @@ Boost
|
||||
http://www.boost.org
|
||||
Version: 1.55
|
||||
|
||||
Boost Process (Proposed for boost, but its not an official part of it yet. Used to start child processes.)
|
||||
http://www.highscore.de/boost/process0.5/
|
||||
Version: 0.5
|
||||
|
||||
bzip2 (a freely available, patent free, high-quality data compressor)
|
||||
http://www.bzip.org/
|
||||
Version: 1.0.6
|
||||
|
||||
cppformat (type safe format library)
|
||||
https://github.com/cppformat/cppformat
|
||||
Version: 7859f8123311c1b8f69856d3c5e1b8501fbdae11
|
||||
|
||||
G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
|
||||
http://g3d.sourceforge.net/
|
||||
Version: 9.0-Release r4036
|
||||
@@ -26,7 +34,7 @@ utf8-cpp (UTF-8 with C++ in a Portable Way)
|
||||
|
||||
zlib (A Massively Spiffy Yet Delicately Unobtrusive Compression Library)
|
||||
http://www.zlib.net/
|
||||
Version: 1.2.7
|
||||
Version: 1.2.8
|
||||
|
||||
gSOAP (a portable development toolkit for C and C++ XML Web services and XML data bindings)
|
||||
http://gsoap2.sourceforge.net/
|
||||
@@ -34,7 +42,7 @@ gSOAP (a portable development toolkit for C and C++ XML Web services and XML dat
|
||||
|
||||
recastnavigation (Recast is state of the art navigation mesh construction toolset for games)
|
||||
https://github.com/memononen/recastnavigation
|
||||
Version: 42b96b7306d39bb7680ddb0f89d480a8296c83ff
|
||||
Version: 1dd5cf1883d61e723fef3d4957cf758c50e7a52b
|
||||
|
||||
StormLib (a pack of modules, written in C++, which are able to read and also to write files from/to the MPQ archives)
|
||||
http://www.zezula.net/en/mpq/stormlib.html
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
dep/g3dlite/Readme.txt | 3 ++-
|
||||
dep/g3dlite/include/G3D/Log.h | 2 +-
|
||||
dep/g3dlite/include/G3D/Rect2D.h | 2 +-
|
||||
dep/g3dlite/source/FileSystem.cpp | 3 +++
|
||||
dep/g3dlite/source/debugAssert.cpp | 2 ++
|
||||
dep/g3dlite/source/fileutils.cpp | 10 ++++++++++
|
||||
dep/g3dlite/source/prompt.cpp | 2 ++
|
||||
7 files changed, 21 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt
|
||||
index 7fab7f8..7439943 100644
|
||||
--- a/dep/g3dlite/Readme.txt
|
||||
+++ b/dep/g3dlite/Readme.txt
|
||||
@@ -11,4 +11,5 @@ G3D-v8.0_hotfix7.diff - 2013-08-31 - fix typo in Matrix4 == operator
|
||||
G3D-v8.0_hotfix8.diff - 2013-09-01 - fix typo in Vector3int32 += operator
|
||||
G3D-v8.0_hotfix9.diff - 2014-06-01 - only VS < 10 don't ship inttypes.h
|
||||
G3D-v9.0 hotfix1.diff - 2014-08-22 - updated to G3D9, reapplied previous patches and removed unneeded changes
|
||||
-G3D-v9.0 hotfix2.diff - 2014-08-23 - fix some -Wconversion warnings
|
||||
\ No newline at end of file
|
||||
+G3D-v9.0 hotfix2.diff - 2014-08-23 - fix some -Wconversion warnings
|
||||
+G3D-v9.0 hotfix3.diff - 2015-06-28 - fix some warnings
|
||||
diff --git a/dep/g3dlite/include/G3D/Log.h b/dep/g3dlite/include/G3D/Log.h
|
||||
index 2aedb13..c8a5d53 100644
|
||||
--- a/dep/g3dlite/include/G3D/Log.h
|
||||
+++ b/dep/g3dlite/include/G3D/Log.h
|
||||
@@ -57,9 +57,9 @@ private:
|
||||
|
||||
static Log* commonLog;
|
||||
|
||||
+public:
|
||||
int stripFromStackBottom;
|
||||
|
||||
-public:
|
||||
|
||||
/**
|
||||
@param stripFromStackBottom Number of call stacks to strip from the
|
||||
diff --git a/dep/g3dlite/include/G3D/Rect2D.h b/dep/g3dlite/include/G3D/Rect2D.h
|
||||
index f72dd08..93dd0e6 100644
|
||||
--- a/dep/g3dlite/include/G3D/Rect2D.h
|
||||
+++ b/dep/g3dlite/include/G3D/Rect2D.h
|
||||
@@ -118,7 +118,7 @@ private:
|
||||
}
|
||||
|
||||
/** Uninitialized constructor */
|
||||
- Rect2D(bool b) {}
|
||||
+ Rect2D(bool /*b*/) {}
|
||||
public:
|
||||
|
||||
/** \param any Must either Rect2D::xywh(#, #, #, #) or Rect2D::xyxy(#, #, #, #)*/
|
||||
diff --git a/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp
|
||||
index 32a84e7..06e6ff0 100644
|
||||
--- a/dep/g3dlite/source/FileSystem.cpp
|
||||
+++ b/dep/g3dlite/source/FileSystem.cpp
|
||||
@@ -137,6 +137,9 @@ void FileSystem::Dir::computeZipListing(const std::string& zipfile, const std::s
|
||||
|
||||
zip_close(z);
|
||||
z = NULL;
|
||||
+#else
|
||||
+ (void)zipfile;
|
||||
+ (void)_pathInsideZipfile;
|
||||
#endif
|
||||
}
|
||||
|
||||
diff --git a/dep/g3dlite/source/debugAssert.cpp b/dep/g3dlite/source/debugAssert.cpp
|
||||
index 92ce237..cfccf9a 100644
|
||||
--- a/dep/g3dlite/source/debugAssert.cpp
|
||||
+++ b/dep/g3dlite/source/debugAssert.cpp
|
||||
@@ -121,6 +121,8 @@ static void createErrorMessage(
|
||||
const char* moduleName = strrchr(modulePath, '\\');
|
||||
outTitle = outTitle + string(" - ") + string(moduleName ? (moduleName + 1) : modulePath);
|
||||
|
||||
+ #else
|
||||
+ (void)outTitle;
|
||||
#endif
|
||||
|
||||
// Build the message.
|
||||
diff --git a/dep/g3dlite/source/fileutils.cpp b/dep/g3dlite/source/fileutils.cpp
|
||||
index 966cca7..2788ada 100644
|
||||
--- a/dep/g3dlite/source/fileutils.cpp
|
||||
+++ b/dep/g3dlite/source/fileutils.cpp
|
||||
@@ -396,6 +396,10 @@ bool zipfileExists(const std::string& filename, std::string& outZipfile,
|
||||
}
|
||||
|
||||
}
|
||||
+#else
|
||||
+ (void)filename;
|
||||
+ (void)outZipfile;
|
||||
+ (void)outInternalFile;
|
||||
#endif
|
||||
// not a valid directory structure ever,
|
||||
// obviously no .zip was found within the path
|
||||
@@ -756,6 +760,12 @@ static void getFileOrDirListZip(const std::string& path,
|
||||
zip_close( z );
|
||||
|
||||
fileSet.getMembers(files);
|
||||
+#else
|
||||
+ (void)path;
|
||||
+ (void)prefix;
|
||||
+ (void)files;
|
||||
+ (void)wantFiles;
|
||||
+ (void)includePath;
|
||||
#endif
|
||||
}
|
||||
|
||||
diff --git a/dep/g3dlite/source/prompt.cpp b/dep/g3dlite/source/prompt.cpp
|
||||
index ee520d8..6927fd0 100644
|
||||
--- a/dep/g3dlite/source/prompt.cpp
|
||||
+++ b/dep/g3dlite/source/prompt.cpp
|
||||
@@ -572,6 +572,8 @@ int prompt(
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
+#else
|
||||
+ (void)useGui;
|
||||
#endif /* G3DFIX: exclude GUI prompt code */
|
||||
return textPrompt(windowTitle, prompt, choice, numChoices);
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
dep/g3dlite/source/Matrix4.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dep/g3dlite/source/Matrix4.cpp b/dep/g3dlite/source/Matrix4.cpp
|
||||
index f3b25ad..0588cb6 100644
|
||||
--- a/dep/g3dlite/source/Matrix4.cpp
|
||||
+++ b/dep/g3dlite/source/Matrix4.cpp
|
||||
@@ -606,7 +606,7 @@ bool Matrix4float64::operator==(const Matrix4float64& other) const {
|
||||
// If the bit patterns are identical, they must be
|
||||
// the same matrix. If not, they *might* still have
|
||||
// equal elements due to floating point weirdness.
|
||||
- if (memcmp(this, &other, sizeof(Matrix4float64) == 0)) {
|
||||
+ if (memcmp(this, &other, sizeof(Matrix4float64)) == 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -53,6 +53,7 @@ set(jemalloc_STAT_SRC
|
||||
include_directories(
|
||||
${BUILDDIR}/
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/include
|
||||
${VALGRIND_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
add_definitions(-D_GNU_SOURCE -D_REENTRANT)
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
dep/libmpq/libmpq/extract.c | 1 +
|
||||
dep/libmpq/libmpq/mpq.c | 4 ++--
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dep/libmpq/libmpq/extract.c b/dep/libmpq/libmpq/extract.c
|
||||
index f4ebb29..dc970b7 100644
|
||||
--- a/dep/libmpq/libmpq/extract.c
|
||||
+++ b/dep/libmpq/libmpq/extract.c
|
||||
@@ -49,6 +49,7 @@ static decompress_table_s dcmp_table[] = {
|
||||
/* this function decompress a stream using huffman algorithm. */
|
||||
int32_t libmpq__decompress_huffman(uint8_t *in_buf, uint32_t in_size, uint8_t *out_buf, uint32_t out_size) {
|
||||
|
||||
+ (void)in_size;
|
||||
/* TODO: make typdefs of this structs? */
|
||||
/* some common variables. */
|
||||
int32_t tb = 0;
|
||||
diff --git a/dep/libmpq/libmpq/mpq.c b/dep/libmpq/libmpq/mpq.c
|
||||
index 1936f25..71081b5 100644
|
||||
--- a/dep/libmpq/libmpq/mpq.c
|
||||
+++ b/dep/libmpq/libmpq/mpq.c
|
||||
@@ -65,7 +65,7 @@ const char *libmpq__version(void) {
|
||||
const char *libmpq__strerror(int32_t return_code) {
|
||||
|
||||
/* check for array bounds */
|
||||
- if (-return_code < 0 || -return_code > sizeof(__libmpq_error_strings)/sizeof(char*))
|
||||
+ if (-return_code < 0 || (size_t)-return_code > sizeof(__libmpq_error_strings)/sizeof(char*))
|
||||
return NULL;
|
||||
|
||||
/* return appropriate string */
|
||||
@@ -912,7 +912,7 @@ int32_t libmpq__block_read(mpq_archive_s *mpq_archive, uint32_t file_number, uin
|
||||
}
|
||||
|
||||
/* read block from file. */
|
||||
- if (fread(in_buf, 1, in_size, mpq_archive->fp) != in_size) {
|
||||
+ if ((libmpq__off_t)fread(in_buf, 1, in_size, mpq_archive->fp) != in_size) {
|
||||
|
||||
/* free buffers. */
|
||||
free(in_buf);
|
||||
@@ -3,6 +3,9 @@
|
||||
#define _HASH "@rev_hash@"
|
||||
#define _DATE "@rev_date@"
|
||||
#define _BRANCH "@rev_branch@"
|
||||
#define _SOURCE_DIRECTORY "@CMAKE_SOURCE_DIR@"
|
||||
#define _MYSQL_EXECUTABLE "@MYSQL_EXECUTABLE@"
|
||||
#define _FULL_DATABASE "TDB_full_335.58_2015_03_21.sql"
|
||||
#define VER_COMPANYNAME_STR "TrinityCore Developers"
|
||||
#define VER_LEGALCOPYRIGHT_STR "(c)2008-2015 TrinityCore"
|
||||
#define VER_FILEVERSION 0,0,0
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
-- MySQL dump 10.15 Distrib 10.0.13-MariaDB, for Win64 (x86)
|
||||
-- MySQL dump 10.13 Distrib 5.6.9-rc, for Win64 (x86_64)
|
||||
--
|
||||
-- Host: localhost Database: auth_4x
|
||||
-- ------------------------------------------------------
|
||||
-- Server version 10.0.13-MariaDB
|
||||
-- Server version 5.6.9-rc
|
||||
|
||||
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
@@ -496,7 +496,8 @@ DROP TABLE IF EXISTS `rbac_default_permissions`;
|
||||
CREATE TABLE `rbac_default_permissions` (
|
||||
`secId` int(10) unsigned NOT NULL COMMENT 'Security Level id',
|
||||
`permissionId` int(10) unsigned NOT NULL COMMENT 'permission id',
|
||||
PRIMARY KEY (`secId`,`permissionId`),
|
||||
`realmId` int(11) NOT NULL DEFAULT '-1' COMMENT 'Realm Id, -1 means all',
|
||||
PRIMARY KEY (`secId`,`permissionId`,`realmId`),
|
||||
KEY `fk__rbac_default_permissions__rbac_permissions` (`permissionId`),
|
||||
CONSTRAINT `fk__rbac_default_permissions__rbac_permissions` FOREIGN KEY (`permissionId`) REFERENCES `rbac_permissions` (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Default permission to assign to different account security levels';
|
||||
@@ -508,7 +509,7 @@ CREATE TABLE `rbac_default_permissions` (
|
||||
|
||||
LOCK TABLES `rbac_default_permissions` WRITE;
|
||||
/*!40000 ALTER TABLE `rbac_default_permissions` DISABLE KEYS */;
|
||||
INSERT INTO `rbac_default_permissions` VALUES (0,195),(1,194),(2,193),(3,192);
|
||||
INSERT INTO `rbac_default_permissions` VALUES (3,192,-1),(2,193,-1),(1,194,-1),(0,195,-1);
|
||||
/*!40000 ALTER TABLE `rbac_default_permissions` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
@@ -626,6 +627,57 @@ INSERT INTO `realmlist` VALUES (1,'Trinity','127.0.0.1','127.0.0.1','255.255.255
|
||||
/*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates` (
|
||||
`name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
|
||||
`hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
|
||||
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
|
||||
`speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
|
||||
PRIMARY KEY (`name`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `updates`
|
||||
--
|
||||
|
||||
LOCK TABLES `updates` WRITE;
|
||||
/*!40000 ALTER TABLE `updates` DISABLE KEYS */;
|
||||
INSERT INTO `updates` VALUES ('2014_11_10_00_auth.sql','0E3CB119442D09DD88E967015319BBC8DAFBBFE0','ARCHIVED','2015-03-21 21:44:12',0),('2014_11_10_01_auth.sql','327E77A1DA3546D5275AB249915DD57EDD6FDD3D','ARCHIVED','2015-03-21 21:44:12',0),('2014_12_10_00_auth.sql','821703A96D80F9080074852B5A46E2909C9562EA','ARCHIVED','2015-03-21 21:44:12',0),('2014_12_21_00_auth.sql','CE2E5D2CD82E79C25294539ADED27A1429105B43','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_00_auth.sql','E8C5B74BB45F0F35DEC182C72BACF435C7066FB0','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_01_auth.sql','862961815354DA2746F5F71FBC8155F57CBE75AB','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_02_auth.sql','33E4F94086590768EF5D4855DD43D7DE7C06ADA4','ARCHIVED','2015-03-21 21:44:51',0);
|
||||
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates_include`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates_include`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates_include` (
|
||||
`path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
|
||||
PRIMARY KEY (`path`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `updates_include`
|
||||
--
|
||||
|
||||
LOCK TABLES `updates_include` WRITE;
|
||||
/*!40000 ALTER TABLE `updates_include` DISABLE KEYS */;
|
||||
INSERT INTO `updates_include` VALUES ('$/sql/updates/auth','RELEASED'),('$/sql/custom/auth','RELEASED'),('$/sql/old/3.3.5a/auth','ARCHIVED');
|
||||
/*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `uptime`
|
||||
--
|
||||
@@ -661,4 +713,4 @@ UNLOCK TABLES;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
|
||||
-- Dump completed on 2014-10-18 23:33:11
|
||||
-- Dump completed on 2015-03-21 21:48:22
|
||||
@@ -1,8 +1,8 @@
|
||||
-- MySQL dump 10.13 Distrib 5.5.40, for debian-linux-gnu (x86_64)
|
||||
-- MySQL dump 10.13 Distrib 5.6.9-rc, for Win64 (x86_64)
|
||||
--
|
||||
-- Host: localhost Database: characters_4x
|
||||
-- ------------------------------------------------------
|
||||
-- Server version 5.5.40-0ubuntu0.14.04.1
|
||||
-- Server version 5.6.9-rc
|
||||
|
||||
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
@@ -483,22 +483,22 @@ DROP TABLE IF EXISTS `character_aura`;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `character_aura` (
|
||||
`guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
|
||||
`caster_guid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
|
||||
`item_guid` bigint(20) unsigned NOT NULL DEFAULT '0',
|
||||
`casterGuid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
|
||||
`itemGuid` bigint(20) unsigned NOT NULL DEFAULT '0',
|
||||
`spell` mediumint(8) unsigned NOT NULL DEFAULT '0',
|
||||
`effect_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`recalculate_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`stackcount` tinyint(3) unsigned NOT NULL DEFAULT '1',
|
||||
`effectMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`recalculateMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`stackCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
|
||||
`amount0` int(11) NOT NULL DEFAULT '0',
|
||||
`amount1` int(11) NOT NULL DEFAULT '0',
|
||||
`amount2` int(11) NOT NULL DEFAULT '0',
|
||||
`base_amount0` int(11) NOT NULL DEFAULT '0',
|
||||
`base_amount1` int(11) NOT NULL DEFAULT '0',
|
||||
`base_amount2` int(11) NOT NULL DEFAULT '0',
|
||||
`maxduration` int(11) NOT NULL DEFAULT '0',
|
||||
`remaintime` int(11) NOT NULL DEFAULT '0',
|
||||
`remaincharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`guid`,`caster_guid`,`item_guid`,`spell`,`effect_mask`)
|
||||
`maxDuration` int(11) NOT NULL DEFAULT '0',
|
||||
`remainTime` int(11) NOT NULL DEFAULT '0',
|
||||
`remainCharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`guid`,`casterGuid`,`itemGuid`,`spell`,`effectMask`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -763,7 +763,7 @@ DROP TABLE IF EXISTS `character_glyphs`;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `character_glyphs` (
|
||||
`guid` int(10) unsigned NOT NULL,
|
||||
`spec` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`talentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`glyph1` smallint(5) unsigned DEFAULT '0',
|
||||
`glyph2` smallint(5) unsigned DEFAULT '0',
|
||||
`glyph3` smallint(5) unsigned DEFAULT '0',
|
||||
@@ -773,7 +773,7 @@ CREATE TABLE `character_glyphs` (
|
||||
`glyph7` smallint(5) unsigned DEFAULT '0',
|
||||
`glyph8` smallint(5) unsigned DEFAULT '0',
|
||||
`glyph9` smallint(5) unsigned DEFAULT '0',
|
||||
PRIMARY KEY (`guid`,`spec`)
|
||||
PRIMARY KEY (`guid`,`talentGroup`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -1276,8 +1276,8 @@ DROP TABLE IF EXISTS `character_talent`;
|
||||
CREATE TABLE `character_talent` (
|
||||
`guid` int(10) unsigned NOT NULL,
|
||||
`spell` mediumint(8) unsigned NOT NULL,
|
||||
`spec` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`guid`,`spell`,`spec`)
|
||||
`talentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`guid`,`spell`,`talentGroup`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -1383,8 +1383,8 @@ CREATE TABLE `characters` (
|
||||
`power4` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`power5` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`latency` mediumint(8) unsigned NOT NULL DEFAULT '0',
|
||||
`speccount` tinyint(3) unsigned NOT NULL DEFAULT '1',
|
||||
`activespec` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`talentGroupsCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
|
||||
`activeTalentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`exploredZones` longtext,
|
||||
`equipmentCache` longtext,
|
||||
`knownTitles` longtext,
|
||||
@@ -1575,68 +1575,68 @@ LOCK TABLES `gameobject_respawn` WRITE;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `gm_subsurveys`
|
||||
-- Table structure for table `gm_subsurvey`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `gm_subsurveys`;
|
||||
DROP TABLE IF EXISTS `gm_subsurvey`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `gm_subsurveys` (
|
||||
CREATE TABLE `gm_subsurvey` (
|
||||
`surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`subsurveyId` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`rank` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`comment` text NOT NULL,
|
||||
PRIMARY KEY (`surveyId`,`subsurveyId`)
|
||||
`questionId` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`answer` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`answerComment` text NOT NULL,
|
||||
PRIMARY KEY (`surveyId`,`questionId`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `gm_subsurveys`
|
||||
-- Dumping data for table `gm_subsurvey`
|
||||
--
|
||||
|
||||
LOCK TABLES `gm_subsurveys` WRITE;
|
||||
/*!40000 ALTER TABLE `gm_subsurveys` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `gm_subsurveys` ENABLE KEYS */;
|
||||
LOCK TABLES `gm_subsurvey` WRITE;
|
||||
/*!40000 ALTER TABLE `gm_subsurvey` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `gm_subsurvey` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `gm_surveys`
|
||||
-- Table structure for table `gm_survey`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `gm_surveys`;
|
||||
DROP TABLE IF EXISTS `gm_survey`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `gm_surveys` (
|
||||
CREATE TABLE `gm_survey` (
|
||||
`surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`guid` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`mainSurvey` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`overallComment` longtext NOT NULL,
|
||||
`comment` longtext NOT NULL,
|
||||
`createTime` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`surveyId`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `gm_surveys`
|
||||
-- Dumping data for table `gm_survey`
|
||||
--
|
||||
|
||||
LOCK TABLES `gm_surveys` WRITE;
|
||||
/*!40000 ALTER TABLE `gm_surveys` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `gm_surveys` ENABLE KEYS */;
|
||||
LOCK TABLES `gm_survey` WRITE;
|
||||
/*!40000 ALTER TABLE `gm_survey` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `gm_survey` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `gm_tickets`
|
||||
-- Table structure for table `gm_ticket`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `gm_tickets`;
|
||||
DROP TABLE IF EXISTS `gm_ticket`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `gm_tickets` (
|
||||
`ticketId` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier of ticket creator',
|
||||
CREATE TABLE `gm_ticket` (
|
||||
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`playerGuid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier of ticket creator',
|
||||
`name` varchar(12) NOT NULL COMMENT 'Name of ticket creator',
|
||||
`message` text NOT NULL,
|
||||
`description` text NOT NULL,
|
||||
`createTime` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`mapId` smallint(5) unsigned NOT NULL DEFAULT '0',
|
||||
`posX` float NOT NULL DEFAULT '0',
|
||||
@@ -1650,18 +1650,18 @@ CREATE TABLE `gm_tickets` (
|
||||
`completed` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`escalated` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`viewed` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`haveTicket` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`ticketId`)
|
||||
`needMoreHelp` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `gm_tickets`
|
||||
-- Dumping data for table `gm_ticket`
|
||||
--
|
||||
|
||||
LOCK TABLES `gm_tickets` WRITE;
|
||||
/*!40000 ALTER TABLE `gm_tickets` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `gm_tickets` ENABLE KEYS */;
|
||||
LOCK TABLES `gm_ticket` WRITE;
|
||||
/*!40000 ALTER TABLE `gm_ticket` DISABLE KEYS */;
|
||||
/*!40000 ALTER TABLE `gm_ticket` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
@@ -1738,7 +1738,7 @@ CREATE TABLE `groups` (
|
||||
`icon8` bigint(20) unsigned NOT NULL,
|
||||
`groupType` tinyint(3) unsigned NOT NULL,
|
||||
`difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`raiddifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`raidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`masterLooterGuid` int(10) unsigned NOT NULL,
|
||||
PRIMARY KEY (`guid`),
|
||||
KEY `leaderGuid` (`leaderGuid`)
|
||||
@@ -2476,21 +2476,21 @@ DROP TABLE IF EXISTS `pet_aura`;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `pet_aura` (
|
||||
`guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
|
||||
`caster_guid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
|
||||
`casterGuid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
|
||||
`spell` mediumint(8) unsigned NOT NULL DEFAULT '0',
|
||||
`effect_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`recalculate_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`stackcount` tinyint(3) unsigned NOT NULL DEFAULT '1',
|
||||
`effectMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`recalculateMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
`stackCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
|
||||
`amount0` mediumint(8) NOT NULL,
|
||||
`amount1` mediumint(8) NOT NULL,
|
||||
`amount2` mediumint(8) NOT NULL,
|
||||
`base_amount0` mediumint(8) NOT NULL,
|
||||
`base_amount1` mediumint(8) NOT NULL,
|
||||
`base_amount2` mediumint(8) NOT NULL,
|
||||
`maxduration` int(11) NOT NULL DEFAULT '0',
|
||||
`remaintime` int(11) NOT NULL DEFAULT '0',
|
||||
`remaincharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`guid`,`spell`,`effect_mask`)
|
||||
`maxDuration` int(11) NOT NULL DEFAULT '0',
|
||||
`remainTime` int(11) NOT NULL DEFAULT '0',
|
||||
`remainCharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`guid`,`spell`,`effectMask`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Pet System';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
@@ -2738,6 +2738,57 @@ LOCK TABLES `reserved_name` WRITE;
|
||||
/*!40000 ALTER TABLE `reserved_name` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates` (
|
||||
`name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
|
||||
`hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
|
||||
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
|
||||
`speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
|
||||
PRIMARY KEY (`name`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `updates`
|
||||
--
|
||||
|
||||
LOCK TABLES `updates` WRITE;
|
||||
/*!40000 ALTER TABLE `updates` DISABLE KEYS */;
|
||||
INSERT INTO `updates` VALUES ('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_01_characters.sql','894F08B70449A5481FFAF394EE5571D7FC4D8A3A','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_02_characters.sql','97D7BE0CAADC79F3F11B9FD296B8C6CD40FE593B','ARCHIVED','2015-03-21 21:44:51',0), ('2015_06_26_00_characters_335.sql','f8230a59a9e878a6f54f421d6621f1595bd93861','RELEASED','2015-03-21 21:44:51',0);
|
||||
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates_include`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates_include`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates_include` (
|
||||
`path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
|
||||
PRIMARY KEY (`path`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Dumping data for table `updates_include`
|
||||
--
|
||||
|
||||
LOCK TABLES `updates_include` WRITE;
|
||||
/*!40000 ALTER TABLE `updates_include` DISABLE KEYS */;
|
||||
INSERT INTO `updates_include` VALUES ('$/sql/updates/characters','RELEASED'),('$/sql/custom/characters','RELEASED'),('$/sql/old/3.3.5a/characters','ARCHIVED');
|
||||
/*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
|
||||
UNLOCK TABLES;
|
||||
|
||||
--
|
||||
-- Table structure for table `warden_action`
|
||||
--
|
||||
@@ -2795,4 +2846,4 @@ UNLOCK TABLES;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
||||
|
||||
-- Dump completed on 2014-10-18 18:02:06
|
||||
-- Dump completed on 2015-06-25 17:43:13
|
||||
@@ -2925,7 +2925,7 @@ CREATE TABLE `quest_template` (
|
||||
`RewardSpell` mediumint(8) unsigned NOT NULL DEFAULT '0',
|
||||
`RewardSpellCast` int(11) NOT NULL DEFAULT '0',
|
||||
`RewardHonor` int(11) NOT NULL DEFAULT '0',
|
||||
`RewardHonorMultiplier` float NOT NULL DEFAULT '1',
|
||||
`RewardHonorMultiplier` float NOT NULL DEFAULT '0',
|
||||
`RewardMailTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
|
||||
`RewardMailDelay` int(11) unsigned NOT NULL DEFAULT '0',
|
||||
`SourceItemId` mediumint(8) unsigned NOT NULL DEFAULT '0',
|
||||
@@ -3715,6 +3715,37 @@ CREATE TABLE `trinity_string` (
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates` (
|
||||
`name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
|
||||
`hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
|
||||
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
|
||||
`speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
|
||||
PRIMARY KEY (`name`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Table structure for table `updates_include`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `updates_include`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `updates_include` (
|
||||
`path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
|
||||
`state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
|
||||
PRIMARY KEY (`path`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
-- Table structure for table `vehicle_accessory`
|
||||
--
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
*.sql
|
||||
@@ -0,0 +1 @@
|
||||
*.sql
|
||||
@@ -0,0 +1 @@
|
||||
*.sql
|
||||
+75416
-75416
File diff suppressed because it is too large.
Load diff
+3
-3
@@ -1,3 +1,3 @@
|
||||
DELETE FROM `spell_script_names` WHERE `spell_id` = 38194;
|
||||
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
|
||||
(38194, 'spell_talon_king_ikiss_blink');
|
||||
DELETE FROM `spell_script_names` WHERE `spell_id` = 38194;
|
||||
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
|
||||
(38194, 'spell_talon_king_ikiss_blink');
|
||||
+18
-18
@@ -1,18 +1,18 @@
|
||||
-- SWP: Move Muru summons to database
|
||||
SET @MURU := 25741;
|
||||
DELETE FROM `creature_summon_groups` WHERE `summonerId` = @MURU AND `entry` IN (25798, 25799, 25744);
|
||||
INSERT INTO `creature_summon_groups` (`summonerId`, `summonerType`, `groupId`, `entry`, `position_x`, `position_y`, `position_z`, `orientation`, `summonType`, `summonTime`) VALUES
|
||||
(@MURU, 0, 0, 25799, 1780.16, 666.83, 71.19, 5.21, 5, 0), -- Shadowsword Fury Mage
|
||||
(@MURU, 0, 0, 25799, 1847.93, 600.30, 71.30, 2.57, 5, 0),
|
||||
(@MURU, 0, 0, 25798, 1779.97, 660.64, 71.19, 5.28, 5, 0), -- Shadowsword Berserker
|
||||
(@MURU, 0, 0, 25798, 1786.20, 661.01, 71.19, 4.51, 5, 0),
|
||||
(@MURU, 0, 0, 25798, 1845.17, 602.63, 71.28, 2.43, 5, 0),
|
||||
(@MURU, 0, 0, 25798, 1842.91, 599.93, 71.23, 2.44, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1819.90, 609.80, 69.74, 1.94, 5, 0), -- Darkfiend
|
||||
(@MURU, 0, 1, 25744, 1829.39, 617.89, 69.73, 2.61, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1801.98, 633.62, 69.74, 5.71, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1830.88, 629.99, 69.73, 3.52, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1800.38, 621.41, 69.74, 0.22, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1808.30, 612.45, 69.73, 1.02, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1823.90, 639.69, 69.74, 4.12, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1811.85, 640.46, 69.73, 4.97, 5, 0);
|
||||
-- SWP: Move Muru summons to database
|
||||
SET @MURU := 25741;
|
||||
DELETE FROM `creature_summon_groups` WHERE `summonerId` = @MURU AND `entry` IN (25798, 25799, 25744);
|
||||
INSERT INTO `creature_summon_groups` (`summonerId`, `summonerType`, `groupId`, `entry`, `position_x`, `position_y`, `position_z`, `orientation`, `summonType`, `summonTime`) VALUES
|
||||
(@MURU, 0, 0, 25799, 1780.16, 666.83, 71.19, 5.21, 5, 0), -- Shadowsword Fury Mage
|
||||
(@MURU, 0, 0, 25799, 1847.93, 600.30, 71.30, 2.57, 5, 0),
|
||||
(@MURU, 0, 0, 25798, 1779.97, 660.64, 71.19, 5.28, 5, 0), -- Shadowsword Berserker
|
||||
(@MURU, 0, 0, 25798, 1786.20, 661.01, 71.19, 4.51, 5, 0),
|
||||
(@MURU, 0, 0, 25798, 1845.17, 602.63, 71.28, 2.43, 5, 0),
|
||||
(@MURU, 0, 0, 25798, 1842.91, 599.93, 71.23, 2.44, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1819.90, 609.80, 69.74, 1.94, 5, 0), -- Darkfiend
|
||||
(@MURU, 0, 1, 25744, 1829.39, 617.89, 69.73, 2.61, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1801.98, 633.62, 69.74, 5.71, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1830.88, 629.99, 69.73, 3.52, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1800.38, 621.41, 69.74, 0.22, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1808.30, 612.45, 69.73, 1.02, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1823.90, 639.69, 69.74, 4.12, 5, 0),
|
||||
(@MURU, 0, 1, 25744, 1811.85, 640.46, 69.73, 4.97, 5, 0);
|
||||
@@ -1 +1 @@
|
||||
UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=6 WHERE `entry` IN (34566, 35216, 35268, 35269, 35347, 35348, 35349, 35350, 35351, 35352, 35447, 35448, 35449, 35615, 35616) AND `item`=3;
|
||||
UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=6 WHERE `entry` IN (34566, 35216, 35268, 35269, 35347, 35348, 35349, 35350, 35351, 35352, 35447, 35448, 35449, 35615, 35616) AND `item`=3;
|
||||
+2
-2
@@ -1,2 +1,2 @@
|
||||
-- Remove no longer used script
|
||||
UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = 17662; -- Broggok Poison Cloud
|
||||
-- Remove no longer used script
|
||||
UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = 17662; -- Broggok Poison Cloud
|
||||
@@ -1,6 +1,6 @@
|
||||
-- Corrects unit_flags and sets AI for Illusion of Jandice Barov (11439)
|
||||
SET @ENTRY := 11439;
|
||||
UPDATE `creature_template` SET `ScriptName` = '', `AIName` = 'SmartAI', `unit_flags` = `unit_flags` &~4194304 WHERE `entry` = @ENTRY;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid` = @ENTRY AND `source_type` = 0;
|
||||
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
|
||||
(@ENTRY, 0, 0, 0, 0, 0, 100, 2, 2000, 8000, 5000, 8000, 11, 15284, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Illusion of Jandice Barov - In Combat - Cast 'Cleave' (Normal Dungeon)");
|
||||
-- Corrects unit_flags and sets AI for Illusion of Jandice Barov (11439)
|
||||
SET @ENTRY := 11439;
|
||||
UPDATE `creature_template` SET `ScriptName` = '', `AIName` = 'SmartAI', `unit_flags` = `unit_flags` &~4194304 WHERE `entry` = @ENTRY;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid` = @ENTRY AND `source_type` = 0;
|
||||
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
|
||||
(@ENTRY, 0, 0, 0, 0, 0, 100, 2, 2000, 8000, 5000, 8000, 11, 15284, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Illusion of Jandice Barov - In Combat - Cast 'Cleave' (Normal Dungeon)");
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
DELETE FROM `spell_script_names` WHERE `spell_id` IN (27695, 27687);
|
||||
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
|
||||
(27695, 'spell_kormok_summon_bone_mages'),
|
||||
(27687, 'spell_kormok_summon_bone_minions');
|
||||
DELETE FROM `spell_script_names` WHERE `spell_id` IN (27695, 27687);
|
||||
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
|
||||
(27695, 'spell_kormok_summon_bone_mages'),
|
||||
(27687, 'spell_kormok_summon_bone_minions');
|
||||
@@ -1,5 +1,5 @@
|
||||
SET @ENTRY := 11136; -- Freed Soul
|
||||
UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid` = @ENTRY AND `source_type` = 0;
|
||||
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
|
||||
(@ENTRY, 0, 0, 0, 11, 0, 100, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Freed Soul - On Respawn - Say Line 0');
|
||||
SET @ENTRY := 11136; -- Freed Soul
|
||||
UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid` = @ENTRY AND `source_type` = 0;
|
||||
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
|
||||
(@ENTRY, 0, 0, 0, 11, 0, 100, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Freed Soul - On Respawn - Say Line 0');
|
||||
@@ -1,6 +1,6 @@
|
||||
SET @ENTRY := 25040; -- Greater Water Elemental
|
||||
UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid` = @ENTRY AND `source_type` = 0;
|
||||
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
|
||||
(@ENTRY, 0, 1, 0, 0, 0, 100, 0, 3000, 3000, 5000, 5000, 11, 46983, 64, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Greater Water Elemental - In Combat CMC - Cast Waterbolt');
|
||||
|
||||
SET @ENTRY := 25040; -- Greater Water Elemental
|
||||
UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid` = @ENTRY AND `source_type` = 0;
|
||||
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
|
||||
(@ENTRY, 0, 1, 0, 0, 0, 100, 0, 3000, 3000, 5000, 5000, 11, 46983, 64, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Greater Water Elemental - In Combat CMC - Cast Waterbolt');
|
||||
|
||||
@@ -1 +1 @@
|
||||
UPDATE `conditions` SET `ConditionValue1` = 46 WHERE `SourceEntry` IN (63989, 63997, 63998) AND `SourceTypeOrReferenceId` = 18;
|
||||
UPDATE `conditions` SET `ConditionValue1` = 46 WHERE `SourceEntry` IN (63989, 63997, 63998) AND `SourceTypeOrReferenceId` = 18;
|
||||
+1
-1
@@ -1 +1 @@
|
||||
UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = 29920;
|
||||
UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = 29920;
|
||||
+3
-3
@@ -1,3 +1,3 @@
|
||||
DELETE FROM `spell_script_names` WHERE `spell_id` = 48292;
|
||||
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
|
||||
(48292, 'spell_gen_50pct_count_pct_from_max_hp');
|
||||
DELETE FROM `spell_script_names` WHERE `spell_id` = 48292;
|
||||
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
|
||||
(48292, 'spell_gen_50pct_count_pct_from_max_hp');
|
||||
+3
-3
@@ -1,3 +1,3 @@
|
||||
DELETE FROM `achievement_criteria_data` WHERE `criteria_id` = 7361 AND `type` = 12;
|
||||
INSERT INTO `achievement_criteria_data`(`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
|
||||
(7361, 12, 1, 0, '');
|
||||
DELETE FROM `achievement_criteria_data` WHERE `criteria_id` = 7361 AND `type` = 12;
|
||||
INSERT INTO `achievement_criteria_data`(`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
|
||||
(7361, 12, 1, 0, '');
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
--
|
||||
DELETE FROM `spell_script_names` WHERE `spell_id` = 39238;
|
||||
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
|
||||
(39238, 'spell_q10929_fumping');
|
||||
--
|
||||
DELETE FROM `spell_script_names` WHERE `spell_id` = 39238;
|
||||
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
|
||||
(39238, 'spell_q10929_fumping');
|
||||
@@ -0,0 +1,7 @@
|
||||
DELETE FROM rbac_permissions WHERE id = 797;
|
||||
INSERT INTO rbac_permissions (`id`, `name`) VALUES
|
||||
(797, 'Command: pvpstats');
|
||||
|
||||
DELETE FROM rbac_linked_permissions WHERE `linkedId` = 797;
|
||||
INSERT INTO rbac_linked_permissions (`id`, `linkedId`) VALUES
|
||||
(199, 797);
|
||||
@@ -0,0 +1,9 @@
|
||||
/* add rbac permissions to new commands */
|
||||
DELETE FROM `rbac_permissions` WHERE `id`=798;
|
||||
INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
|
||||
(798, 'Command: .mod xp');
|
||||
|
||||
DELETE FROM `rbac_linked_permissions` WHERE `id`=798;
|
||||
INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
|
||||
/* add mod xp to gms */
|
||||
(194, 798);
|
||||
@@ -0,0 +1,3 @@
|
||||
ALTER TABLE `rbac_default_permissions`
|
||||
ADD COLUMN `realmId` INT(11) NOT NULL DEFAULT '-1' COMMENT 'Realm Id, -1 means all',
|
||||
DROP PRIMARY KEY, ADD PRIMARY KEY (`secId`, `permissionId`, `realmId`);
|
||||
@@ -0,0 +1,9 @@
|
||||
-- Add rbac_permissions
|
||||
DELETE FROM `rbac_permissions` WHERE `id` = 51;
|
||||
INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
|
||||
(51, 'Allow trading between factions');
|
||||
|
||||
-- Add rbac_linked_permissions
|
||||
DELETE FROM `rbac_linked_permissions` WHERE `linkedId` = 51;
|
||||
INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
|
||||
(194, 51);
|
||||
@@ -0,0 +1,36 @@
|
||||
-- Updates base tables
|
||||
DROP TABLE IF EXISTS `updates`;
|
||||
CREATE TABLE `updates` (
|
||||
`name` VARCHAR(200) NOT NULL COMMENT 'filename with extension of the update.',
|
||||
`hash` CHAR(40) NULL DEFAULT '' COMMENT 'sha1 hash of the sql file.',
|
||||
`state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
|
||||
`timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
|
||||
`speed` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'time the query takes to apply in ms.',
|
||||
PRIMARY KEY (`name`)
|
||||
)
|
||||
COMMENT='List of all applied updates in this database.'
|
||||
COLLATE='utf8_general_ci'
|
||||
ENGINE=MyISAM;
|
||||
|
||||
DROP TABLE IF EXISTS `updates_include`;
|
||||
CREATE TABLE `updates_include` (
|
||||
`path` VARCHAR(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
|
||||
`state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
|
||||
PRIMARY KEY (`path`)
|
||||
)
|
||||
COMMENT='List of directories where we want to include sql updates.'
|
||||
COLLATE='utf8_general_ci'
|
||||
ENGINE=MyISAM;
|
||||
|
||||
-- Auth database update data
|
||||
TRUNCATE TABLE `updates_include`;
|
||||
INSERT INTO `updates_include` (`path`, `state`) VALUES
|
||||
('$/sql/updates/auth', 'RELEASED'),
|
||||
('$/sql/custom/auth', 'RELEASED'),
|
||||
('$/sql/old/3.3.5a/auth', 'ARCHIVED');
|
||||
|
||||
INSERT IGNORE INTO `updates` (`name`, `hash`) VALUES
|
||||
('2015_03_20_00_auth.sql', ''),
|
||||
('2015_03_20_01_auth.sql', ''),
|
||||
('2015_03_20_02_auth.sql', '');
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
-- Auth database update data
|
||||
TRUNCATE TABLE `updates_include`;
|
||||
INSERT INTO `updates_include` (`path`, `state`) VALUES
|
||||
('$/sql/updates/auth', 'RELEASED'),
|
||||
('$/sql/custom/auth', 'RELEASED'),
|
||||
('$/sql/old/3.3.5a/auth', 'ARCHIVED');
|
||||
@@ -0,0 +1,8 @@
|
||||
INSERT IGNORE INTO `updates` (`name`, `hash`) VALUES
|
||||
('2014_11_10_00_auth.sql', '0E3CB119442D09DD88E967015319BBC8DAFBBFE0'),
|
||||
('2014_11_10_01_auth.sql', '327E77A1DA3546D5275AB249915DD57EDD6FDD3D'),
|
||||
('2014_12_10_00_auth.sql', '821703A96D80F9080074852B5A46E2909C9562EA'),
|
||||
('2014_12_21_00_auth.sql', 'CE2E5D2CD82E79C25294539ADED27A1429105B43'),
|
||||
('2015_03_20_00_auth.sql', 'E8C5B74BB45F0F35DEC182C72BACF435C7066FB0'),
|
||||
('2015_03_20_01_auth.sql', '862961815354DA2746F5F71FBC8155F57CBE75AB'),
|
||||
('2015_03_20_02_auth.sql', '');
|
||||
@@ -0,0 +1,23 @@
|
||||
-- Updates base tables
|
||||
DROP TABLE IF EXISTS `updates`;
|
||||
CREATE TABLE `updates` (
|
||||
`name` VARCHAR(200) NOT NULL COMMENT 'filename with extension of the update.',
|
||||
`hash` CHAR(40) NULL DEFAULT '' COMMENT 'sha1 hash of the sql file.',
|
||||
`state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
|
||||
`timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
|
||||
`speed` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'time the query takes to apply in ms.',
|
||||
PRIMARY KEY (`name`)
|
||||
)
|
||||
COMMENT='List of all applied updates in this database.'
|
||||
COLLATE='utf8_general_ci'
|
||||
ENGINE=MyISAM;
|
||||
|
||||
DROP TABLE IF EXISTS `updates_include`;
|
||||
CREATE TABLE `updates_include` (
|
||||
`path` VARCHAR(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
|
||||
`state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
|
||||
PRIMARY KEY (`path`)
|
||||
)
|
||||
COMMENT='List of directories where we want to include sql updates.'
|
||||
COLLATE='utf8_general_ci'
|
||||
ENGINE=MyISAM;
|
||||
@@ -0,0 +1,6 @@
|
||||
-- Characters database update data
|
||||
TRUNCATE TABLE `updates_include`;
|
||||
INSERT INTO `updates_include` (`path`, `state`) VALUES
|
||||
('$/sql/updates/characters', 'RELEASED'),
|
||||
('$/sql/custom/characters', 'RELEASED'),
|
||||
('$/sql/old/3.3.5a/characters', 'ARCHIVED');
|
||||
@@ -0,0 +1,4 @@
|
||||
INSERT IGNORE INTO `updates` (`name`, `hash`) VALUES
|
||||
('2015_03_20_00_characters.sql', 'B761760804EA73BD297F296C5C1919687DF7191C'),
|
||||
('2015_03_20_01_characters.sql', '894F08B70449A5481FFAF394EE5571D7FC4D8A3A'),
|
||||
('2015_03_20_02_characters.sql', '');
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 859 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user