Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,387 Commits 4 Branches 146 Tags
a4b1f1c45fc8a1e28b76ffbbd0e73e6452c0785b
Commit Graph

5201 Commits

Author SHA1 Message Date
Warpten
a4b1f1c45f Spells/Warlock: Fixed Conflagrate, Demon Soul and Immolate. 2013-01-31 00:21:28 +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
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
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
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
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
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
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
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
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
dele
9ae8a1e7cb DB/Loot: add missing items to Coren Direbrew 
Closes #7297
 2013-01-26 18:58:15 +01:00
Shauren
a3d07b5e6a Core/Spells: Fixed Darkflight, Two Forms and Running Wild for worgens. 
Closes #8905
 2013-01-26 13:25:06 +01:00
w1sht0l1v3
6acfa49065 Script/Commands: Implement command to list the members of a group/party. 2013-01-26 00:41:46 +02:00
Gacko
f3d0ea66be DB: Fix SAI broke by quest_end_script conversion 
Closes #8995
 2013-01-25 22:28:49 +01:00
Malcrom
dbb25deb5f DB/Stats: Correct a few creature_classlevelstats 
Research done for 4.3.4 but still valid in 3.3.5
 2013-01-25 14:54:56 +00:00
Phantons
c9b9c69f97 DB/Spells: Fix trap launcher for Imolation and Snake Trap 
Closes #9052
 2013-01-25 13:16:30 +00:00
nelegalno
9ad8ac73a9 DB/Texts: Ensure that correct types are used in creature_text (42 texts should be corrected) 
Closes #9055
 2013-01-25 11:57:31 +00:00
Kirkhammett
b64ad98b0d DB/SAI: Fix quest Wrangle Some Aether Rays! 
Closes #6176
Closes #8968
 2013-01-24 16:53:28 +00:00
Nay
2542c307bc Merge pull request #9027 from Xanvial/TV 
[4.3.4] Scripts/Paladin: Templar's Verdict
 2013-01-24 06:42:41 -08:00
Shocker
d323831783 DB/Scripts: Missing change for 93c7f975b1 2013-01-24 06:32:47 +02:00
Vincent_Michael
f4de181db0 SQL: Rename SQL merged in PR 2013-01-23 20:29:40 +01:00
blub
a6f587a3b1 Merge pull request #9016 from joschiwald/spellscripts4 
Core/Spell: convert more spells to SpellScripts
 2013-01-23 11:19:39 -08:00
w1sht0l1v3
70490c8238 Script/Commands: Add command to join an existing group/party. 2013-01-23 20:58:01 +02:00
w1sht0l1v3
5e367c910a DB/Misc: Add back flight aura on Wyrmrest Defender.(probably deleted on last template_addon cleanup) 
Correct a SAI line for Nerub'ar Broodkeeper.
 2013-01-23 13:21:31 +02:00
Nay
3a4bb8fae0 TDB 434.03 2013-01-23 05:10:56 +00:00
joschiwald
af50ce6223 Core/Spell: convert more spells to SpellScripts 2013-01-22 23:36:51 +01:00
Xanvial
e360f87470 Scripts/Paladin: Templar's Verdict 2013-01-23 05:26:51 +07:00
Vincent_Michael
db5d06afa9 DB/SAI: Fix more some db errors no.4 2013-01-22 20:16:56 +01:00
Xanvial
d0d3d0f3c4 Scripts/Creature: Hira Snowdawn no longer sells Tome of Cold Weather Flight 2013-01-23 01:20:31 +07:00
Nay
d258c12d73 DB: Rename a sql file since it's a 434 sql file 
Note: Please append "_434" to all sql files that are especific to the 4.3.4 branch
 2013-01-22 17:07:25 +00:00
Nay
864a85b8fc DB/mmaps: Rename mmap commands related sql 2013-01-22 15:03:26 +00:00
Tuxity
9eb9b0fe16 Core/Spells: Fix Malfurion's Gift. Close #8546 2013-01-22 15:27:07 +01:00
Kinzcool
4b4b637081 Merge pull request #9018 from TrinityCore/mmaps 
Mmaps
 2013-01-21 18:41:48 -08:00
Northstrider
2c927b254f DB/Instances: use correct texts from WoW Head for translation 2013-01-21 23:59:45 +01:00