This commit is contained in:
sevi committed 2017-12-20 20:47:20 +01:00
commit 6b663a088b
373 files changed
+14968 -6686

No files matched your search

+1
View File
@@ -21,3 +21,4 @@ nbproject/*
.browse.VC*
.vscode
cmake-build-*/
.vs
+1 -1
View File
@@ -45,7 +45,7 @@ website at [TrinityCore.org](https://www.trinitycore.org).
## Install
Detailed installation guides are available in the [wiki](https://collab.kpsn.org/display/tc/Installation+Guide) for
Detailed installation guides are available in the [wiki](https://www.trinitycore.info/display/tc/Installation+Guide) for
Windows, Linux and Mac OSX.
You can get database from
https://github.com/TrinityCoreLegacy/TrinityCore/releases
+9 -1
View File
@@ -128,9 +128,17 @@ FUNCTION(ADD_CXX_PCH_MSVC TARGET_NAME_LIST PCH_HEADER PCH_SOURCE)
GET_COMMON_PCH_PARAMS("${TARGET_NAME_LIST}" ${PCH_HEADER} "pch" "/I")
FOREACH(TARGET_NAME ${TARGET_NAME_LIST})
SET(PCH_COMPILE_FLAGS "/FI${PCH_HEADER_NAME} /Yu${PCH_HEADER_NAME}")
IF (NOT ${CMAKE_MAKE_PROGRAM} MATCHES "MSBuild")
SET(PCH_COMPILE_FLAGS "${PCH_COMPILE_FLAGS} /Fp${PCH_HEADER_OUT}")
SET(TARGET_SOURCES_LIST "")
GET_PROPERTY(TARGET_SOURCES_LIST TARGET ${TARGET_NAME} PROPERTY SOURCES)
LIST(REMOVE_ITEM TARGET_SOURCES_LIST ${PCH_SOURCE})
SET_SOURCE_FILES_PROPERTIES(${TARGET_SOURCES_LIST} PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${TARGET_NAME}.dir/${PCH_SOURCE}.obj")
ENDIF()
SET_TARGET_PROPERTIES(
${TARGET_NAME} PROPERTIES
COMPILE_FLAGS "/FI${PCH_HEADER_NAME} /Yu${PCH_HEADER_NAME}"
COMPILE_FLAGS "${PCH_COMPILE_FLAGS}"
)
ENDFOREACH()
+3
View File
@@ -9,8 +9,11 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# Search twice, once for space after /W argument, once for end of line as CMake regex has no \b
string(REGEX REPLACE "/W[0-4] " "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
string(REGEX REPLACE "/W[0-4]$" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
string(REGEX REPLACE "/W[0-4] " "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
string(REGEX REPLACE "/W[0-4]$" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
add_definitions(/W0)
else()
add_definitions(-w)
+1 -1
View File
@@ -7,7 +7,7 @@
#define _SOURCE_DIRECTORY R"(@CMAKE_SOURCE_DIR@)"
#define _BUILD_DIRECTORY R"(@BUILDDIR@)"
#define _MYSQL_EXECUTABLE R"(@MYSQL_EXECUTABLE@)"
#define _FULL_DATABASE "TDB_full_world_434.24_2017_11_15.sql"
#define _FULL_DATABASE "TDB_full_world_434.25_2017_12_17.sql"
#define VER_COMPANYNAME_STR "TrinityCore Developers"
#define VER_LEGALCOPYRIGHT_STR "(c)2008-2017 TrinityCore"
#define VER_FILEVERSION 0,0,0
File diff suppressed because it is too large. Load diff
+2 -1
View File
@@ -2873,7 +2873,8 @@ INSERT INTO `updates` VALUES
('2017_10_16_00_characters.sql','74500AFF41A5FB2EEE24B0BFAD750C988136BA6B','ARCHIVED','2017-10-16 00:00:00',0),
('2017_11_15_00_characters.sql','22D0C3854EE6D0983CD8C43DF0AC4269386F587C','ARCHIVED','2017-11-15 00:00:00',0),
('2017_11_26_00_characters.sql','4609CDC122E0A7F27A09C2605B329A06FC7FB7C2','ARCHIVED','2017-11-27 00:00:00',0),
('2017_11_28_00_characters.sql','6FF1F84B8985ADFC7FF97F0BF8E53403CF13C320','ARCHIVED','2017-11-28 00:00:00',0);
('2017_11_28_00_characters.sql','6FF1F84B8985ADFC7FF97F0BF8E53403CF13C320','ARCHIVED','2017-11-28 00:00:00',0),
('2017_12_17_00_characters.sql','937E8F51DC74AC41FF8F213CE36C69DDEB878D6A','ARCHIVED','2017-12-17 00:00:00',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;
@@ -0,0 +1,2 @@
--
UPDATE `rbac_linked_permissions` SET `id` = 197 WHERE `linkedId` = 501;
Loaded 100 of 373 files, more files were not shown because too many files have changed in this diff. Show more