Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-10 03:59:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,387 Commits 4 Branches 147 Tags
a4b1f1c45fc8a1e28b76ffbbd0e73e6452c0785b
Commit Graph

19387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warpten
a4b1f1c45f Spells/Warlock: Fixed Conflagrate, Demon Soul and Immolate. 2013-01-31 00:21:28 +01:00
Vincent_Michael
71a0cc1706 Core/Spells: Add missing break in f5fd7bad69 
Thx Nayd
 2013-01-31 00:18:27 +01:00
Vincent_Michael
f5fd7bad69 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
 2013-01-31 00:10:17 +01:00
Shauren
15e42ac797 Core/Players: Improvements to currency handling. 2013-01-30 20:40:02 +01:00
Gacko
754418a8de Script/ICC: Fix phase check in Saurfang script 
Related to changes in dbecf05e39
 2013-01-30 19:34:59 +01:00
Vincent_Michael
716c2db403 Core: Fix warnings 2013-01-30 19:09:09 +01:00
Gacko
2ba477c367 Merge pull request #7873 from Gacko/eventphases 
Core: Logical fixes in EventMap
 2013-01-30 09:49:54 -08:00
Gacko
dbecf05e39 Core: Logical fixes and improvements in EventMap 2013-01-30 18:39:34 +01:00
Vincent_Michael
5a74336c5e Core: Fix non pch build 2013-01-30 18:24:29 +01:00
Vincent_Michael
8814d8c136 Script/ToCr: Fix crash for lord jaraxxus Mistress Kiss + cleanup 2013-01-30 18:06:19 +01:00
Nay
261e482a66 Merge pull request #9103 from Norfik/authdb 
DB/Auth: Fix typo in sql/base/auth_database.sql
 2013-01-30 06:05:17 -08:00
Emo
2ffeaec443 DB/Auth: Fix typo in sql/base/auth_database.sql 
ERROR 1136 (21S01) at line 216: Column count doesn't match value count at row 1
 2013-01-30 14:51:40 +01:00
Spp
709129f222 Merge branch 'master' into 4.3.4 (+ some changes to minimize differences) 
Conflicts:
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/Formulas.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Waypoints/WaypointManager.cpp
	src/server/game/Skills/SkillDiscovery.cpp
	src/server/game/Skills/SkillExtraItems.cpp
	src/server/game/Warden/WardenCheckMgr.cpp
	src/server/game/Weather/WeatherMgr.cpp
 2013-01-30 11:57:02 +01:00
Spp
8cd408ae6c Core/Misc: Some changes to minimize differences with 4.3.4 branch 2013-01-30 10:34:18 +01:00
Spp
c4e4cb1b5c Core/Misc: Remove using directive from header files (It will eventually lead to name collisions) 2013-01-30 09:06:19 +01:00
Spp
2c32393a39 Core/Misc: Always state what columns are affected by MySQL statements 2013-01-30 08:42:01 +01:00
Spp
fa5dd4bd4e Core/Misc: Remove some calls to const_cast 2013-01-30 08:39:06 +01:00
Shocker
b427068c39 Core/Titles: There are now 4 title fields (only 2 titles for now, Ruthless and Cataclysmic Gladiator). 
Also remove some unused outdated defines

WARNING! Run the SQL query before you start your emulator because it will reset all titles on login otherwise
 2013-01-30 07:05:19 +02:00
Nay
5151c57b18 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-01-30 01:33:46 +00:00
Nay
92d92df809 Core/Object: Re-add a line that somehow got removed in a merge 
Thanks Warpten for noticing
 2013-01-30 01:33:12 +00:00
Nay
0281497573 DB/Loot: Fix 9 drop chance in gameobject_template (7 quests should be fixed by this) 
If a GO with flags 4 drops a quest item, ChanceOrQuestChance for that items needs to be negative

Query used to find the issue:
```
SELECT * FROM `gameobject_loot_template`
    WHERE (`item` IN (SELECT `questItem1` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem2` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem3` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem4` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem5` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem6` FROM `gameobject_template` WHERE (`flags` & 4) != 0)) AND
          `ChanceOrQuestChance` > 0;
```
 2013-01-29 23:48:39 +00:00
click
ea9c6524dd Buildsystem/CMake: Revoke commit 7b49da48f9 - it creates unwanted results when used with PCh on *nix platforms. 2013-01-29 23:18:25 +01:00
Souler
d92347bc22 Scripts/Mage: Unsummon current mage's Water Elemental before summoning a new one 
Closes #8433
 2013-01-29 15:10:47 +00:00
FH3095
76910472d8 DB/Achievements: Fix Portal Jockey 
Current Status: Portal Jockey(10) is rewarded from 10nh and 25nh, Portal Jockey(25) is rewarded from 10hc and 25hc.
Reason: Achievement-criteria 12971 is required for Portal Jockey(25), but checks for map-difficulty 2=10hc.
On the other side achievment-criteria 12979 is required for Portal Jockey(10), but checks for map-difficulty 1=25nh.

Closes #9081
Ref #6810
 2013-01-29 15:02:54 +00:00
click
7b49da48f9 Buildsystem/CMake: Change policy CMP0005 to NEW and corect some buildvariables accordingly 
** Info from CMake:
**   The OLD behavior for this policy is to place definition values given to add_definitions directly in the generated build rules without attempting to escape anything.
**  The NEW behavior for this policy is to generate correct escapes for all native build tools automatically.

If this breaks build, let us know on irc : irc.rizon.net/#trinity
 2013-01-29 15:53:21 +01:00
Nay
4aa4fce89a Merge remote-tracking branch 'origin/master' into 4.3.4 2013-01-29 03:34:10 +00:00
w1sht0l1v3
8183f70ae0 DB/Loot: Add Cache of the Ley-Guardian to heroic Oculus loot when RDF aura is present. 
Closes #6927
 2013-01-29 05:15:10 +02:00
Kinzcool
5040fd2558 DB/Gameobjects: Set proper state for ToCr doors and fixed looting of Venomhide Egg & Discarded Soul Crystal 2013-01-28 21:59:12 -05:00
Nay
1b180e683e Core&DB/Trainers: Remove trainer_spell from creature_template since it is not longer necessary on Cata 2013-01-29 02:25:24 +00:00
Gacko
29cd1dbec1 Core/Quest: Bloody Breakout 
Closes #641
 2013-01-28 19:50:01 +01:00
Nay
112c2a8dd0 Core/Misc: Fix a merge failure in SpellAuraEffects.cpp 
Thanks Tuxity and Vincent
 2013-01-28 12:53:51 +00:00
Nay
98f01c2b12 Core/Misc: Fix compile errors introduced in previous merge 
There are probably other merge issues that got through, please report them
 2013-01-28 02:54:27 +00:00
Nay
b404e0bec1 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/loadlib.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_assembler/CMakeLists.txt
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2013-01-28 01:04:37 +00:00
Kinzcool
da080ac4e7 DB/Gameobjects: Added an another missing Gameobject 2013-01-27 13:10:14 -05:00
ZxBiohazardZx
2aa554db34 Typo: i will now go hang myself..... _ typo 2013-01-27 17:42:44 +01:00
ZxBiohazardZx
b9cb92cc88 Fix/Commit: push final file, not the workingcopy 2013-01-27 17:41:26 +01:00
Expecto
eba983c3a0 DB/Creature: Add spawns for Unseen in Duskwood (thanks Expecto for that) 
DB/SAI: Add SAI for the Unseen's Aura (thx ZxBiohazardZx)
 2013-01-27 17:37:20 +01:00
Shauren
6e80357f8e Core/Authserver: Added possibility to allow realm connections both from "world" and local networks. 2013-01-27 17:33:01 +01:00
Shauren
e1d12de2b1 Core/Battlegrounds: Fixed arena scoreboards not showing all players. 2013-01-27 11:56:56 +01:00
Nay
3a6a02547c Update sql/updates/world/2013_01_26_07_world_gameobject_template.sql 2013-01-27 04:06:12 +00:00
Kinzcool
3de933bcb5 DB/Gameobject: Added a missing gameobject template 2013-01-26 22:09:09 -05:00
Kinzcool
10bd0adca1 DB/Creature: Fixed equipment of Elder Razormaw, he should no longer have a sword as arms 2013-01-26 21:41:28 -05:00
Gacko
3a07f4e17d DB: Fix import 2013-01-27 01:51:44 +01:00
Nay
1b551cc157 Scripts/Commands: Add guild info to .pinfo 
Original patch by @secharles, modified

Closes #8946
 2013-01-26 21:33:13 +00:00
ZxBiohazardZx
e591f886ff DB/Misc: 
Add Rare Bosses to Dire Maul Closes #5882
Add SAI for Quest: No Mercy for the Captured Closes #568
Add Spawn for Sand Shark Closes #5925 (thx Mogale)
Fix underground Centaurs Closes #8498 (thx baric)
 2013-01-26 22:12:04 +01:00
Vincent_Michael
ceed5ea42f Scripts/Icecrown Citadel: Fix warning 2013-01-26 19:57:11 +01:00
Vincent_Michael
480c847156 Core: Some cosmetic changes 2013-01-26 19:49:53 +01:00
ZxBiohazardZx
1c95762849 DB/Loot: some modifications to Mithrill Bound Trunk 
Closes #3801
 2013-01-26 19:46:14 +01:00
Vincent_Michael
66e9b0c633 DB/Conditions: Add conditions for Bellowing Roar / Eruption 2013-01-26 19:22:47 +01:00
ZxBiohazardZx
1682a72d1a DB/Loot: add loot for Protectorate Treasure Cache and make sure you always get sometime out of it... 
Closes #8589
 2013-01-26 19:20:15 +01:00