diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-01-30 01:33:46 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-01-30 01:33:46 +0000 |
| commit | 5151c57b18af12f575e8799d69bf6ff91f0227b1 (patch) | |
| tree | a1dd050b143833a612718c341973c0be4cfc7820 | |
| parent | 92d92df80960f046cac8cde15599b510cbc34109 (diff) | |
| parent | 02814975732f8e919d33ff8f2cbaf98f13e04f91 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/compiler/icc/settings.cmake | 2 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_29_01_world_achievement_criteria_data.sql | 2 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_29_02_world_gameobject_loot_template.sql | 9 |
4 files changed, 16 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5335207aaa5..7b075b6ede3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,10 @@ project(TrinityCore) cmake_minimum_required(VERSION 2.8) cmake_policy(SET CMP0005 OLD) +# add this options before PROJECT keyword +set(CMAKE_DISABLE_SOURCE_CHANGES ON) +set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) + # Set RPATH-handing (CMake parameters) set(CMAKE_SKIP_BUILD_RPATH 0) set(CMAKE_BUILD_WITH_INSTALL_RPATH 0) diff --git a/cmake/compiler/icc/settings.cmake b/cmake/compiler/icc/settings.cmake index 58eb63b081d..133bc15e59e 100644 --- a/cmake/compiler/icc/settings.cmake +++ b/cmake/compiler/icc/settings.cmake @@ -1,5 +1,5 @@ # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") +add_definitions(-D_BUILD_DIRECTIVE="'${CMAKE_BUILD_TYPE}'") if(PLATFORM EQUAL 32) add_definitions(-axSSE2) diff --git a/sql/updates/world/2013_01_29_01_world_achievement_criteria_data.sql b/sql/updates/world/2013_01_29_01_world_achievement_criteria_data.sql new file mode 100644 index 00000000000..39627a943cc --- /dev/null +++ b/sql/updates/world/2013_01_29_01_world_achievement_criteria_data.sql @@ -0,0 +1,2 @@ +UPDATE `achievement_criteria_data` SET `value1`=2 WHERE `criteria_id`=12979 AND `type`=12; +UPDATE `achievement_criteria_data` SET `value1`=1 WHERE `criteria_id`=12971 AND `type`=12; diff --git a/sql/updates/world/2013_01_29_02_world_gameobject_loot_template.sql b/sql/updates/world/2013_01_29_02_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..c3f2d0f0fb9 --- /dev/null +++ b/sql/updates/world/2013_01_29_02_world_gameobject_loot_template.sql @@ -0,0 +1,9 @@ +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=27310 AND `item`=47035; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=27239 AND `item`=46364; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=24589 AND `item`=43697; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=26666 AND `item`=44319; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=26667 AND `item`=44320; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=26668 AND `item`=44321; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=26878 AND `item`=45062; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=27725 AND `item`=49648; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=27723 AND `item`=49678; |